diff options
| author | Colin Watson <cjwatson@debian.org> | 2022-10-15 15:01:16 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2022-10-15 15:01:16 +0100 |
| commit | 175b15a789c92ea810f2d60f51725c44abf31efd (patch) | |
| tree | 0ee982dbba89377fba8a27aed49df522f64c9c4a | |
| parent | 8a20bb7f39d2e3d90f2368a2a6b2a1ff8bc5968d (diff) | |
| parent | fba1f23672e534ca4bb4d61baf5fb28e9ee5a9da (diff) | |
Import man-db_2.11.0.orig.tar.xz
266 files changed, 16622 insertions, 13605 deletions
@@ -1,281 +1,622 @@ GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + Version 3, 29 June 2007 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License. - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. END OF TERMS AND CONDITIONS @@ -287,15 +628,15 @@ free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least +state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. <one line to give the program's name and a brief idea of what it does.> Copyright (C) <year> <name of author> - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -303,37 +644,31 @@ the "copyright" line and a pointer to where the full notice is found. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. Also add information on how to contact you by electronic and paper mail. -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<https://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<https://www.gnu.org/licenses/why-not-lgpl.html>. @@ -1,3 +1,993 @@ +2022-10-15 Colin Watson <cjwatson@debian.org> + + Release man-db 2.11.0 + +2022-10-13 Colin Watson <cjwatson@debian.org> + + ult_src: Fix possible NULL dereference + + `gcc -fanalyzer` noticed that `canonicalize_file_name` can return NULL, + therefore `find_include` could return NULL, and therefore it was + possible for `ult_src` to attempt to dereference NULL in the `stat + (base, &st)` call. Push more work down to `find_include` so that we can + consistently treat it as an error if it returns NULL. + + * src/ult_src.c (ult_softlink): Move error messages to ... + (gripe_canonicalize_failed): ... here (new function). + (find_include): Replace simple suffix globbing with `comp_file`, and use + this approach in both the relative-to-mantree and + relative-to-dirname-of-page cases; we previously only tried it in the + latter case. Call `gripe_canonicalize_failed` if the final + canonicalization step fails; print a "can't resolve %s" error if we + can't even find anything to canonicalize. + (ult_src): Remove `comp_file` processing, now done by `find_include`. + * src/ult_src.h (gripe_canonicalize_failed): Add prototype. + * src/straycats.c (check_for_stray): Use `gripe_canonicalize_failed`. + +2022-10-11 Colin Watson <cjwatson@debian.org> + + Fix regression in preprocessor string handling + + We need to stop looking for characters that identify preprocessors after + the first space or dash, as otherwise encoding declarations of the kind + specified in man-recode(1) may break. + + * src/man.c (make_roff_command): Only consider the part of the + preprocessor string up to the first space or dash, if any. + +2022-10-11 Colin Watson <cjwatson@debian.org> + + match_in_directory: Split into multiple functions + + `match_in_directory` had two almost entirely disjoint code paths, one + for regex patterns and one for wildcard patterns; but its structure made + it difficult for `gcc -fanalyzer` to understand that, and it was a bit + unclear for humans too. Split it up for clarity. + + * src/globbing.c (match_in_directory): Split out the + regex/wildcard-handling parts to ... + (match_regex_in_directory, match_wildcard_in_directory): ... here, + respectively. + +2022-10-11 Colin Watson <cjwatson@debian.org> + + Assert that another xasprintf call returns non-NULL + + As with commit a22f140354c80a7c5c52c4a413f1c929e105a24c, `gcc + -fanalyzer` notices that `xasprintf` can return NULL in some situations. + I believe those situations would all amount to programming errors here, + so add an assert. + + * src/mandb.c (main): Assert that `xasprintf` returns non-NULL. + +2022-10-09 Colin Watson <cjwatson@debian.org> + + Fix error message + + * src/straycats.c (check_for_stray): If canonicalizing `catdir` returns + NULL, then substitute `catdir` into the "warning: %s is a dangling + symlink" message, not `fullpath` (which at this point must be NULL). + +2022-10-08 Colin Watson <cjwatson@debian.org> + + Convert many more ints to bools + + I don't expect this to make a significant runtime difference, but it + makes some things easier to analyse visually. + + * lib/cleanup.c (do_cleanups_sigsafe): Change `in_sighandler` parameter + type to bool. Update all callers. + (push_cleanup): Change `handler_installed` local variable type to bool. + * lib/cleanup.h (do_cleanups_sigsafe): Update prototype. + * lib/compression.c (comp_info): Change `want_stem` parameter type to + bool. Update all callers. + * lib/compression.h (comp_info): Update prototype. + * lib/sandbox.c (seccomp_filter_unavailable): Change type to bool. + Update all references. + (make_seccomp_filter): Change `permissive` parameter type to bool. + Update all callers. + (_sandbox_load): Likewise. + * lib/util.c (remove_directory): Change `recurse` parameter type to + bool. Update all callers. + * lib/util.h (remove_directory): Update prototype. + * libdb/db_gdbm.c (opening): Change type to bool. Update all + references. + * libdb/db_store.c (compare_ids): Change `promote_links` parameter type + to bool. Update all callers. + * libdb/db_storage.h (compare_ids): Update prototype. + * src/catman.c (parse_for_sec): Change `message` local variable type to + bool. + (check_access): Change return type to bool. + (purge_whatis): Change `cat` parameter type to bool. Update all + callers. + (check_multi_key): Change return type to bool. + * src/descriptions.c (parse_descriptions): Change `seen_base` local + variable type to bool. + * src/globbing.c (look_for_file): Change `cat` parameter type to bool. + Update all callers. + * src/globbing.h (look_for_file): Update prototype. + * src/lexgrog.l (fill_mode, waiting_for_quote): Change types to bool. + Update all references. + * src/man.c (skip, created_tmp_cat): Change types to bool. Update all + references. + (run_mandb): Change `create` parameter type to bool. Update all + callers. + (squeeze_blank_lines): Change `in_blank_line` and `got_blank_line` local + variable types to bool. + (display): Change `format` and `printed` local variable types to bool. + (convert_name): Change `fsstnd` parameter type to bool. Update all + callers. + (add_candidate): Change `dupcand` local variable type to bool. + (main): Change `maybe_section` local variable type to bool. + * src/manp.c (add_sections): Change `user` parameter type to bool. + Update all callers. + (add_def): Likewise. + (add_mandb_map): Likewise. + (add_to_dirlist): Likewise. + (read_config_file): Change `done` local variable type to bool. + (get_manpath_from_path): Change `mandatory` parameter type to bool. + Update all callers. + * src/manp.h (get_manpath_from_path): Update prototype. + * src/whatis.c (do_apropos): Change `matched` local variable type to + bool. + * src/zsoelim.l (no_newline): Change type to bool. Update all + references. + (zsoelim_open_file): Change return type to true. + * src/zsoelim.h (zsoelim_open_file): Update prototype. + +2022-10-07 Colin Watson <cjwatson@debian.org> + + Remove unused variable + + * src/man.c (found_a_stray): Remove; it was set but no longer used. + (display_database): Remove setting of `found_a_stray`. + +2022-10-07 Colin Watson <cjwatson@debian.org> + + Add some more pure function attributes + + * lib/encodings.c (compatible_encodings): Mark as pure. + * src/man.c (is_section): Likewise. + * src/manp.c (get_config, get_def, get_def_user, is_global_mandir): + Likewise. + +2022-10-07 Colin Watson <cjwatson@debian.org> + + Default to --disable-cache-owner on systems without getuid + + * m4/man-arg-cache-owner.m4 (MAN_ARG_CACHE_OWNER): If the system doesn't + have `getuid`, force cache files to have unconstrained cache ownership, + and issue a warning if `--enable-cache-owner` was given. + +2022-10-07 Colin Watson <cjwatson@debian.org> + + Fix installation on systems with non-empty EXEEXT + + * src/Makefile.am (install-exec-hook): Add `$(EXEEXT)` to + `chown`/`chmod` calls. + * NEWS.md: Document MinGW portability work. + +2022-10-07 Colin Watson <cjwatson@debian.org> + + Fix build on systems without SIGPIPE + + * bootstrap.conf (gnulib_modules): Add sigpipe. + * src/mandb.c (main): Drop `#ifdef SIGPIPE` guards, as Gnulib now + ensures that it's defined. + +2022-10-07 Colin Watson <cjwatson@debian.org> + + Fix build on systems without getuid + + * lib/tempfile.c (running_setid): New function; always returns false if + the system doesn't have `getuid`, since in that case we won't have been + able to drop privileges either. + +2022-10-07 Colin Watson <cjwatson@debian.org> + + Fix build on systems without <pwd.h> + + * lib/security.h: Only include `<pwd.h>` if `MAN_OWNER` is defined. + +2022-10-07 Colin Watson <cjwatson@debian.org> + + Fix build on systems without <termios.h> + + * bootstrap.conf (gnulib_modules): Add termios. + * src/man.c (get_term): Replace with a no-op stub if the system has no + `<termios.h>` (Gnulib tests for it and can replace some functions, but + its replacement isn't sufficient here). + +2022-10-07 Colin Watson <cjwatson@debian.org> + + Fix build on systems without SIGHUP + + * lib/cleanup.c (trap_abnormal_exits, untrap_abnormal_exits): Guard uses + of `SIGHUP` with an `#ifdef`. + +2022-10-06 Colin Watson <cjwatson@debian.org> + + Run preprocessors in the correct order + + We have no particular reason to trust the order of filters in a + preprocessor string specified in a page; it's easy for authors to get + this wrong by accident. Do as groff(1) does and run them in a + canonicalized order. + + Fixes Debian bug #1012078. + + * src/man.c (add_filter): New function, split out from + `make_roff_command`. + (make_roff_command): Iterate through possible preprocessors and add each + one depending on whether it's present in the preprocessor string, rather + than iterating through the preprocessor string and acting on each of its + characters. Turn several `int` variables into `bool` variables in + passing. + * NEWS.md: Document this. + +2022-10-06 Emir SARI <emir_sari@icloud.com> + + Update Turkish translation + + * po/tr.po: Update from Translation Project. + +2022-10-06 Emir SARI <emir_sari@icloud.com> + + Update Turkish manual page translation + + * man/po4a/po/tr.po: Update from Translation Project. + +2022-10-06 Boyuan Yang <073plan@gmail.com> + + Update Simplified Chinese manual page translation + + * man/po4a/po/zh_CN.po: Update from Translation Project. + +2022-10-06 Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org> + + Update Romanian manual page translation + + * man/po4a/po/ro.po: Update from Translation Project. + +2022-10-06 Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org> + + Update Romanian translation + + * po/ro.po: Update from Translation Project. + +2022-10-03 Mario Blättermann <mario.blaettermann@gmail.com> + + Update German manual page translation + + * man/po4a/po/de.po: Update from Translation Project. + +2022-10-02 Colin Watson <cjwatson@debian.org> + + Release man-db 2.11.0-pre1 + +2022-10-02 Colin Watson <cjwatson@debian.org> + + Bump next version to 2.11.0 + + There are quite a few substantial changes here that I think justify an + updated minor number. + + * NEWS.md: Bump to 2.11.0. + +2022-10-02 Colin Watson <cjwatson@debian.org> + + Update translation files + + * po/man-db.pot, po/*.po: Update. + +2022-10-02 Colin Watson <cjwatson@debian.org> + + Fix harmless but incorrect cast + + * libdb/db_xdbm.c (man_xdbm_firstkey): Cast `gl_list_free` to + `gl_mapvalue_dispose_fn`, not `gl_listelement_dispose_fn`. (These were + in practice identical but are semantically distinct.) + +2022-10-02 Colin Watson <cjwatson@debian.org> + + Reformat option declarations using macros + + The previous tabular presentation had some advantages, but it only + looked reasonable in wide terminals, was often quite cumbersome to + maintain, and played poorly with `clang-format`. + + * include/manconfig.h (OPT, OPT_FULL, OPT_ALIAS, OPT_HIDDEN, + OPT_GROUP_HEADER, OPT_HELP_COMPAT): New macros. + * src/accessdb.c (options): Rewrite using `OPT*` macros. + * src/catman.c (options): Likewise. + * src/globbing_test.c (options): Likewise. + * src/lexgrog_test.c (options): Likewise. + * src/man-recode.c (options): Likewise. + * src/man.c (options): Likewise. + * src/manconv_main.c (options): Likewise. + * src/mandb.c (options): Likewise. + * src/manpath.c (options): Likewise. + * src/whatis.c (options): Likewise. + * src/zsoelim_main.c (options): Likewise. + +2022-10-02 Colin Watson <cjwatson@debian.org> + + Add CI checks for Berkeley DB and NDBM + + * .gitlab-ci.yml (build-berkeley-db, build-ndbm): New jobs. + +2022-10-02 Colin Watson <cjwatson@debian.org> + + mandb: Fully reorganize databases + + This allows us to produce bitwise-identical databases regardless of the + order in which pages were scanned (at least with GDBM). + `gdbm_reorganize` isn't enough for this, probably because entries end up + in different positions in hash buckets depending on insertion order; but + reading in the entire database and writing it back out in sorted order + seems to do the job with negligible cost. + + Fixes Debian bug #1010957. + + * src/mandb.c (reorganize): New function: read all the items from a + database in sorted order and write them back out. + (mandb): Stop calling `MYDBM_REORG`, which saved space after deletions + but didn't help with reproducibility. + (process_manpath): Call `reorganize` if any changes were made to a + database. + * libdb/mydbm.h (MYDBM_REORG): Remove macro. + * NEWS.md: Document this. + +2022-10-02 Colin Watson <cjwatson@debian.org> + + mandb: Rearrange database path operations + + Moving these into "methods" of `struct dbpaths` makes the control flow + clearer by avoiding lots of inlined `#ifdef`s. + + I fixed a possible crash in `mandb -f` in the process, exposed by the + clearer control flow. + + * src/mandb.c (dbpaths_init, dbpaths_copy_to_tmp, dbpaths_remove_tmp): + New functions. + (finish_up): Rename to ... + (dbpaths_rename_from_tmp): ... this. + (do_chown): Rename to ... + (dbpaths_chown_if_possible): ... this. + (cleanup_sigsafe): Rename to ... + (dbpaths_unlink_tmp): ... this, and take a `struct dbpaths *` argument + rather than `void *`. + (cleanup): Rename to ... + (dbpaths_free_elements): ... this, and take a `struct dbpaths *` + argument rather than `void *`. + (mandb, process_manpath): Use new `dbpaths_*` functions. Only call + `dbpaths_rename_from_tmp` if `run_mandb` is set (in practice this was + always true anyway but this makes it clearer). Only call + `dbpaths_chown_if_possible` if `run_mandb` is set and + `dbpaths_rename_from_tmp` was called (this may have caused a crash in + some edge cases involving `mandb -f`). + +2022-10-01 Colin Watson <cjwatson@debian.org> + + test_manfile: Remove "already exists" check + + This produced inconsistent results in some unusual cases. For example, + if `/usr/share/man/man5/inetd.conf.5.gz` was a symlink to + `/usr/share/man/man8/inetd.8.gz` and had `NAME` entries for both `inetd` + and `inetd.conf`, then if `inetd.8.gz` was scanned first we would + include a `WHATIS_MAN` entry in section 8 for `inetd.conf`, while if + `inetd.conf.5.gz` was scanned first we'd skip that due to hitting the + already-exists check when scanning `inetd.8.gz`. + + This was originally a performance optimization. Now that we cache the + results of `ult_src` and `find_name`, this optimization no longer helps + us much, so it can go. + + * src/check_mandirs.c (test_manfile): Don't return early if the page + already exists with matching details. + * NEWS.md: Document this. + +2022-10-01 Colin Watson <cjwatson@debian.org> + + Further improve name selection for whatis targets + + In commit 9aff3c30b0, I used the rule "first name in the trace out of + those that have the best ID". However, a better rule turns out to be to + pick the last entry in the trace that has the same section and extension + as the starting page. This is already guaranteed to have at least as + good an ID as the starting page, and since whatis pointers don't include + the target section and extension we need to ensure that they don't cross + sections/extensions; otherwise we just end up with database entries that + man(1) refuses to use, which isn't particularly useful. + + * src/descriptions_store.c (store_descriptions): Parse and cache all the + filenames in the trace at the start. Use the last entry in the trace + with the same section/extension as the starting page as the pointer for + `WHATIS_*` entries. + +2022-10-01 Colin Watson <cjwatson@debian.org> + + test_manfile: Stop caching ult_src traces + + Now that `test_manfile` always calls `ult_src` before adding database + entries, there's no need for it to cache the resulting traces, and doing + so had some confusing consequences since `store_descriptions` could end + up seeing cached traces that didn't include the initial path. + + * src/check_mandirs.c (struct whatis): Remove `trace` element. + (whatis_free): Stop freeing `whatis->trace`. + (test_manfile): Stop caching `ult->trace`; pass it directly to + `store_descriptions` instead. + +2022-10-01 Colin Watson <cjwatson@debian.org> + + Restructure ult_src to add caching + + * src/ult_src.c (struct ult_key): New structure. + (ult_key_new, ult_key_equals, ult_key_hash, ult_key_free, ult_value_new, + ult_value_free): New functions. + (ult_cache): New map. + (ult_src): Instead of returning a path as a string and taking `trace` as + an output parameter, return a `struct ult_value *` containing both path + and trace. Cache the return value in a hash map (indexed by a composite + key consisting of `name` and `flags`), and return cached values where + possible rather than repeating the same work. Update all callers to + reflect the new signature. + * src/ult_src.h (struct ult_value): New structure. + (ult_src): Update prototype. + + * src/check_mandirs.c (test_manfile): Simplify `ult_src` calling + arrangements now that repeated calls with the same `name` and `flags` + arguments are cheap. At the moment this may end up doing a little more + work in some rare cases (links to already-scanned pages with `.so` + links), but that doesn't seem to be very significant at the moment, and + caching could be improved inside `ult_src` if it proves to be a problem. + * src/descriptions_store.c (store_descriptions): `trace` is now always + set. Add an assertion of this and drop a couple of conditionals. + +2022-09-25 Colin Watson <cjwatson@debian.org> + + ult_src: Remove recursion + + The use of recursion for `.so` handling in `ult_src` is somewhat + inconvenient, and it's relatively easy to convert it to an iterative + implementation. + + There should be no functional change from this commit, except to some + details of debug messages. + + * src/ult_src.c (find_include_directive): New function, extracted from + `ult_src`. + (ult_src): Handle `.so` links using a loop rather than recursion. Check + for compression extensions towards the end of the loop rather than at + the beginning, to avoid nonexistent files showing up in the trace. + +2022-09-25 Colin Watson <cjwatson@debian.org> + + mandb: Improve debugging + + * src/check_mandirs.c (test_manfile): Log the file under consideration + on entry. Log when we return early due to an existing database entry. + Remove some unnecessary parentheses from debug messages. + * src/ult_src.c (ult_src): Remove leading newline from debug message. + +2022-09-25 Colin Watson <cjwatson@debian.org> + + Don't skip adding a database entry due to SO_MAN + + An existing `SO_MAN` entry shouldn't stop us considering a page for + insertion into the database, because until we run `ult_src` we don't yet + know whether that page will be `ULT_MAN` (which should replace the + existing entry) or `SO_MAN` (which shouldn't). + + * src/check_mandirs.c (test_manfile): Don't return early due to an + existing matching `SO_MAN` entry, but only due to an `ULT_MAN` entry. + * NEWS.md: Document this. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + Fix section/extension for whatis entries in database + + * src/descriptions_store.c (store_descriptions): Use the + section/extension of the best name for whatis entries, since we don't + have anything better. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + store_descriptions: Improve debugging + + * src/descriptions_store.c (store_descriptions): Log the extension of + each entry being stored. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + Extend database entry replacement rules + + These rules were previously ambiguous such that the targets of whatis + entries depended on the order in which files were scanned. + + * libdb/db_store.c (enum replace_action): Add. + (replace_if_necessary): Extend rules for greater stability. We now also + take mtimes and pointers into account, as well as including a case for + when the new ID is weaker than the old one (there was already a case for + when it was stronger). + (dbstore): Use `replace_if_necessary` when considering replacing multi + keys. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + Fix section/extension for links in database + + In some cases this resulted in spurious database entries. For example, + if `man5/inetd.conf.5` was a symlink to `man8/inetd.8` and that page had + a `NAME` entry for `inetd`, then as well as entries for `inetd` in + section 8 and `inetd.conf` in section 5, we would also store a spurious + entry for `inetd` in section 5. We no longer do that. + + * src/descriptions_store.c (store_descriptions): For names corresponding + to entries in the ultimate source trace and not to the base name of the + file, use the section and extension of the trace entry rather than of + the ultimate source. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + Pick a more consistent name for whatis targets + + We don't want the targets of whatis entries in the database to depend on + the order in which files were scanned. Prefer the first name in the + trace out of those that have the best ID. + + * src/descriptions_store.c (store_descriptions): Defer adding names that + don't appear in the ultimate source trace (i.e. whatis entries) until we + know the best name to use as the target, and use that best name as the + pointer for each of them. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + Fix stored ID for links + + Database entries for links were often incorrectly stored as `ULT_MAN`, + depending on the exact order in which pages were scanned. They are now + stored more consistently as `SO_MAN`. + + * src/descriptions_store.c (store_descriptions): Override the ID from + `ULT_MAN` to `SO_MAN` if the name is not the last entry in the trace. + (Previously we overrode from `SO_MAN` to `ULT_MAN` if the name was the + last entry in the trace, but not the converse.) + * NEWS.md: Document this. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + Simplify struct mandata memory allocation + + The arrangement where most of the fields of `struct mandata` were + constant pointers into the `addr` field was a bit more memory-efficient, + but it made some kinds of analysis and reorganization very difficult, + and we don't actually need to be quite that frugal about memory. + Reorganize this to allocate each field independently instead. + + * lib/filenames.c (filename_info): Allocate each field independently. + Use Gnulib's `base_name` and `dir_name` functions to parse paths. Stop + setting `info->addr`. + (free_mandata_struct): Free the `ext`, `sec`, `pointer`, `comp`, + `filter`, and `whatis` fields. Stop freeing `addr`. + * lib/filenames.h (struct mandata): Remove `addr`. Make `ext`, `sec`, + `pointer`, `comp`, `filter`, and `whatis` non-`const`. + * libdb/db_lookup.c (split_content): Copy the `ext`, `sec`, `pointer`, + `filter`, `comp`, and `whatis` fields. Stop setting `addr`. + * libdb/db_store.c (make_content): Copy the `pointer`, `comp`, `filter`, + and `whatis` fields. + * src/descriptions_store.c (store_descriptions): Copy `pointer` and + `whatis` fields. + * src/straycats.c (check_for_stray): Copy `comp`, `ext`, `sec`, and + `filter` fields. + + * libdb/db_lookup.c (dblookup): Always free `cont`'s data pointer, since + it's no longer sometimes borrowed. + * libdb/db_store.c (dbstore): Free `cont`'s and `oldcont`'s data + pointers, since they're no longer borrowed. + * src/check_mandirs.c (purge_missing): Free `content`'s data pointer, + since it's no longer borrowed. + + * libdb/db_lookup.c (dblookup_pattern): Stop freeing `info->addr`. + * src/catman.c (parse_for_sec): Stop freeing `entry->addr`. + * src/whatis.c (do_apropos): Stop freeing `info->addr`. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + Stop using the addr field of struct mandata + + The `addr` field of `struct mandata` is just intended as an internal + buffer, but some functions were extracting information from it in + complicated ways, which made it difficult to refactor the memory + allocation here. Use different approaches. + + * src/check_mandirs (test_manfile): Calculate `len` using `comp_info`. + This duplicates some of what `filename_info` does, but it's just some + cheap string manipulation, and it expresses what we want in a less + confusing way (the length of the file name with any compression + extension removed). + * src/descriptions_store.c (store_descriptions): Check whether `path` is + a prefix of `trace_name` rather than of `trace_info->addr`. + `trace_info->addr` is always itself a prefix of `trace_name`, so if + `path` is not a prefix of `trace_name` then it can't be a prefix of + `trace_info->addr`. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + is_prefix: Improve parameter naming + + The second parameter doesn't have to be a directory, so stop implying + that in the parameter name. + + * src/descriptions_store.c (is_prefix): Rename `path` to `parent`; rename + `dir` to `child`. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + Simplify split_content interface + + Now that `struct mandata` is always allocated on the heap, we might as + well just have `split_content` return a freshly-allocated `struct + mandata` rather than taking a pointer to one as a parameter. + + * libdb/db_lookup.c (split_content): Allocate and return a `struct + mandata`; remove `pinfo` parameter. Update all callers. + * libdb/db_storage.h (split_content): Update prototype. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + Always allocate struct mandata on the heap + + This means we no longer need two slightly different functions for + freeing it. + + * libdb/db_lookup.c (dblookup_pattern): Allocate `struct mandata` on the + heap. Simplify arrangements for adding to the `infos` list. + (dbstore): Allocate `struct mandata` on the heap. + * src/catman.c (parse_for_sec): Likewise. + * src/check_mandirs.c (purge_pointers, purge_missing): Likewise. + * src/straycats.c (check_for_stray): Likewise. + * src/whatis.c (do_apropos): Likewise. + + * lib/filenames.c (free_mandata_elements): Remove function and move its + contents to ... + (free_mandata_struct): ... here, if `pinfo` is set. + * lib/filenames.h (free_mandata_elements): Remove prototype. + +2022-09-24 Colin Watson <cjwatson@debian.org> + + filename_info: Always allocate info->name + + Only one call site has any interest in this being unset (in order to + pass the result to `dbstore`), and even there it's easier for the caller + to deal with unsetting it. Otherwise, it's strictly more convenient if + the structure returned by `filename_info` always includes the name of + the page. + + * lib/filenames.c (filename_info): Remove `req_name` parameter; update + all callers. Always set `info->name` before returning successfully. + * lib/filenames.h (filename_info): Update prototype. + * src/check_mandirs.c (test_manfile): Use `info->name` for + `manpage_base` rather than poking around in `info->addr`. + (count_glob_matches): Remove `name` parameter; update all callers. + * src/descriptions_store.c (store_descriptions): Drop now-unnecessary + check for `trace_info->name`. + * src/man.c (do_global_apropos_section): Build `title` using + `info->name` rather than poking around in `info->addr`. + * src/mandb.c (update_one_file): Drop now-unnecessary check for + `info->name`. + +2022-09-23 Colin Watson <cjwatson@debian.org> + + Reduce indentation in store_descriptions a bit + + * src/descriptions_store.c (store_descriptions): Use an early-continue + construction to save a level of indentation. + +2022-09-23 Colin Watson <cjwatson@debian.org> + + Simplify the filename_info interface + + This interface is a bit less confusing. + + * libdb/db_lookup.c (free_mandata_elements, free_mandata_struct): Move + to ... + * lib/filenames.c (free_mandata_elements, free_mandata_struct): ... + here. + * libdb/db_storage.h (free_mandata_elements, free_mandata_struct): Move + to ... + * lib/filenames.h (free_mandata_elements, free_mandata_struct): ... + here. + + * lib/filenames.c (filename_info): Return a `struct mandata` with the + `addr` element set to the buffer containing the fields, rather than + returning the buffer and taking a pointer to a `struct mandata` as a + parameter. Update all callers. + * lib/filenames.h (filename_info): Update prototype. + +2022-09-23 Colin Watson <cjwatson@debian.org> + + Move manual page file name utilities to lib/ + + * src/filenames.c: Move to ... + * lib/filenames.c: ... here. + * src/filenames.h: Move to ... + * lib/filenames.h: ... here. Update positioning of all includes. + * lib/Makefile.am (libman_la_SOURCES): Add `filenames.c` and + `filenames.h`. + * src/Makefile.am (man_recode_LDADD): Link with `$(LIBMAN)` instead of + `$(LIBMANDB)`. + (lexgrog_SOURCES, man_SOURCES, mandb_SOURCES): Remove `filenames.c` and + `filenames.h`. + * po/POTFILES.in: Rename `src/filenames.c` to `lib/filenames.c`. + + * lib/filenames.c (gripe_bogus_manpage): Remove `quiet < 2` condition. + (filename_info): Add `warn_if_bogus` parameter; only call + `gripe_bogus_manpage` if it is set. Update all callers. + * lib/filename.h (filename_info): Update prototype. + + * libdb/db_storage.h (struct mandata): Move to ... + * lib/filenames.h (struct mandata): ... here. Add includes where + necessary. + +2022-09-23 Colin Watson <cjwatson@debian.org> + + Fix distcheck + + * po/POTFILES.in: Rename `src/compression.c` to `lib/compression.c`. + +2022-09-23 Colin Watson <cjwatson@debian.org> + + Move compression file name utilities to lib/ + + This makes more sense as a home for plain file name manipulation + utilities. I also merged `include/comp_src.h.in` into + `lib/compression.c`, because structure definitions (as opposed to + declarations) don't belong in header files. + + * src/compression.c: Move to ... + * lib/compression.c: ... here. Remove unnecessary `pipeline.h` include. + * src/compression.h: Move to ... + * lib/compression.h: ... here. Update positioning of all includes. + * lib/Makefile.am (libman_la_SOURCES): Add `compression.c` and + `compression.h`. + * lib/README: Add `compression.*`. + * src/Makefile.am (lexgrog_SOURCES, man_SOURCES, man_recode_SOURCES, + mandb_SOURCES): Remove `compression.c` and `compression.h`. + + * include/comp_src.h (comp_list): Move to ... + * lib/compression.c (comp_list): ... here. Update all references. + * include/manconfig.h (struct compression, comp_list): Move to ... + * lib/compression.h (struct compression, comp_list): ... here. Add + includes where necessary. + * Makefile.am (noinst_HEADERS): Remove `include/comp_src.h`. + +2022-09-23 Colin Watson <cjwatson@debian.org> + + Remove infoalloc macro + + It doesn't really pull its weight. + + * libdb/db_lookup.c (dblookup, dblookup_pattern): Call `XZALLOC (struct + mandata)` rather than `infoalloc ()`. + * src/man.c (try_section, do_global_apropos_section): Likewise. + * libdb/db_storage.h (infoalloc): Remove. + +2022-09-19 Colin Watson <cjwatson@debian.org> + + Maintain multi key references in sorted order + + This is a step towards being able to reproduce the same database given + the same manual page tree. + + * bootstrap.conf (gnulib_modules): Add stpcpy. + * libdb/db_lookup.c (name_ext_equals): Remove static; add pure + attribute. + (name_ext_compare): New function. + (list_extensions): Add entries in sorted order. + * libdb/db_storage.h (name_ext_equals, name_ext_compare): Add + prototypes. + * libdb/db_store.c (make_extensions_reference): New function. + (dbstore): When building or updating multi key references, maintain them + in sorted order. + * NEWS.md: Document this. + +2022-09-19 Colin Watson <cjwatson@debian.org> + + Remove some excessive debugging output + + This hasn't been of any practical use for many years. + + * lib/security.c (drop_effective_privs, regain_effective_privs): Remove + debug messages emitted when increasing or decreasing the privilege drop + count. + +2022-08-11 Colin Watson <cjwatson@debian.org> + + Fix use of pointer (address only) after free + + I don't believe this was technically undefined behaviour, since we + didn't actually dereference the dangling pointer, merely compared its + value (the pointer address itself) against entries in the cleanup stack. + However, the compiler probably had a hard time proving that, so the + use-after-free warning issued by recent versions of GCC seems fair + enough. + + * src/mandb.c (cleanup): Don't free dbpaths. + (process_manpath): Free it here instead, after calling pop_cleanup. + +2022-08-11 Colin Watson <cjwatson@debian.org> + + Make CATWIDTH override MINCATWIDTH/MAXCATWIDTH + + Otherwise setting `CATWIDTH` to something larger than 80 confusingly + doesn't work unless you also set `MAXCATWIDTH`. + + Fixes https://gitlab.com/cjwatson/man-db/-/issues/9. + + * src/man.c (add_roff_line_length): Skip terminal width range check if + `cat_width` is set. + * man/man5/manpath.man5 (FORMAT): Remove note that `CATWIDTH` should be + within the range set by `MINCATWIDTH` and `MAXCATWIDTH`, and instead say + that it overrides them. + * NEWS.md: Document this. + +2022-07-22 Colin Watson <cjwatson@debian.org> + + Add more case variants of localized versions of NAME + + * src/lexgrog.l (bg_name, lt_name, ru_name, sr_name, srlatin_name, + tr_name, uk_name, vi_name): Add more case variants. + * NEWS.md: Document this. + +2022-07-18 Colin Watson <cjwatson@debian.org> + + Update pre-commit hooks + + * .pre-commit-config.yaml (pre-commit-hooks): Update to v4.3.0. + +2022-07-18 Colin Watson <cjwatson@debian.org> + + Update to Gnulib 20220717 + + Fixes https://gitlab.com/cjwatson/man-db/-/issues/6. + + * bootstrap: Sync to Gnulib df336dc1ae60d8ad9f452f2234951133fe617bb0. + * bootstrap.conf (GNULIB_REVISION): Set to + df336dc1ae60d8ad9f452f2234951133fe617bb0. + * NEWS.md: Document build fix. + +2022-07-15 Colin Watson <cjwatson@chiark.greenend.org.uk> + + Merge branch 'drop-lsm' into 'main' + + Drop LSM file + + See merge request cjwatson/man-db!4 + +2022-07-13 Pino Toscano <toscano.pino@tiscali.it> + + Drop LSM file + + The LSM format is a very old format for software, and it is dead for + many years already. Since keeping the .lsm up-to-date is basically not + much of use, simply drop it altogether. + + * docs/Makefile.am (dist_noinst_DATA): Remove man-db.lsm. + * docs/HACKING.md: Stop mentioning man-db.lsm. + * docs/man-db.lsm: Remove file. + +2022-07-05 Stéphane Aulery <lkppo@free.fr> + + Update French manual page translation + + * man/po4a/po/fr.po: Update from Translation Project. + +2022-06-02 Joe Hansen <joedalton2@yahoo.dk> + + Update Danish translation + + * po/da.po: Update from Translation Project. + +2022-05-18 Colin Watson <cjwatson@debian.org> + + Cache filters alongside whatis information + + `mandb` needs to cache filters together with whatis information, as + otherwise pages were incorrectly recorded with no filters if `mandb` + happened to use cached whatis information for them rather than reading + it from scratch. + + * src/check_mandirs.c (struct whatis): Add filters. + (whatis_free): Free whatis->filters. + (test_manfile): Store and use whatis->filters. + * NEWS.md: Document this. + +2022-04-27 Andika Triwidada <andika@gmail.com> + + Update Indonesian translation + + * po/id.po: Update from Translation Project. + * man/THANKS: Add translator credit. + +2022-04-23 Colin Watson <cjwatson@debian.org> + + Stop GitLab from getting confused about licences + + GitLab uses https://github.com/licensee/licensee to detect the project's + licence, and if that finds multiple matching files then it throws up its + hands and refuses to make a licence assertion, with no apparent way to + override it. + + To avoid this problem, move the secondary licence files (those that + apply only to some files, rather than to the project as a whole) back + into a subdirectory, so that `licensee` doesn't notice them. + + * COPYING.GPLv2: Move to ... + * docs/COPYING.GPLv2: ... here. Update all references. + * COPYING.LIB: Move to ... + * docs/COPYING.LIB: ... here. Update all references. + * Makefile.am (dist_noinst_DATA): Remove COPYING.GPLv2. + * docs/Makefile.am (dist_noinst_DATA): Add COPYING.GPLv2 and + COPYING.LIB. + +2022-04-23 Colin Watson <cjwatson@debian.org> + + Clarify effective GPLv3 licensing + + While man-db's own files are individually licensed under GPLv2 (or in a + few cases LGPLv2.1), the project as a whole is effectively GPLv3 due to + Gnulib. This was already explained in README.md, but make it a bit + clearer by having the top-level COPYING file be a copy of GPLv3. + + * COPYING: Move to ... + * COPYING.GPLv2: ... here. + * COPYING: New file. + * Makefile.am (dist_noinst_DATA): Add COPYING.GPLv2. + * lib/README, man/it/man1/apropos.man1, man/it/man1/man.man1, + man/it/man1/manpath.man1, man/it/man1/whatis.man1, + man/it/man1/zsoelim.man1, man/it/man5/manpath.man5, + man/it/man8/accessdb.man8, man/it/man8/catman.man8, + man/it/man8/mandb.man8, man/man1/apropos.man1, man/man1/lexgrog.man1, + man/man1/man-recode.man1, man/man1/man.man1, man/man1/manconv.man1, + man/man1/manpath.man1, man/man1/whatis.man1, man/man1/zsoelim.man1, + man/man5/manpath.man5, man/man8/accessdb.man8, man/man8/catman.man8, + man/man8/mandb.man8, manual/comp.me, manual/db.me, manual/files.me, + manual/format.me, manual/glossary.me, manual/intro.me, manual/leader.me, + manual/man_db.me, manual/misc.me, manual/sec.me: Refer to COPYING.GPLv2 + rather than COPYING. + +2022-04-23 Colin Watson <cjwatson@debian.org> + + Update pre-commit hooks + + * .pre-commit-config.yaml (pre-commit-hooks): Update to v4.2.0. + +2022-04-17 Emir SARI <emir_sari@icloud.com> + + Update Turkish manual page translation + + * man/po4a/po/tr.po: Update from Translation Project. + * man/THANKS: Update translator credit. + +2022-04-16 Colin Watson <cjwatson@debian.org> + + Recognize another Turkish translation of NAME + + Emir SARI reports that "AD" is the de facto standard technical + terminology for "NAME" in Turkish, rather than "Ä°SÄ°M" which sounds + slightly colloquial. Recognize it as well. + + * src/lexgrog.l (tr_name): Add "AD". + +2022-04-12 Emir SARI <emir_sari@icloud.com> + + Update Turkish translation + + * po/tr.po: Update from Translation Project. + * man/THANKS: Add translator credit. + 2022-03-17 Colin Watson <cjwatson@debian.org> Release man-db 2.10.2 diff --git a/Makefile.am b/Makefile.am index e6ca7158..82f22350 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ endif SUBDIRS = docs gl/lib $(GNULIB_PO) init lib libdb src man manual po tools dist_noinst_DATA = FAQ README.md -noinst_HEADERS = include/comp_src.h include/manconfig.h +noinst_HEADERS = include/manconfig.h EXTRA_DIST = \ .gitignore \ diff --git a/Makefile.in b/Makefile.in index 453109ba..46baeffe 100644 --- a/Makefile.in +++ b/Makefile.in @@ -213,6 +213,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -224,8 +225,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -233,7 +234,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -252,6 +253,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -348,8 +350,8 @@ am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ $(top_srcdir)/build-aux/config.sub \ $(top_srcdir)/build-aux/install-sh \ $(top_srcdir)/build-aux/ltmain.sh \ - $(top_srcdir)/build-aux/missing ABOUT-NLS COPYING COPYING.LIB \ - NEWS.md README.md build-aux/ar-lib build-aux/compile \ + $(top_srcdir)/build-aux/missing ABOUT-NLS COPYING NEWS.md \ + README.md build-aux/ar-lib build-aux/compile \ build-aux/config.guess build-aux/config.rpath \ build-aux/config.sub build-aux/install-sh build-aux/ltmain.sh \ build-aux/missing @@ -444,6 +446,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -464,6 +467,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -755,6 +759,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -883,6 +888,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1060,6 +1066,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1215,6 +1222,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1250,6 +1258,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1286,6 +1295,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ @@ -1639,7 +1649,7 @@ zstd = @zstd@ @HAVE_GNULIB_PO_TRUE@GNULIB_PO = gl/po SUBDIRS = docs gl/lib $(GNULIB_PO) init lib libdb src man manual po tools dist_noinst_DATA = FAQ README.md -noinst_HEADERS = include/comp_src.h include/manconfig.h +noinst_HEADERS = include/manconfig.h # These macro files are imported by gnulib-tool, but at present not used. We # include them in the distribution anyway for maximum consistency. @@ -1,3 +1,40 @@ +man-db 2.11.0 (15 October 2022) +=============================== + +Fixes: + + * `mandb` now correctly records filters in the database if it uses cached + whatis information. + * Upgrade Gnulib, fixing syntax error on glibc systems with GCC 11. + * The `CATWIDTH` configuration file directive now overrides `MINCATWIDTH` + and `MAXCATWIDTH`. + * Database entries for links were often incorrectly stored as if they were + entries for the ultimate source of the page. They are now stored with + the correct type. + * Store links in the database using the section and extension of the link + rather than of the ultimate source file. + * Consider pages for adding to the database even if they seem to already + exist; this performance optimization is no longer needed due to caching, + and it produced inconsistent results in some unusual cases. + * `man` now runs any required preprocessors in the same order that `groff` + does, rather than trusting the order of filters in a page's preprocessor + string. + * Fix building on MinGW. (I haven't been able to test this; help from + MinGW experts would be welcome.) + +Improvements: + + * Add more recognized case variants for localized versions of the `NAME` + section. + * Maintain multi keys in sorted order, improving database reproducibility. + * Pick a more consistent name for the target of a whatis entry in the + database. + * Extend rules for when to replace one database entry with another, + producing more stable behaviour. + * Fully reorganize databases after writing them, allowing the reproduction + of bitwise-identical databases regardless of scan order (at least with + GDBM). + man-db 2.10.2 (17 March 2022) ============================= @@ -175,7 +175,7 @@ configuration process: * `include/manconfig.h` regarding the default section list and other specific definitions. -* `include/comp_src.h` if the default compressor support is +* `lib/compression.c` if the default compressor support is inadequate for your requirements. (Usually `.Z` [compress], `.z`, `.gz` [gzip].) @@ -1686,6 +1686,7 @@ m4_include([gl/m4/raise.m4]) m4_include([gl/m4/rawmemchr.m4]) m4_include([gl/m4/readdir.m4]) m4_include([gl/m4/readlink.m4]) +m4_include([gl/m4/readlinkat.m4]) m4_include([gl/m4/realloc.m4]) m4_include([gl/m4/reallocarray.m4]) m4_include([gl/m4/regex.m4]) @@ -1700,6 +1701,7 @@ m4_include([gl/m4/setlocale_null.m4]) m4_include([gl/m4/sigaction.m4]) m4_include([gl/m4/signal_h.m4]) m4_include([gl/m4/signalblocking.m4]) +m4_include([gl/m4/sigpipe.m4]) m4_include([gl/m4/size_max.m4]) m4_include([gl/m4/sleep.m4]) m4_include([gl/m4/socketlib.m4]) @@ -1716,6 +1718,7 @@ m4_include([gl/m4/stdint.m4]) m4_include([gl/m4/stdint_h.m4]) m4_include([gl/m4/stdio_h.m4]) m4_include([gl/m4/stdlib_h.m4]) +m4_include([gl/m4/stpcpy.m4]) m4_include([gl/m4/strcase.m4]) m4_include([gl/m4/strcasestr.m4]) m4_include([gl/m4/strchrnul.m4]) @@ -1737,6 +1740,7 @@ m4_include([gl/m4/sys_types_h.m4]) m4_include([gl/m4/sys_uio_h.m4]) m4_include([gl/m4/sysexits.m4]) m4_include([gl/m4/tempname.m4]) +m4_include([gl/m4/termios_h.m4]) m4_include([gl/m4/threadlib.m4]) m4_include([gl/m4/time_h.m4]) m4_include([gl/m4/timespec.m4]) @@ -1,6 +1,6 @@ #! /bin/sh # Print a version string. -scriptversion=2022-01-26.05; # UTC +scriptversion=2022-06-04.00; # UTC # Bootstrap this package from checked-out sources. @@ -487,7 +487,7 @@ fi # Die if there is no AC_CONFIG_AUX_DIR($build_aux) line in configure.ac. found_aux_dir=no -grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'\])' configure.ac \ +grep '^[ ]*AC_CONFIG_AUX_DIR(\['"$build_aux"'])' configure.ac \ >/dev/null && found_aux_dir=yes grep '^[ ]*AC_CONFIG_AUX_DIR('"$build_aux"')' configure.ac \ >/dev/null && found_aux_dir=yes @@ -776,7 +776,8 @@ if $use_gnulib; then # not be performed because we do not know what the depth of the commit # is without fetching all commits. So fallback to fetching all commits. git -C "$gnulib_path" init - git -C "$gnulib_path" remote add origin ${GNULIB_URL:-$default_gnulib_url} + git -C "$gnulib_path" remote add origin \ + ${GNULIB_URL:-$default_gnulib_url} git -C "$gnulib_path" fetch $shallow origin "$GNULIB_REVISION" \ || git -C "$gnulib_path" fetch origin \ || cleanup_gnulib diff --git a/bootstrap.conf b/bootstrap.conf index 281176b9..63883feb 100644 --- a/bootstrap.conf +++ b/bootstrap.conf @@ -16,7 +16,7 @@ # along with this program. If not, see <https://www.gnu.org/licenses/>. -GNULIB_REVISION=8c4f4d7a3c28f88b64fce2fb1d0dc0e570d1a482 +GNULIB_REVISION=df336dc1ae60d8ad9f452f2234951133fe617bb0 # gnulib modules used by this package. gnulib_modules=" @@ -66,14 +66,17 @@ gnulib_modules=" setenv sigaction signal-h + sigpipe sigprocmask stat-time stdbool + stpcpy strcase strcasestr strerror strsep tempname + termios timespec unlinkat utimens diff --git a/build-aux/config.guess b/build-aux/config.guess index 7f76b622..1817bdce 100755 --- a/build-aux/config.guess +++ b/build-aux/config.guess @@ -4,7 +4,7 @@ # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2022-01-09' +timestamp='2022-05-25' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -1151,16 +1151,27 @@ EOF ;; x86_64:Linux:*:*) set_cc_for_build + CPU=$UNAME_MACHINE LIBCABI=$LIBC if test "$CC_FOR_BUILD" != no_compiler_found; then - if (echo '#ifdef __ILP32__'; echo IS_X32; echo '#endif') | \ - (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_X32 >/dev/null - then - LIBCABI=${LIBC}x32 - fi + ABI=64 + sed 's/^ //' << EOF > "$dummy.c" + #ifdef __i386__ + ABI=x86 + #else + #ifdef __ILP32__ + ABI=x32 + #endif + #endif +EOF + cc_set_abi=`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^ABI' | sed 's, ,,g'` + eval "$cc_set_abi" + case $ABI in + x86) CPU=i686 ;; + x32) LIBCABI=${LIBC}x32 ;; + esac fi - GUESS=$UNAME_MACHINE-pc-linux-$LIBCABI + GUESS=$CPU-pc-linux-$LIBCABI ;; xtensa*:Linux:*:*) GUESS=$UNAME_MACHINE-unknown-linux-$LIBC @@ -1367,8 +1378,11 @@ EOF BePC:Haiku:*:*) # Haiku running on Intel PC compatible. GUESS=i586-pc-haiku ;; - x86_64:Haiku:*:*) - GUESS=x86_64-unknown-haiku + ppc:Haiku:*:*) # Haiku running on Apple PowerPC + GUESS=powerpc-apple-haiku + ;; + *:Haiku:*:*) # Haiku modern gcc (not bound by BeOS compat) + GUESS=$UNAME_MACHINE-unknown-haiku ;; SX-4:SUPER-UX:*:*) GUESS=sx4-nec-superux$UNAME_RELEASE diff --git a/build-aux/config.sub b/build-aux/config.sub index 9b62e37c..dba16e84 100755 --- a/build-aux/config.sub +++ b/build-aux/config.sub @@ -1,10 +1,10 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2021 Free Software Foundation, Inc. +# Copyright 1992-2022 Free Software Foundation, Inc. # shellcheck disable=SC2006,SC2268 # see below for rationale -timestamp='2021-12-25' +timestamp='2022-01-03' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -76,7 +76,7 @@ Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) -Copyright 1992-2021 Free Software Foundation, Inc. +Copyright 1992-2022 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." diff --git a/build-aux/ltmain.sh b/build-aux/ltmain.sh index 21e5e078..8fb8700e 100755 --- a/build-aux/ltmain.sh +++ b/build-aux/ltmain.sh @@ -1,12 +1,12 @@ -#! /bin/sh +#! /usr/bin/env sh ## DO NOT EDIT - This file generated from ./build-aux/ltmain.in -## by inline-source v2014-01-03.01 +## by inline-source v2019-02-19.15 -# libtool (GNU libtool) 2.4.6 +# libtool (GNU libtool) 2.4.7 # Provide generalized library-building support services. # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 -# Copyright (C) 1996-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2019, 2021-2022 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -31,8 +31,8 @@ PROGRAM=libtool PACKAGE=libtool -VERSION="2.4.6 Debian-2.4.6-15" -package_revision=2.4.6 +VERSION="2.4.7 Debian-2.4.7-4" +package_revision=2.4.7 ## ------ ## @@ -64,34 +64,25 @@ package_revision=2.4.6 # libraries, which are installed to $pkgauxdir. # Set a version string for this script. -scriptversion=2015-01-20.17; # UTC +scriptversion=2019-02-19.15; # UTC # General shell script boiler plate, and helper functions. # Written by Gary V. Vaughan, 2004 -# Copyright (C) 2004-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. - -# As a special exception to the GNU General Public License, if you distribute -# this file as part of a program or library that is built using GNU Libtool, -# you may include this file under the same distribution terms that you use -# for the rest of that program. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2004-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# <https://opensource.org/license/MIT>, and GPL version 2 or later +# <http://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# Please report bugs or propose patches to gary@gnu.org. +# Please report bugs or propose patches to: +# <https://github.com/gnulib-modules/bootstrap/issues> ## ------ ## @@ -139,9 +130,12 @@ do _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\" fi" done - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# These NLS vars are set unconditionally (bootstrap issue #24). Unset those +# in case the environment reset is needed later and the $save_* variant is not +# defined (see the code above). +LC_ALL=C +LANGUAGE=C +export LANGUAGE LC_ALL # Make sure IFS has a sensible default sp=' ' @@ -159,6 +153,26 @@ if test "${PATH_SEPARATOR+set}" != set; then fi +# func_unset VAR +# -------------- +# Portably unset VAR. +# In some shells, an 'unset VAR' statement leaves a non-zero return +# status if VAR is already unset, which might be problematic if the +# statement is used at the end of a function (thus poisoning its return +# value) or when 'set -e' is active (causing even a spurious abort of +# the script in this case). +func_unset () +{ + { eval $1=; (eval unset $1) >/dev/null 2>&1 && eval unset $1 || : ; } +} + + +# Make sure CDPATH doesn't cause `cd` commands to output the target dir. +func_unset CDPATH + +# Make sure ${,E,F}GREP behave sanely. +func_unset GREP_OPTIONS + ## ------------------------- ## ## Locate command utilities. ## @@ -259,7 +273,7 @@ test -z "$SED" && { rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin + func_path_progs "sed gsed" func_check_prog_sed "$PATH:/usr/xpg4/bin" rm -f conftest.sed SED=$func_path_progs_result } @@ -295,7 +309,7 @@ test -z "$GREP" && { rm -f conftest.in conftest.tmp conftest.nl conftest.out } - func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin + func_path_progs "grep ggrep" func_check_prog_grep "$PATH:/usr/xpg4/bin" GREP=$func_path_progs_result } @@ -360,6 +374,35 @@ sed_double_backslash="\ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g s/\n//g" +# require_check_ifs_backslash +# --------------------------- +# Check if we can use backslash as IFS='\' separator, and set +# $check_ifs_backshlash_broken to ':' or 'false'. +require_check_ifs_backslash=func_require_check_ifs_backslash +func_require_check_ifs_backslash () +{ + _G_save_IFS=$IFS + IFS='\' + _G_check_ifs_backshlash='a\\b' + for _G_i in $_G_check_ifs_backshlash + do + case $_G_i in + a) + check_ifs_backshlash_broken=false + ;; + '') + break + ;; + *) + check_ifs_backshlash_broken=: + break + ;; + esac + done + IFS=$_G_save_IFS + require_check_ifs_backslash=: +} + ## ----------------- ## ## Global variables. ## @@ -580,16 +623,16 @@ if test yes = "$_G_HAVE_PLUSEQ_OP"; then { $debug_cmd - func_quote_for_eval "$2" - eval "$1+=\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1+=\\ \$func_quote_arg_result" }' else func_append_quoted () { $debug_cmd - func_quote_for_eval "$2" - eval "$1=\$$1\\ \$func_quote_for_eval_result" + func_quote_arg pretty "$2" + eval "$1=\$$1\\ \$func_quote_arg_result" } fi @@ -1091,85 +1134,203 @@ func_relative_path () } -# func_quote_for_eval ARG... -# -------------------------- -# Aesthetically quote ARGs to be evaled later. -# This function returns two values: -# i) func_quote_for_eval_result -# double-quoted, suitable for a subsequent eval -# ii) func_quote_for_eval_unquoted_result -# has all characters that are still active within double -# quotes backslashified. -func_quote_for_eval () +# func_quote_portable EVAL ARG +# ---------------------------- +# Internal function to portably implement func_quote_arg. Note that we still +# keep attention to performance here so we as much as possible try to avoid +# calling sed binary (so far O(N) complexity as long as func_append is O(1)). +func_quote_portable () { $debug_cmd - func_quote_for_eval_unquoted_result= - func_quote_for_eval_result= - while test 0 -lt $#; do - case $1 in - *[\\\`\"\$]*) - _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;; - *) - _G_unquoted_arg=$1 ;; - esac - if test -n "$func_quote_for_eval_unquoted_result"; then - func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg" - else - func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg" + $require_check_ifs_backslash + + func_quote_portable_result=$2 + + # one-time-loop (easy break) + while true + do + if $1; then + func_quote_portable_result=`$ECHO "$2" | $SED \ + -e "$sed_double_quote_subst" -e "$sed_double_backslash"` + break fi - case $_G_unquoted_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting, command substitution and variable expansion - # for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_quoted_arg=\"$_G_unquoted_arg\" + # Quote for eval. + case $func_quote_portable_result in + *[\\\`\"\$]*) + # Fallback to sed for $func_check_bs_ifs_broken=:, or when the string + # contains the shell wildcard characters. + case $check_ifs_backshlash_broken$func_quote_portable_result in + :*|*[\[\*\?]*) + func_quote_portable_result=`$ECHO "$func_quote_portable_result" \ + | $SED "$sed_quote_subst"` + break + ;; + esac + + func_quote_portable_old_IFS=$IFS + for _G_char in '\' '`' '"' '$' + do + # STATE($1) PREV($2) SEPARATOR($3) + set start "" "" + func_quote_portable_result=dummy"$_G_char$func_quote_portable_result$_G_char"dummy + IFS=$_G_char + for _G_part in $func_quote_portable_result + do + case $1 in + quote) + func_append func_quote_portable_result "$3$2" + set quote "$_G_part" "\\$_G_char" + ;; + start) + set first "" "" + func_quote_portable_result= + ;; + first) + set quote "$_G_part" "" + ;; + esac + done + done + IFS=$func_quote_portable_old_IFS ;; - *) - _G_quoted_arg=$_G_unquoted_arg - ;; + *) ;; esac - - if test -n "$func_quote_for_eval_result"; then - func_append func_quote_for_eval_result " $_G_quoted_arg" - else - func_append func_quote_for_eval_result "$_G_quoted_arg" - fi - shift + break done + + func_quote_portable_unquoted_result=$func_quote_portable_result + case $func_quote_portable_result in + # double-quote args containing shell metacharacters to delay + # word splitting, command substitution and variable expansion + # for a subsequent eval. + # many bourne shells cannot handle close brackets correctly + # in scan sets, so we specify it separately. + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + func_quote_portable_result=\"$func_quote_portable_result\" + ;; + esac } -# func_quote_for_expand ARG -# ------------------------- -# Aesthetically quote ARG to be evaled later; same as above, -# but do not quote variable references. -func_quote_for_expand () -{ - $debug_cmd +# func_quotefast_eval ARG +# ----------------------- +# Quote one ARG (internal). This is equivalent to 'func_quote_arg eval ARG', +# but optimized for speed. Result is stored in $func_quotefast_eval. +if test xyes = `(x=; printf -v x %q yes; echo x"$x") 2>/dev/null`; then + printf -v _GL_test_printf_tilde %q '~' + if test '\~' = "$_GL_test_printf_tilde"; then + func_quotefast_eval () + { + printf -v func_quotefast_eval_result %q "$1" + } + else + # Broken older Bash implementations. Make those faster too if possible. + func_quotefast_eval () + { + case $1 in + '~'*) + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + ;; + *) + printf -v func_quotefast_eval_result %q "$1" + ;; + esac + } + fi +else + func_quotefast_eval () + { + func_quote_portable false "$1" + func_quotefast_eval_result=$func_quote_portable_result + } +fi - case $1 in - *[\\\`\"]*) - _G_arg=`$ECHO "$1" | $SED \ - -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;; - *) - _G_arg=$1 ;; + +# func_quote_arg MODEs ARG +# ------------------------ +# Quote one ARG to be evaled later. MODEs argument may contain zero or more +# specifiers listed below separated by ',' character. This function returns two +# values: +# i) func_quote_arg_result +# double-quoted (when needed), suitable for a subsequent eval +# ii) func_quote_arg_unquoted_result +# has all characters that are still active within double +# quotes backslashified. Available only if 'unquoted' is specified. +# +# Available modes: +# ---------------- +# 'eval' (default) +# - escape shell special characters +# 'expand' +# - the same as 'eval'; but do not quote variable references +# 'pretty' +# - request aesthetic output, i.e. '"a b"' instead of 'a\ b'. This might +# be used later in func_quote to get output like: 'echo "a b"' instead +# of 'echo a\ b'. This is slower than default on some shells. +# 'unquoted' +# - produce also $func_quote_arg_unquoted_result which does not contain +# wrapping double-quotes. +# +# Examples for 'func_quote_arg pretty,unquoted string': +# +# string | *_result | *_unquoted_result +# ------------+-----------------------+------------------- +# " | \" | \" +# a b | "a b" | a b +# "a b" | "\"a b\"" | \"a b\" +# * | "*" | * +# z="${x-$y}" | "z=\"\${x-\$y}\"" | z=\"\${x-\$y}\" +# +# Examples for 'func_quote_arg pretty,unquoted,expand string': +# +# string | *_result | *_unquoted_result +# --------------+---------------------+-------------------- +# z="${x-$y}" | "z=\"${x-$y}\"" | z=\"${x-$y}\" +func_quote_arg () +{ + _G_quote_expand=false + case ,$1, in + *,expand,*) + _G_quote_expand=: + ;; esac - case $_G_arg in - # Double-quote args containing shell metacharacters to delay - # word splitting and command substitution for a subsequent eval. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - _G_arg=\"$_G_arg\" + case ,$1, in + *,pretty,*|*,expand,*|*,unquoted,*) + func_quote_portable $_G_quote_expand "$2" + func_quote_arg_result=$func_quote_portable_result + func_quote_arg_unquoted_result=$func_quote_portable_unquoted_result + ;; + *) + # Faster quote-for-eval for some shells. + func_quotefast_eval "$2" + func_quote_arg_result=$func_quotefast_eval_result ;; esac +} + - func_quote_for_expand_result=$_G_arg +# func_quote MODEs ARGs... +# ------------------------ +# Quote all ARGs to be evaled later and join them into single command. See +# func_quote_arg's description for more info. +func_quote () +{ + $debug_cmd + _G_func_quote_mode=$1 ; shift + func_quote_result= + while test 0 -lt $#; do + func_quote_arg "$_G_func_quote_mode" "$1" + if test -n "$func_quote_result"; then + func_append func_quote_result " $func_quote_arg_result" + else + func_append func_quote_result "$func_quote_arg_result" + fi + shift + done } @@ -1215,8 +1376,8 @@ func_show_eval () _G_cmd=$1 _G_fail_exp=${2-':'} - func_quote_for_expand "$_G_cmd" - eval "func_notquiet $func_quote_for_expand_result" + func_quote_arg pretty,expand "$_G_cmd" + eval "func_notquiet $func_quote_arg_result" $opt_dry_run || { eval "$_G_cmd" @@ -1241,8 +1402,8 @@ func_show_eval_locale () _G_fail_exp=${2-':'} $opt_quiet || { - func_quote_for_expand "$_G_cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$_G_cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || { @@ -1369,30 +1530,26 @@ func_lt_ver () # End: #! /bin/sh -# Set a version string for this script. -scriptversion=2015-10-07.11; # UTC - # A portable, pluggable option parser for Bourne shell. # Written by Gary V. Vaughan, 2010 -# Copyright (C) 2010-2015 Free Software Foundation, Inc. -# This is free software; see the source for copying conditions. There is NO -# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# This is free software. There is NO warranty; not even for +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Copyright (C) 2010-2019, 2021 Bootstrap Authors +# +# This file is dual licensed under the terms of the MIT license +# <https://opensource.org/license/MIT>, and GPL version 2 or later +# <http://www.gnu.org/licenses/gpl-2.0.html>. You must apply one of +# these licenses when using or redistributing this software or any of +# the files within it. See the URLs above, or the file `LICENSE` +# included in the Bootstrap distribution for the full license texts. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Please report bugs or propose patches to: +# <https://github.com/gnulib-modules/bootstrap/issues> -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# Please report bugs or propose patches to gary@gnu.org. +# Set a version string for this script. +scriptversion=2019-02-19.15; # UTC ## ------ ## @@ -1415,7 +1572,7 @@ scriptversion=2015-10-07.11; # UTC # # In order for the '--version' option to work, you will need to have a # suitably formatted comment like the one at the top of this file -# starting with '# Written by ' and ending with '# warranty; '. +# starting with '# Written by ' and ending with '# Copyright'. # # For '-h' and '--help' to work, you will also need a one line # description of your script's purpose in a comment directly above the @@ -1427,7 +1584,7 @@ scriptversion=2015-10-07.11; # UTC # to display verbose messages only when your user has specified # '--verbose'. # -# After sourcing this file, you can plug processing for additional +# After sourcing this file, you can plug in processing for additional # options by amending the variables from the 'Configuration' section # below, and following the instructions in the 'Option parsing' # section further down. @@ -1476,8 +1633,8 @@ fatal_help="Try '\$progname --help' for more information." ## ------------------------- ## # This section contains functions for adding, removing, and running hooks -# to the main code. A hook is just a named list of of function, that can -# be run in order later on. +# in the main code. A hook is just a list of function names that can be +# run in order later on. # func_hookable FUNC_NAME # ----------------------- @@ -1510,7 +1667,8 @@ func_add_hook () # func_remove_hook FUNC_NAME HOOK_FUNC # ------------------------------------ -# Remove HOOK_FUNC from the list of functions called by FUNC_NAME. +# Remove HOOK_FUNC from the list of hook functions to be called by +# FUNC_NAME. func_remove_hook () { $debug_cmd @@ -1519,10 +1677,28 @@ func_remove_hook () } +# func_propagate_result FUNC_NAME_A FUNC_NAME_B +# --------------------------------------------- +# If the *_result variable of FUNC_NAME_A _is set_, assign its value to +# *_result variable of FUNC_NAME_B. +func_propagate_result () +{ + $debug_cmd + + func_propagate_result_result=: + if eval "test \"\${${1}_result+set}\" = set" + then + eval "${2}_result=\$${1}_result" + else + func_propagate_result_result=false + fi +} + + # func_run_hooks FUNC_NAME [ARG]... # --------------------------------- # Run all hook functions registered to FUNC_NAME. -# It is assumed that the list of hook functions contains nothing more +# It's assumed that the list of hook functions contains nothing more # than a whitespace-delimited list of legal shell function names, and # no effort is wasted trying to catch shell meta-characters or preserve # whitespace. @@ -1534,22 +1710,19 @@ func_run_hooks () case " $hookable_fns " in *" $1 "*) ;; - *) func_fatal_error "'$1' does not support hook funcions.n" ;; + *) func_fatal_error "'$1' does not support hook functions." ;; esac eval _G_hook_fns=\$$1_hooks; shift for _G_hook in $_G_hook_fns; do - if eval $_G_hook '"$@"'; then - # store returned options list back into positional - # parameters for next 'cmd' execution. - eval _G_hook_result=\$${_G_hook}_result - eval set dummy "$_G_hook_result"; shift - _G_rc_run_hooks=: + func_unset "${_G_hook}_result" + eval $_G_hook '${1+"$@"}' + func_propagate_result $_G_hook func_run_hooks + if $func_propagate_result_result; then + eval set dummy "$func_run_hooks_result"; shift fi done - - $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result } @@ -1559,14 +1732,16 @@ func_run_hooks () ## --------------- ## # In order to add your own option parsing hooks, you must accept the -# full positional parameter list in your hook function, you may remove/edit -# any options that you action, and then pass back the remaining unprocessed -# options in '<hooked_function_name>_result', escaped suitably for -# 'eval'. In this case you also must return $EXIT_SUCCESS to let the -# hook's caller know that it should pay attention to -# '<hooked_function_name>_result'. Returning $EXIT_FAILURE signalizes that -# arguments are left untouched by the hook and therefore caller will ignore the -# result variable. +# full positional parameter list from your hook function. You may remove +# or edit any options that you action, and then pass back the remaining +# unprocessed options in '<hooked_function_name>_result', escaped +# suitably for 'eval'. +# +# The '<hooked_function_name>_result' variable is automatically unset +# before your hook gets called; for best performance, only set the +# *_result variable when necessary (i.e. don't call the 'func_quote' +# function unnecessarily because it can be an expensive operation on some +# machines). # # Like this: # @@ -1578,11 +1753,8 @@ func_run_hooks () # usage_message=$usage_message' # -s, --silent don'\''t print informational messages # ' -# # No change in '$@' (ignored completely by this hook). There is -# # no need to do the equivalent (but slower) action: -# # func_quote_for_eval ${1+"$@"} -# # my_options_prep_result=$func_quote_for_eval_result -# false +# # No change in '$@' (ignored completely by this hook). Leave +# # my_options_prep_result variable intact. # } # func_add_hook func_options_prep my_options_prep # @@ -1593,7 +1765,7 @@ func_run_hooks () # # args_changed=false # -# # Note that for efficiency, we parse as many options as we can +# # Note that, for efficiency, we parse as many options as we can # # recognise in a loop before passing the remainder back to the # # caller on the first unrecognised argument we encounter. # while test $# -gt 0; do @@ -1610,18 +1782,17 @@ func_run_hooks () # args_changed=: # ;; # *) # Make sure the first unrecognised option "$_G_opt" -# # is added back to "$@", we could need that later -# # if $args_changed is true. +# # is added back to "$@" in case we need it later, +# # if $args_changed was set to 'true'. # set dummy "$_G_opt" ${1+"$@"}; shift; break ;; # esac # done # +# # Only call 'func_quote' here if we processed at least one argument. # if $args_changed; then -# func_quote_for_eval ${1+"$@"} -# my_silent_option_result=$func_quote_for_eval_result +# func_quote eval ${1+"$@"} +# my_silent_option_result=$func_quote_result # fi -# -# $args_changed # } # func_add_hook func_parse_options my_silent_option # @@ -1632,8 +1803,6 @@ func_run_hooks () # # $opt_silent && $opt_verbose && func_fatal_help "\ # '--silent' and '--verbose' options are mutually exclusive." -# -# false # } # func_add_hook func_validate_options my_option_validation # @@ -1649,13 +1818,8 @@ func_options_finish () { $debug_cmd - _G_func_options_finish_exit=false - if func_run_hooks func_options ${1+"$@"}; then - func_options_finish_result=$func_run_hooks_result - _G_func_options_finish_exit=: - fi - - $_G_func_options_finish_exit + func_run_hooks func_options ${1+"$@"} + func_propagate_result func_run_hooks func_options_finish } @@ -1668,28 +1832,27 @@ func_options () { $debug_cmd - _G_rc_options=false + _G_options_quoted=false for my_func in options_prep parse_options validate_options options_finish do - if eval func_$my_func '${1+"$@"}'; then - eval _G_res_var='$'"func_${my_func}_result" - eval set dummy "$_G_res_var" ; shift - _G_rc_options=: + func_unset func_${my_func}_result + func_unset func_run_hooks_result + eval func_$my_func '${1+"$@"}' + func_propagate_result func_$my_func func_options + if $func_propagate_result_result; then + eval set dummy "$func_options_result"; shift + _G_options_quoted=: fi done - # Save modified positional parameters for caller. As a top-level - # options-parser function we always need to set the 'func_options_result' - # variable (regardless the $_G_rc_options value). - if $_G_rc_options; then - func_options_result=$_G_res_var - else - func_quote_for_eval ${1+"$@"} - func_options_result=$func_quote_for_eval_result - fi - - $_G_rc_options + $_G_options_quoted || { + # As we (func_options) are top-level options-parser function and + # nobody quoted "$@" for us yet, we need to do it explicitly for + # caller. + func_quote eval ${1+"$@"} + func_options_result=$func_quote_result + } } @@ -1699,8 +1862,7 @@ func_options () # Note that when calling hook functions, we pass through the list of # positional parameters. If a hook function modifies that list, and # needs to propagate that back to rest of this script, then the complete -# modified list must be put in 'func_run_hooks_result' before -# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned). +# modified list must be put in 'func_run_hooks_result' before returning. func_hookable func_options_prep func_options_prep () { @@ -1710,14 +1872,8 @@ func_options_prep () opt_verbose=false opt_warning_types= - _G_rc_options_prep=false - if func_run_hooks func_options_prep ${1+"$@"}; then - _G_rc_options_prep=: - # save modified positional parameters for caller - func_options_prep_result=$func_run_hooks_result - fi - - $_G_rc_options_prep + func_run_hooks func_options_prep ${1+"$@"} + func_propagate_result func_run_hooks func_options_prep } @@ -1729,27 +1885,32 @@ func_parse_options () { $debug_cmd - func_parse_options_result= - - _G_rc_parse_options=false + _G_parse_options_requote=false # this just eases exit handling while test $# -gt 0; do # Defer to hook functions for initial option parsing, so they # get priority in the event of reusing an option name. - if func_run_hooks func_parse_options ${1+"$@"}; then - eval set dummy "$func_run_hooks_result"; shift - _G_rc_parse_options=: + func_run_hooks func_parse_options ${1+"$@"} + func_propagate_result func_run_hooks func_parse_options + if $func_propagate_result_result; then + eval set dummy "$func_parse_options_result"; shift + # Even though we may have changed "$@", we passed the "$@" array + # down into the hook and it quoted it for us (because we are in + # this if-branch). No need to quote it again. + _G_parse_options_requote=false fi # Break out of the loop if we already parsed every option. test $# -gt 0 || break + # We expect that one of the options parsed in this function matches + # and thus we remove _G_opt from "$@" and need to re-quote. _G_match_parse_options=: _G_opt=$1 shift case $_G_opt in --debug|-x) debug_cmd='set -x' - func_echo "enabling shell trace mode" + func_echo "enabling shell trace mode" >&2 $debug_cmd ;; @@ -1760,7 +1921,7 @@ func_parse_options () --warnings|--warning|-W) if test $# = 0 && func_missing_arg $_G_opt; then - _G_rc_parse_options=: + _G_parse_options_requote=: break fi case " $warning_categories $1" in @@ -1815,7 +1976,7 @@ func_parse_options () shift ;; - --) _G_rc_parse_options=: ; break ;; + --) _G_parse_options_requote=: ; break ;; -*) func_fatal_help "unrecognised option: '$_G_opt'" ;; *) set dummy "$_G_opt" ${1+"$@"}; shift _G_match_parse_options=false @@ -1823,17 +1984,16 @@ func_parse_options () ;; esac - $_G_match_parse_options && _G_rc_parse_options=: + if $_G_match_parse_options; then + _G_parse_options_requote=: + fi done - - if $_G_rc_parse_options; then + if $_G_parse_options_requote; then # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - func_parse_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + func_parse_options_result=$func_quote_result fi - - $_G_rc_parse_options } @@ -1846,21 +2006,14 @@ func_validate_options () { $debug_cmd - _G_rc_validate_options=false - # Display all warnings if -W was not given. test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" - if func_run_hooks func_validate_options ${1+"$@"}; then - # save modified positional parameters for caller - func_validate_options_result=$func_run_hooks_result - _G_rc_validate_options=: - fi + func_run_hooks func_validate_options ${1+"$@"} + func_propagate_result func_run_hooks func_validate_options # Bail if the options were screwed! $exit_cmd $EXIT_FAILURE - - $_G_rc_validate_options } @@ -1916,8 +2069,8 @@ func_missing_arg () # func_split_equals STRING # ------------------------ -# Set func_split_equals_lhs and func_split_equals_rhs shell variables after -# splitting STRING at the '=' sign. +# Set func_split_equals_lhs and func_split_equals_rhs shell variables +# after splitting STRING at the '=' sign. test -z "$_G_HAVE_XSI_OPS" \ && (eval 'x=a/b/c; test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \ @@ -1932,8 +2085,9 @@ then func_split_equals_lhs=${1%%=*} func_split_equals_rhs=${1#*=} - test "x$func_split_equals_lhs" = "x$1" \ - && func_split_equals_rhs= + if test "x$func_split_equals_lhs" = "x$1"; then + func_split_equals_rhs= + fi }' else # ...otherwise fall back to using expr, which is often a shell builtin. @@ -1943,7 +2097,7 @@ else func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'` func_split_equals_rhs= - test "x$func_split_equals_lhs" = "x$1" \ + test "x$func_split_equals_lhs=" = "x$1" \ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'` } fi #func_split_equals @@ -1969,7 +2123,7 @@ else { $debug_cmd - func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'` + func_split_short_opt_name=`expr "x$1" : 'x\(-.\)'` func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'` } fi #func_split_short_opt @@ -2011,31 +2165,44 @@ func_usage_message () # func_version # ------------ # Echo version message to standard output and exit. +# The version message is extracted from the calling file's header +# comments, with leading '# ' stripped: +# 1. First display the progname and version +# 2. Followed by the header comment line matching /^# Written by / +# 3. Then a blank line followed by the first following line matching +# /^# Copyright / +# 4. Immediately followed by any lines between the previous matches, +# except lines preceding the intervening completely blank line. +# For example, see the header comments of this file. func_version () { $debug_cmd printf '%s\n' "$progname $scriptversion" $SED -n ' - /(C)/!b go - :more - /\./!{ - N - s|\n# | | - b more - } - :go - /^# Written by /,/# warranty; / { - s|^# || - s|^# *$|| - s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| - p + /^# Written by /!b + s|^# ||; p; n + + :fwd2blnk + /./ { + n + b fwd2blnk } - /^# Written by / { - s|^# || - p + p; n + + :holdwrnt + s|^# || + s|^# *$|| + /^Copyright /!{ + /./H + n + b holdwrnt } - /^warranty; /q' < "$progpath" + + s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2| + G + s|\(\n\)\n*|\1|g + p; q' < "$progpath" exit $? } @@ -2045,12 +2212,12 @@ func_version () # mode: shell-script # sh-indentation: 2 # eval: (add-hook 'before-save-hook 'time-stamp) -# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC" +# time-stamp-pattern: "30/scriptversion=%:y-%02m-%02d.%02H; # UTC" # time-stamp-time-zone: "UTC" # End: # Set a version string. -scriptversion='(GNU libtool) 2.4.6' +scriptversion='(GNU libtool) 2.4.7' # func_echo ARG... @@ -2141,7 +2308,7 @@ include the following information: compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname $scriptversion Debian-2.4.6-15 + version: $progname $scriptversion Debian-2.4.7-4 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` @@ -2197,7 +2364,7 @@ fi # a configuration failure hint, and exit. func_fatal_configuration () { - func__fatal_error ${1+"$@"} \ + func_fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -2345,6 +2512,8 @@ libtool_options_prep () _G_rc_lt_options_prep=: + _G_rc_lt_options_prep=: + # Shorthand for --mode=foo, only valid as the first argument case $1 in clean|clea|cle|cl) @@ -2375,11 +2544,9 @@ libtool_options_prep () if $_G_rc_lt_options_prep; then # Pass back the list of options. - func_quote_for_eval ${1+"$@"} - libtool_options_prep_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_options_prep_result=$func_quote_result fi - - $_G_rc_lt_options_prep } func_add_hook func_options_prep libtool_options_prep @@ -2482,11 +2649,9 @@ libtool_parse_options () if $_G_rc_lt_parse_options; then # save modified positional parameters for caller - func_quote_for_eval ${1+"$@"} - libtool_parse_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_parse_options_result=$func_quote_result fi - - $_G_rc_lt_parse_options } func_add_hook func_parse_options libtool_parse_options @@ -2543,8 +2708,8 @@ libtool_validate_options () } # Pass back the unparsed argument list - func_quote_for_eval ${1+"$@"} - libtool_validate_options_result=$func_quote_for_eval_result + func_quote eval ${1+"$@"} + libtool_validate_options_result=$func_quote_result } func_add_hook func_validate_options libtool_validate_options @@ -3510,8 +3675,8 @@ func_mode_compile () esac done - func_quote_for_eval "$libobj" - test "X$libobj" != "X$func_quote_for_eval_result" \ + func_quote_arg pretty "$libobj" + test "X$libobj" != "X$func_quote_arg_result" \ && $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \ && func_warning "libobj name '$libobj' may not contain shell special characters." func_dirname_and_basename "$obj" "/" "" @@ -3584,8 +3749,8 @@ compiler." func_to_tool_file "$srcfile" func_convert_file_msys_to_w32 srcfile=$func_to_tool_file_result - func_quote_for_eval "$srcfile" - qsrcfile=$func_quote_for_eval_result + func_quote_arg pretty "$srcfile" + qsrcfile=$func_quote_arg_result # Only build a PIC object if we are building libtool libraries. if test yes = "$build_libtool_libs"; then @@ -3740,7 +3905,8 @@ This mode accepts the following additional options: -prefer-non-pic try to build non-PIC objects only -shared do not build a '.o' file suitable for static linking -static only build a '.o' file suitable for static linking - -Wc,FLAG pass FLAG directly to the compiler + -Wc,FLAG + -Xcompiler FLAG pass FLAG directly to the compiler COMPILE-COMMAND is a command to be used in creating a 'standard' object file from the given SOURCEFILE. @@ -3846,6 +4012,8 @@ The following components of LINK-COMMAND are treated specially: -weak LIBNAME declare that the target provides the LIBNAME interface -Wc,FLAG -Xcompiler FLAG pass linker-specific FLAG directly to the compiler + -Wa,FLAG + -Xassembler FLAG pass linker-specific FLAG directly to the assembler -Wl,FLAG -Xlinker FLAG pass linker-specific FLAG directly to the linker -XCClinker FLAG pass link-specific FLAG to the compiler driver (CC) @@ -4188,8 +4356,8 @@ func_mode_install () case $nonopt in *shtool*) :;; *) false;; esac then # Aesthetically quote it. - func_quote_for_eval "$nonopt" - install_prog="$func_quote_for_eval_result " + func_quote_arg pretty "$nonopt" + install_prog="$func_quote_arg_result " arg=$1 shift else @@ -4199,8 +4367,8 @@ func_mode_install () # The real first argument should be the name of the installation program. # Aesthetically quote it. - func_quote_for_eval "$arg" - func_append install_prog "$func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog "$func_quote_arg_result" install_shared_prog=$install_prog case " $install_prog " in *[\\\ /]cp\ *) install_cp=: ;; @@ -4257,12 +4425,12 @@ func_mode_install () esac # Aesthetically quote the argument. - func_quote_for_eval "$arg" - func_append install_prog " $func_quote_for_eval_result" + func_quote_arg pretty "$arg" + func_append install_prog " $func_quote_arg_result" if test -n "$arg2"; then - func_quote_for_eval "$arg2" + func_quote_arg pretty "$arg2" fi - func_append install_shared_prog " $func_quote_for_eval_result" + func_append install_shared_prog " $func_quote_arg_result" done test -z "$install_prog" && \ @@ -4273,8 +4441,8 @@ func_mode_install () if test -n "$install_override_mode" && $no_mode; then if $install_cp; then :; else - func_quote_for_eval "$install_override_mode" - func_append install_shared_prog " -m $func_quote_for_eval_result" + func_quote_arg pretty "$install_override_mode" + func_append install_shared_prog " -m $func_quote_arg_result" fi fi @@ -4570,8 +4738,8 @@ func_mode_install () relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'` $opt_quiet || { - func_quote_for_expand "$relink_command" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$relink_command" + eval "func_echo $func_quote_arg_result" } if eval "$relink_command"; then : else @@ -5350,7 +5518,8 @@ else if test \"\$libtool_execute_magic\" != \"$magic\"; then file=\"\$0\"" - qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"` + func_quote_arg pretty "$ECHO" + qECHO=$func_quote_arg_result $ECHO "\ # A function that is used when there is no print builtin or printf. @@ -5360,7 +5529,7 @@ func_fallback_echo () \$1 _LTECHO_EOF' } - ECHO=\"$qECHO\" + ECHO=$qECHO fi # Very basic option parsing. These options are (a) specific to @@ -6703,9 +6872,9 @@ func_mode_link () while test "$#" -gt 0; do arg=$1 shift - func_quote_for_eval "$arg" - qarg=$func_quote_for_eval_unquoted_result - func_append libtool_args " $func_quote_for_eval_result" + func_quote_arg pretty,unquoted "$arg" + qarg=$func_quote_arg_unquoted_result + func_append libtool_args " $func_quote_arg_result" # If the previous option needs an argument, assign it. if test -n "$prev"; then @@ -6941,6 +7110,13 @@ func_mode_link () prev= continue ;; + xassembler) + func_append compiler_flags " -Xassembler $qarg" + prev= + func_append compile_command " -Xassembler $qarg" + func_append finalize_command " -Xassembler $qarg" + continue + ;; xcclinker) func_append linker_flags " $qarg" func_append compiler_flags " $qarg" @@ -7111,7 +7287,7 @@ func_mode_link () # These systems don't actually have a C library (as such) test X-lc = "X$arg" && continue ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. test X-lc = "X$arg" && continue ;; @@ -7131,7 +7307,7 @@ func_mode_link () esac elif test X-lc_r = "X$arg"; then case $host in - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig* | *-*-midnightbsd*) # Do not include libc_r directly, use -pthread flag. continue ;; @@ -7161,8 +7337,20 @@ func_mode_link () prev=xcompiler continue ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + # Solaris ld rejects as of 11.4. Refer to Oracle bug 22985199. + -pthread) + case $host in + *solaris2*) ;; + *) + case "$new_inherited_linker_flags " in + *" $arg "*) ;; + * ) func_append new_inherited_linker_flags " $arg" ;; + esac + ;; + esac + continue + ;; + -mt|-mthreads|-kthread|-Kthread|-pthreads|--thread-safe \ |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" @@ -7303,9 +7491,9 @@ func_mode_link () save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $func_quote_for_eval_result" - func_append compiler_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $func_quote_arg_result" + func_append compiler_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" @@ -7319,16 +7507,21 @@ func_mode_link () save_ifs=$IFS; IFS=, for flag in $args; do IFS=$save_ifs - func_quote_for_eval "$flag" - func_append arg " $wl$func_quote_for_eval_result" - func_append compiler_flags " $wl$func_quote_for_eval_result" - func_append linker_flags " $func_quote_for_eval_result" + func_quote_arg pretty "$flag" + func_append arg " $wl$func_quote_arg_result" + func_append compiler_flags " $wl$func_quote_arg_result" + func_append linker_flags " $func_quote_arg_result" done IFS=$save_ifs func_stripname ' ' '' "$arg" arg=$func_stripname_result ;; + -Xassembler) + prev=xassembler + continue + ;; + -Xcompiler) prev=xcompiler continue @@ -7346,8 +7539,8 @@ func_mode_link () # -msg_* for osf cc -msg_*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; # Flags to be passed through unchanged, with rationale: @@ -7370,12 +7563,13 @@ func_mode_link () # -fuse-ld=* Linker select flags for GCC # -static-* direct GCC to link specific libraries statically # -fcilkplus Cilk Plus language extension features for C/C++ + # -Wa,* Pass flags directly to the assembler -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + -specs=*|-fsanitize=*|-fuse-ld=*|-static-*|-fcilkplus|-Wa,*) + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result func_append compile_command " $arg" func_append finalize_command " $arg" func_append compiler_flags " $arg" @@ -7396,15 +7590,15 @@ func_mode_link () continue else # Otherwise treat like 'Some other compiler flag' below - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result fi ;; # Some other compiler flag. -* | +*) - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; *.$objext) @@ -7524,8 +7718,8 @@ func_mode_link () *) # Unknown arguments in both finalize_command and compile_command need # to be aesthetically quoted because they are evaled later. - func_quote_for_eval "$arg" - arg=$func_quote_for_eval_result + func_quote_arg pretty "$arg" + arg=$func_quote_arg_result ;; esac # arg @@ -8733,7 +8927,7 @@ func_mode_link () test CXX = "$tagname" && { case $host_os in linux*) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 func_suncc_cstd_abi @@ -8906,7 +9100,7 @@ func_mode_link () # case $version_type in # correct linux to gnu/linux during the next big refactor - darwin|freebsd-elf|linux|osf|windows|none) + darwin|freebsd-elf|linux|midnightbsd-elf|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result age=$number_minor @@ -9000,7 +9194,7 @@ func_mode_link () versuffix=.$current.$revision ;; - freebsd-elf) + freebsd-elf | midnightbsd-elf) func_arith $current - $age major=.$func_arith_result versuffix=$major.$age.$revision @@ -9226,7 +9420,7 @@ func_mode_link () *-*-netbsd*) # Don't link with libc until the a.out ld.so is fixed. ;; - *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*) + *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-midnightbsd*) # Do not include libc due to us having libc/libc_r. ;; *-*-sco3.2v5* | *-*-sco5v6*) @@ -10037,8 +10231,8 @@ EOF for cmd in $concat_cmds; do IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10131,8 +10325,8 @@ EOF eval cmd=\"$cmd\" IFS=$save_ifs $opt_quiet || { - func_quote_for_expand "$cmd" - eval "func_echo $func_quote_for_expand_result" + func_quote_arg expand,pretty "$cmd" + eval "func_echo $func_quote_arg_result" } $opt_dry_run || eval "$cmd" || { lt_exit=$? @@ -10606,12 +10800,13 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty "$var_value" + relink_command="$var=$func_quote_arg_result; export $var; $relink_command" fi done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + func_quote_arg pretty,unquoted "($func_quote_result; $relink_command)" + relink_command=$func_quote_arg_unquoted_result fi # Only actually do things if not in dry run mode. @@ -10851,13 +11046,15 @@ EOF elif eval var_value=\$$var; test -z "$var_value"; then relink_command="$var=; export $var; $relink_command" else - func_quote_for_eval "$var_value" - relink_command="$var=$func_quote_for_eval_result; export $var; $relink_command" + func_quote_arg pretty,unquoted "$var_value" + relink_command="$var=$func_quote_arg_unquoted_result; export $var; $relink_command" fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"` + func_quote eval cd "`pwd`" + relink_command="($func_quote_result; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" + func_quote_arg pretty,unquoted "$relink_command" + relink_command=$func_quote_arg_unquoted_result if test yes = "$hardcode_automatic"; then relink_command= fi diff --git a/config.h.in b/config.h.in index 3d7e6e4a..847159ac 100644 --- a/config.h.in +++ b/config.h.in @@ -184,8 +184,8 @@ #undef GNULIB_SCANF /* Define to a C preprocessor expression that evaluates to 1 or 0, depending - whether the gnulib module statat shall be considered present. */ -#undef GNULIB_STATAT + whether the gnulib module sigpipe shall be considered present. */ +#undef GNULIB_SIGPIPE /* Define to a C preprocessor expression that evaluates to 1 or 0, depending whether the gnulib module strerror shall be considered present. */ @@ -418,6 +418,9 @@ /* Define to 1 when the gnulib module readlink should be tested. */ #undef GNULIB_TEST_READLINK +/* Define to 1 when the gnulib module readlinkat should be tested. */ +#undef GNULIB_TEST_READLINKAT + /* Define to 1 when the gnulib module reallocarray should be tested. */ #undef GNULIB_TEST_REALLOCARRAY @@ -466,6 +469,9 @@ /* Define to 1 when the gnulib module stat should be tested. */ #undef GNULIB_TEST_STAT +/* Define to 1 when the gnulib module stpcpy should be tested. */ +#undef GNULIB_TEST_STPCPY + /* Define to 1 when the gnulib module strcasestr should be tested. */ #undef GNULIB_TEST_STRCASESTR @@ -1170,6 +1176,9 @@ /* Define to 1 if you have the `readlink' function. */ #undef HAVE_READLINK +/* Define to 1 if you have the `readlinkat' function. */ +#undef HAVE_READLINKAT + /* Define to 1 if you have the `reallocarray' function. */ #undef HAVE_REALLOCARRAY @@ -1276,6 +1285,9 @@ /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `stpcpy' function. */ +#undef HAVE_STPCPY + /* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP @@ -1397,6 +1409,9 @@ /* Define if you have tbl. */ #undef HAVE_TBL +/* Define to 1 if you have the <termios.h> header file. */ +#undef HAVE_TERMIOS_H + /* Define to 1 if you have the `thrd_create' function. */ #undef HAVE_THRD_CREATE @@ -2233,6 +2248,10 @@ #endif #ifdef __has_c_attribute +# if ((defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710 \ + && _GL_GNUC_PREREQ (4, 6)) +# pragma GCC diagnostic ignored "-Wpedantic" +# endif # define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) #else # define _GL_HAS_C_ATTRIBUTE(attr) 0 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for man-db 2.10.2. +# Generated by GNU Autoconf 2.71 for man-db 2.11.0. # # Report bugs to <cjwatson@debian.org>. # @@ -621,8 +621,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='man-db' PACKAGE_TARNAME='man-db' -PACKAGE_VERSION='2.10.2' -PACKAGE_STRING='man-db 2.10.2' +PACKAGE_VERSION='2.11.0' +PACKAGE_STRING='man-db 2.11.0' PACKAGE_BUGREPORT='cjwatson@debian.org' PACKAGE_URL='' @@ -659,10 +659,10 @@ ac_includes_default="\ #endif" ac_header_c_list= +ac_func_c_list= gl_use_threads_default= gl_use_winpthreads_default= ac_config_libobj_dir=gl/lib -ac_func_c_list= gl_fnmatch_required=POSIX gl_getopt_required=POSIX gt_needs= @@ -790,6 +790,11 @@ SYS_TIME_H_DEFINES_STRUCT_TIMESPEC TIME_H_DEFINES_STRUCT_TIMESPEC NEXT_AS_FIRST_DIRECTIVE_TIME_H NEXT_TIME_H +GL_GNULIB_TCGETSID +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H +NEXT_TERMIOS_H +HAVE_TERMIOS_H +HAVE_DECL_TCGETSID GL_GENERATE_SYSEXITS_H_FALSE GL_GENERATE_SYSEXITS_H_TRUE SYSEXITS_H @@ -854,6 +859,8 @@ GL_COND_OBJ_STRCASECMP_TRUE HAVE_DECL_STRNCASECMP HAVE_STRCASECMP HAVE_FFS +GL_COND_OBJ_STPCPY_FALSE +GL_COND_OBJ_STPCPY_TRUE NEXT_AS_FIRST_DIRECTIVE_STDLIB_H NEXT_STDLIB_H GL_COND_OBJ_STDIO_WRITE_FALSE @@ -910,6 +917,8 @@ GL_COND_OBJ_REGEX_FALSE GL_COND_OBJ_REGEX_TRUE GL_COND_OBJ_REALLOCARRAY_FALSE GL_COND_OBJ_REALLOCARRAY_TRUE +GL_COND_OBJ_READLINKAT_FALSE +GL_COND_OBJ_READLINKAT_TRUE GL_COND_OBJ_READLINK_FALSE GL_COND_OBJ_READLINK_TRUE GL_COND_OBJ_READDIR_FALSE @@ -1409,6 +1418,7 @@ GL_GNULIB_FUTIMENS GL_GNULIB_FSTATAT GL_GNULIB_FSTAT GL_GNULIB_FCHMODAT +GL_GNULIB_CHMOD WINDOWS_64_BIT_ST_SIZE WINDOWS_STAT_TIMESPEC NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H @@ -1427,6 +1437,7 @@ REPLACE_FUTIMENS REPLACE_FSTATAT REPLACE_FSTAT REPLACE_FCHMODAT +REPLACE_CHMOD HAVE_UTIMENSAT HAVE_MKNODAT HAVE_MKNOD @@ -2007,6 +2018,7 @@ DSYMUTIL MANIFEST_TOOL DLLTOOL OBJDUMP +FILECMD NM ac_ct_DUMPBIN DUMPBIN @@ -2764,7 +2776,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures man-db 2.10.2 to adapt to many kinds of systems. +\`configure' configures man-db 2.11.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2835,7 +2847,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of man-db 2.10.2:";; + short | recursive ) echo "Configuration of man-db 2.11.0:";; esac cat <<\_ACEOF @@ -3041,7 +3053,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -man-db configure 2.10.2 +man-db configure 2.11.0 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -3127,44 +3139,6 @@ printf "%s\n" "$ac_res" >&6; } } # ac_fn_c_check_header_compile -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -printf "%s\n" "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } > conftest.i && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - } -then : - ac_retval=0 -else $as_nop - printf "%s\n" "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - # ac_fn_c_try_link LINENO # ----------------------- # Try to link conftest.$ac_ext, and return whether this succeeded. @@ -3274,6 +3248,44 @@ printf "%s\n" "$ac_res" >&6; } } # ac_fn_c_check_func +# ac_fn_c_try_cpp LINENO +# ---------------------- +# Try to preprocess conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_cpp () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + if { { ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +printf "%s\n" "$ac_try_echo"; } >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } > conftest.i && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + } +then : + ac_retval=0 +else $as_nop + printf "%s\n" "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_cpp + # ac_fn_c_check_type LINENO TYPE VAR INCLUDES # ------------------------------------------- # Tests whether TYPE exists after having included INCLUDES, setting cache @@ -3703,7 +3715,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by man-db $as_me 2.10.2, which was +It was created by man-db $as_me 2.11.0, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -4293,6 +4305,18 @@ as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H" as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H" as_fn_append ac_header_c_list " wchar.h wchar_h HAVE_WCHAR_H" as_fn_append ac_header_c_list " minix/config.h minix_config_h HAVE_MINIX_CONFIG_H" +as_fn_append ac_func_c_list " getuid HAVE_GETUID" +as_fn_append ac_func_c_list " geteuid HAVE_GETEUID" +as_fn_append ac_func_c_list " getresuid HAVE_GETRESUID" +as_fn_append ac_func_c_list " getgid HAVE_GETGID" +as_fn_append ac_func_c_list " getegid HAVE_GETEGID" +as_fn_append ac_func_c_list " getresgid HAVE_GETRESGID" +as_fn_append ac_func_c_list " setresuid HAVE_SETRESUID" +as_fn_append ac_func_c_list " setreuid HAVE_SETREUID" +as_fn_append ac_func_c_list " seteuid HAVE_SETEUID" +as_fn_append ac_func_c_list " setresgid HAVE_SETRESGID" +as_fn_append ac_func_c_list " setregid HAVE_SETREGID" +as_fn_append ac_func_c_list " setegid HAVE_SETEGID" as_fn_append ac_func_c_list " flockfile HAVE_FLOCKFILE" as_fn_append ac_func_c_list " funlockfile HAVE_FUNLOCKFILE" as_fn_append ac_header_c_list " features.h features_h HAVE_FEATURES_H" @@ -4336,18 +4360,6 @@ as_fn_append ac_func_c_list " glob HAVE_GLOB" as_fn_append ac_func_c_list " glob_pattern_p HAVE_GLOB_PATTERN_P" as_fn_append ac_func_c_list " getpwnam_r HAVE_GETPWNAM_R" as_fn_append ac_header_c_list " threads.h threads_h HAVE_THREADS_H" -as_fn_append ac_func_c_list " getuid HAVE_GETUID" -as_fn_append ac_func_c_list " geteuid HAVE_GETEUID" -as_fn_append ac_func_c_list " getresuid HAVE_GETRESUID" -as_fn_append ac_func_c_list " getgid HAVE_GETGID" -as_fn_append ac_func_c_list " getegid HAVE_GETEGID" -as_fn_append ac_func_c_list " getresgid HAVE_GETRESGID" -as_fn_append ac_func_c_list " setresuid HAVE_SETRESUID" -as_fn_append ac_func_c_list " setreuid HAVE_SETREUID" -as_fn_append ac_func_c_list " seteuid HAVE_SETEUID" -as_fn_append ac_func_c_list " setresgid HAVE_SETRESGID" -as_fn_append ac_func_c_list " setregid HAVE_SETREGID" -as_fn_append ac_func_c_list " setegid HAVE_SETEGID" as_fn_append ac_header_c_list " limits.h limits_h HAVE_LIMITS_H" as_fn_append ac_func_c_list " isblank HAVE_ISBLANK" as_fn_append ac_header_c_list " langinfo.h langinfo_h HAVE_LANGINFO_H" @@ -4365,6 +4377,7 @@ as_fn_append ac_header_c_list " sys/select.h sys_select_h HAVE_SYS_SELECT_H" as_fn_append ac_func_c_list " pselect HAVE_PSELECT" as_fn_append ac_func_c_list " pthread_sigmask HAVE_PTHREAD_SIGMASK" as_fn_append ac_func_c_list " readlink HAVE_READLINK" +as_fn_append ac_func_c_list " readlinkat HAVE_READLINKAT" as_fn_append ac_header_c_list " malloc.h malloc_h HAVE_MALLOC_H" as_fn_append ac_func_c_list " iswctype HAVE_ISWCTYPE" as_fn_append ac_func_c_list " link HAVE_LINK" @@ -4381,6 +4394,7 @@ as_fn_append ac_header_c_list " sys/ioctl.h sys_ioctl_h HAVE_SYS_IOCTL_H" as_fn_append ac_header_c_list " sys/random.h sys_random_h HAVE_SYS_RANDOM_H" as_fn_append ac_header_c_list " sys/uio.h sys_uio_h HAVE_SYS_UIO_H" as_fn_append ac_header_c_list " sysexits.h sysexits_h HAVE_SYSEXITS_H" +as_fn_append ac_header_c_list " termios.h termios_h HAVE_TERMIOS_H" as_fn_append ac_func_c_list " unlinkat HAVE_UNLINKAT" as_fn_append ac_header_c_list " utime.h utime_h HAVE_UTIME_H" as_fn_append ac_func_c_list " futimes HAVE_FUTIMES" @@ -5078,7 +5092,7 @@ fi # Define the identity of the package. PACKAGE='man-db' - VERSION='2.10.2' + VERSION='2.11.0' printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h @@ -6824,8 +6838,8 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac # Define below date and version information to be put into man pages etc. -date=2022-03-17 -roff_version=`echo 2.10.2 | sed 's/-/\\-/g'` +date=2022-10-15 +roff_version=`echo 2.11.0 | sed 's/-/\\-/g'` # Explicitly check for pkg-config early on, since otherwise the conditional # calls in MAN_ARG_SYSTEMDTMPFILESDIR and MAN_ARG_SYSTEMDSYSTEMUNITDIR are @@ -6965,6 +6979,49 @@ fi # The autoconf literature states that only features that can be separately # 'built' should use --enable and friends. Oh well... + + + + case "$host_os" in + openbsd*) + +printf "%s\n" "#define _ISOC11_SOURCE 1" >>confdefs.h + + ;; + esac + +ac_func= +for ac_item in $ac_func_c_list +do + if test $ac_func; then + ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func + if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then + echo "#define $ac_item 1" >> confdefs.h + fi + ac_func= + else + ac_func=$ac_item + fi +done + + + + + + + + + + + + + + + + + + + # Check whether --enable-cache-owner was given. if test ${enable_cache_owner+y} then : @@ -6975,25 +7032,37 @@ then : if test "$enableval" = "no" then man_owner= - cache_top_owner=root - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: System-wide cache files will have unconstrained ownership" >&5 -printf "%s\n" "$as_me: System-wide cache files will have unconstrained ownership" >&6;} else man_owner=$enableval - cache_top_owner=$enableval - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: System-wide cache files will be owned by $enableval" >&5 -printf "%s\n" "$as_me: System-wide cache files will be owned by $enableval" >&6;} - -printf "%s\n" "#define MAN_OWNER \"$man_owner\"" >>confdefs.h - fi else $as_nop - man_owner=man - cache_top_owner=man - printf "%s\n" "#define MAN_OWNER \"$man_owner\"" >>confdefs.h + if test "$ac_cv_func_getuid" = yes + then + man_owner=man + else + man_owner= + fi +fi +if test "$man_owner" && test "$ac_cv_func_getuid" != yes +then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: --enable-cache-owner is not implemented on this platform" >&5 +printf "%s\n" "$as_me: WARNING: --enable-cache-owner is not implemented on this platform" >&2;} + man_owner= fi +if test "$man_owner" +then + cache_top_owner="$man_owner" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: System-wide cache files will be owned by $man_owner" >&5 +printf "%s\n" "$as_me: System-wide cache files will be owned by $man_owner" >&6;} + +printf "%s\n" "#define MAN_OWNER \"$man_owner\"" >>confdefs.h +else + cache_top_owner=root + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: System-wide cache files will have unconstrained ownership" >&5 +printf "%s\n" "$as_me: System-wide cache files will have unconstrained ownership" >&6;} +fi @@ -8381,18 +8450,6 @@ else fi - - - - - case "$host_os" in - openbsd*) - -printf "%s\n" "#define _ISOC11_SOURCE 1" >>confdefs.h - - ;; - esac - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9675,6 +9732,7 @@ fi # Code from module rbtree-list: # Code from module readdir: # Code from module readlink: + # Code from module readlinkat: # Code from module realloc-gnu: # Code from module realloc-posix: # Code from module reallocarray: @@ -9693,6 +9751,7 @@ fi # Code from module setlocale-null: # Code from module sigaction: # Code from module signal-h: + # Code from module sigpipe: # Code from module sigprocmask: # Code from module size_max: # Code from module sleep: @@ -9706,7 +9765,6 @@ fi # Code from module ssize_t: # Code from module stat: # Code from module stat-time: - # Code from module statat: # Code from module std-gnu11: # Code from module stdalign: # Code from module stdarg: @@ -9719,6 +9777,7 @@ fi # Code from module stdio: # Code from module stdlib: # Code from module stdopen: + # Code from module stpcpy: # Code from module strcase: # Code from module strcasestr: # Code from module strcasestr-simple: @@ -9744,6 +9803,7 @@ fi # Code from module sys_uio: # Code from module sysexits: # Code from module tempname: + # Code from module termios: # Code from module threadlib: @@ -10123,11 +10183,13 @@ printf "%s\n" "$gl_cv_cc_uninitialized_supported" >&6; } # them here so that the above 'comm' command doesn't report a false match. as_fn_append warnings ' -Warray-bounds=2' as_fn_append warnings ' -Wattribute-alias=2' + as_fn_append warnings ' -Wbidi-chars=any,ucn' as_fn_append warnings ' -Wformat-overflow=2' as_fn_append warnings ' -Wformat=2' as_fn_append warnings ' -Wformat-truncation=2' as_fn_append warnings ' -Wimplicit-fallthrough=5' as_fn_append warnings ' -Wshift-overflow=2' + as_fn_append warnings ' -Wuse-after-free=3' as_fn_append warnings ' -Wunused-const-variable=2' as_fn_append warnings ' -Wvla-larger-than=4031' @@ -10539,8 +10601,8 @@ esac -macro_version='2.4.6' -macro_revision='2.4.6' +macro_version='2.4.7' +macro_revision='2.4.7' @@ -10951,13 +11013,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -11095,7 +11157,7 @@ esac fi fi - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -11188,7 +11250,7 @@ else $as_nop lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -11231,7 +11293,7 @@ else $as_nop sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[ ]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[ ]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -11437,6 +11499,114 @@ esac if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}file", so it can be a program name with args. +set dummy ${ac_tool_prefix}file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$FILECMD"; then + ac_cv_prog_FILECMD="$FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_FILECMD="${ac_tool_prefix}file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +FILECMD=$ac_cv_prog_FILECMD +if test -n "$FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $FILECMD" >&5 +printf "%s\n" "$FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_FILECMD"; then + ac_ct_FILECMD=$FILECMD + # Extract the first word of "file", so it can be a program name with args. +set dummy file; ac_word=$2 +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +printf %s "checking for $ac_word... " >&6; } +if test ${ac_cv_prog_ac_ct_FILECMD+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test -n "$ac_ct_FILECMD"; then + ac_cv_prog_ac_ct_FILECMD="$ac_ct_FILECMD" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + case $as_dir in #((( + '') as_dir=./ ;; + */) ;; + *) as_dir=$as_dir/ ;; + esac + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_FILECMD="file" + printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_FILECMD=$ac_cv_prog_ac_ct_FILECMD +if test -n "$ac_ct_FILECMD"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_ct_FILECMD" >&5 +printf "%s\n" "$ac_ct_FILECMD" >&6; } +else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } +fi + + if test "x$ac_ct_FILECMD" = x; then + FILECMD=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +printf "%s\n" "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + FILECMD=$ac_ct_FILECMD + fi +else + FILECMD="$ac_cv_prog_FILECMD" +fi + + + + + + + +if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -11579,7 +11749,7 @@ beos*) bsdi[45]*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -11613,14 +11783,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[3-9]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -11634,7 +11804,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' @@ -11681,7 +11851,7 @@ netbsd* | netbsdelf*-gnu) newos6*) lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -12054,13 +12224,29 @@ esac fi : ${AR=ar} -: ${AR_FLAGS=cr} +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS + + + + + + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. + @@ -12477,7 +12663,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -12495,20 +12681,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -12532,7 +12718,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ @@ -12550,9 +12736,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[ ]\($symcode$symcode*\)[ ][ ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -12752,7 +12938,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -12877,7 +13063,7 @@ ia64-*-hpux*) ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -12898,7 +13084,7 @@ ia64-*-hpux*) printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -12910,7 +13096,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -12936,7 +13122,7 @@ mips64*-*linux*) printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -12944,7 +13130,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -12952,7 +13138,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -12976,14 +13162,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -13091,7 +13277,7 @@ printf "%s\n" "$lt_cv_cc_needs_belf" >&6; } ac_status=$? printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -13874,8 +14060,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5 $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5 - echo "$AR cr libconftest.a conftest.o" >&5 - $AR cr libconftest.a conftest.o 2>&5 + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&5 + $AR $AR_FLAGS libconftest.a conftest.o 2>&5 echo "$RANLIB libconftest.a" >&5 $RANLIB libconftest.a 2>&5 cat > conftest.c << _LT_EOF @@ -13902,17 +14088,12 @@ printf "%s\n" "$lt_cv_ld_force_load" >&6; } _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[912]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[012][,.]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[012],*|,*powerpc*-darwin[5-8]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -14270,8 +14451,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -14789,7 +14970,7 @@ lt_prog_compiler_static= lt_prog_compiler_static='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' @@ -15212,15 +15393,15 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -15275,7 +15456,7 @@ printf %s "checking whether the $compiler linker ($LD) supports shared libraries whole_archive_flag_spec= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/(^)\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [01].* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -15387,6 +15568,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; interix[3-9]*) @@ -15401,7 +15583,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - archive_expsym_cmds='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + archive_expsym_cmds='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -15444,7 +15626,7 @@ _LT_EOF compiler_needs_object=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 whole_archive_flag_spec='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' compiler_needs_object=yes @@ -15456,13 +15638,14 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' export_dynamic_flag_spec='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -15472,7 +15655,7 @@ _LT_EOF archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -15604,7 +15787,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + export_symbols_cmds='`func_echo_all $NM | $SED -e '\''s/B\([^B]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && (substr(\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -15875,12 +16058,12 @@ fi cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported always_export_symbols=yes @@ -15921,7 +16104,7 @@ fi fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper hardcode_libdir_flag_spec=' ' allow_undefined_flag=unsupported # Tell ltmain to make .lib files, not .a files. @@ -15962,8 +16145,8 @@ fi output_verbose_link_cmd=func_echo_all archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - archive_expsym_cmds="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - module_expsym_cmds="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + archive_expsym_cmds="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + module_expsym_cmds="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" else ld_shlibs=no @@ -15997,7 +16180,7 @@ fi ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes @@ -16178,6 +16361,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } # Fabrice Bellard et al's Tiny C Compiler ld_shlibs=yes archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + hardcode_libdir_flag_spec='$wl-rpath $wl$libdir' ;; esac ;; @@ -16249,6 +16433,7 @@ printf "%s\n" "$lt_cv_irix_exported_symbol" >&6; } emximp -o $lib $output_objdir/$libname.def' old_archive_From_new_cmds='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' enable_shared_with_static_runtimes=yes + file_list_spec='@' ;; osf3*) @@ -16941,7 +17126,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api" ;; @@ -16951,14 +17136,14 @@ cygwin* | mingw* | pw32* | cegcc*) ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -16977,7 +17162,7 @@ cygwin* | mingw* | pw32* | cegcc*) done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -17014,7 +17199,7 @@ cygwin* | mingw* | pw32* | cegcc*) ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[.]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -17047,7 +17232,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -18212,30 +18397,41 @@ striplib= old_striplib= { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5 printf %s "checking whether stripping libraries is possible... " >&6; } -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -printf "%s\n" "yes" >&6; } +if test -z "$STRIP"; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 +printf "%s\n" "no" >&6; } else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 printf "%s\n" "yes" >&6; } - else - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +printf "%s\n" "yes" >&6; } + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - fi - ;; - *) - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 + fi + ;; + *) + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5 printf "%s\n" "no" >&6; } - ;; - esac + ;; + esac + fi fi @@ -21028,19 +21224,7 @@ else $as_nop fi printf "%s\n" "#define HAVE_DECL_PUTCHAR_UNLOCKED $ac_have_decl" >>confdefs.h -ac_func= -for ac_item in $ac_func_c_list -do - if test $ac_func; then - ac_fn_c_check_func "$LINENO" $ac_func ac_cv_func_$ac_func - if eval test \"x\$ac_cv_func_$ac_func\" = xyes; then - echo "#define $ac_item 1" >> confdefs.h - fi - ac_func= - else - ac_func=$ac_item - fi -done + @@ -24537,6 +24721,7 @@ printf "%s\n" "#define mbstate_t int" >>confdefs.h HAVE_MKNOD=1; HAVE_MKNODAT=1; HAVE_UTIMENSAT=1; + REPLACE_CHMOD=0; REPLACE_FCHMODAT=0; REPLACE_FSTAT=0; REPLACE_FSTATAT=0; @@ -24812,6 +24997,10 @@ fi + GL_GNULIB_CHMOD=0 + + + GL_GNULIB_FCHMODAT=0 @@ -26393,8 +26582,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:26396: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:26397: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:26585: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:26586: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -26420,7 +26609,7 @@ rm -rf conftest* ;; esac - echo "$as_me:26423: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:26612: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -26574,7 +26763,7 @@ fi fi fi - echo "$as_me:26577: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:26766: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 printf %s "checking whether POSIX threads API is available... " >&6; } @@ -26913,18 +27102,6 @@ printf "%s\n" "#define HAVE_WEAK_SYMBOLS 1" >>confdefs.h - - - - - - - - - - - - if test $gl_cv_have_include_next = yes; then gl_cv_next_limits_h='<'limits.h'>' else @@ -29365,8 +29542,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:29368: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:29369: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:29545: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:29546: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -29392,7 +29569,7 @@ rm -rf conftest* ;; esac - echo "$as_me:29395: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:29572: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -29546,7 +29723,7 @@ fi fi fi - echo "$as_me:29549: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:29726: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 printf %s "checking whether POSIX threads API is available... " >&6; } @@ -29774,8 +29951,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ LIBS=$save_LIBS test $gl_pthread_api = yes && break done - echo "$as_me:29777: gl_pthread_api=$gl_pthread_api" >&5 - echo "$as_me:29778: LIBPTHREAD=$LIBPTHREAD" >&5 + echo "$as_me:29954: gl_pthread_api=$gl_pthread_api" >&5 + echo "$as_me:29955: LIBPTHREAD=$LIBPTHREAD" >&5 gl_pthread_in_glibc=no # On Linux with glibc >= 2.34, libc contains the fully functional @@ -29801,7 +29978,7 @@ rm -rf conftest* ;; esac - echo "$as_me:29804: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 + echo "$as_me:29981: gl_pthread_in_glibc=$gl_pthread_in_glibc" >&5 # Test for libpthread by looking for pthread_kill. (Not pthread_self, # since it is defined as a macro on OSF/1.) @@ -29955,7 +30132,7 @@ fi fi fi - echo "$as_me:29958: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 + echo "$as_me:30135: LIBPMULTITHREAD=$LIBPMULTITHREAD" >&5 fi { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether POSIX threads API is available" >&5 printf %s "checking whether POSIX threads API is available... " >&6; } @@ -31812,6 +31989,39 @@ fi + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for SIGPIPE" >&5 +printf %s "checking for SIGPIPE... " >&6; } +if test ${gl_cv_header_signal_h_SIGPIPE+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <signal.h> +#if !defined SIGPIPE +booboo +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "booboo" >/dev/null 2>&1 +then : + gl_cv_header_signal_h_SIGPIPE=no +else $as_nop + gl_cv_header_signal_h_SIGPIPE=yes +fi +rm -rf conftest* + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_header_signal_h_SIGPIPE" >&5 +printf "%s\n" "$gl_cv_header_signal_h_SIGPIPE" >&6; } + + + + if test $REPLACE_MALLOC_FOR_MALLOC_POSIX = 1; then @@ -32416,6 +32626,13 @@ printf "%s\n" "#define GNULIB_PRINTF_ATTRIBUTE_FLAVOR_GNU 1" >>confdefs.h + if test $gl_cv_header_signal_h_SIGPIPE != yes; then + REPLACE_STDIO_WRITE_FUNCS=1 + fi + + + + if test $gl_cv_have_nonblocking != yes; then REPLACE_STDIO_WRITE_FUNCS=1 @@ -33512,6 +33729,109 @@ printf "%s\n" "$gl_cv_next_sys_uio_h" >&6; } + HAVE_DECL_TCGETSID=1; + HAVE_TERMIOS_H=1; + + + + + + + + + + + + + + + if test $gl_cv_have_include_next = yes; then + gl_cv_next_termios_h='<'termios.h'>' + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking absolute name of <termios.h>" >&5 +printf %s "checking absolute name of <termios.h>... " >&6; } +if test ${gl_cv_next_termios_h+y} +then : + printf %s "(cached) " >&6 +else $as_nop + + if test $ac_cv_header_termios_h = yes; then + + + + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <termios.h> +_ACEOF + case "$host_os" in + aix*) gl_absname_cpp="$ac_cpp -C" ;; + *) gl_absname_cpp="$ac_cpp" ;; + esac + + case "$host_os" in + mingw*) + gl_dirsep_regex='[/\\]' + ;; + *) + gl_dirsep_regex='\/' + ;; + esac + gl_make_literal_regex_sed='s,[]$^\\.*/[],\\&,g' + gl_header_literal_regex=`echo 'termios.h' \ + | sed -e "$gl_make_literal_regex_sed"` + gl_absolute_header_sed="/${gl_dirsep_regex}${gl_header_literal_regex}/"'{ + s/.*"\(.*'"${gl_dirsep_regex}${gl_header_literal_regex}"'\)".*/\1/ + s|^/[^/]|//&| + p + q + }' + + gl_cv_absolute_termios_h=`(eval "$gl_absname_cpp conftest.$ac_ext") 2>&5 | + sed -n "$gl_absolute_header_sed"` + + gl_header=$gl_cv_absolute_termios_h + gl_cv_next_termios_h='"'$gl_header'"' + else + gl_cv_next_termios_h='<'termios.h'>' + fi + + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_next_termios_h" >&5 +printf "%s\n" "$gl_cv_next_termios_h" >&6; } + fi + NEXT_TERMIOS_H=$gl_cv_next_termios_h + + if test $gl_cv_have_include_next = yes || test $gl_cv_have_include_next = buggy; then + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include_next' + gl_next_as_first_directive='<'termios.h'>' + else + # INCLUDE_NEXT_AS_FIRST_DIRECTIVE='include' + gl_next_as_first_directive=$gl_cv_next_termios_h + fi + NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H=$gl_next_as_first_directive + + + + + if test $ac_cv_header_termios_h != yes; then + HAVE_TERMIOS_H=0 + fi + + + + + + + + + + GL_GNULIB_TCGETSID=0 + + + + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5 printf %s "checking for struct timespec in <time.h>... " >&6; } @@ -40523,6 +40843,69 @@ printf "%s\n" "$gl_cv_glob_lists_symlinks" >&6; } esac fi + if test $REPLACE_GLOB = 0; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether glob NOTDIR*/ omits symlink to nondir" >&5 +printf %s "checking whether glob NOTDIR*/ omits symlink to nondir... " >&6; } +if test ${gl_cv_glob_omit_nondir_symlinks+y} +then : + printf %s "(cached) " >&6 +else $as_nop + if test $cross_compiling != yes; then + if ln -s conf$$-file conf$$-globtest 2>/dev/null && touch conf$$-file + then + gl_cv_glob_omit_nondir_symlinks=maybe + else + # If we can't make a symlink, then we cannot test this issue. Be + # pessimistic about this. + gl_cv_glob_omit_nondir_symlinks=no + fi + if test $gl_cv_glob_omit_nondir_symlinks = maybe; then + if test "$cross_compiling" = yes +then : + : + +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stddef.h> + #include <glob.h> +int +main (void) +{ +glob_t found; + if (glob ("conf*-globtest/", 0, NULL, &found) != GLOB_NOMATCH) + return 1; + globfree (&found); + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO" +then : + gl_cv_glob_omit_nondir_symlinks=yes +else $as_nop + gl_cv_glob_omit_nondir_symlinks=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + fi + rm -f conf$$-file conf$$-globtest + else + gl_cv_glob_omit_nondir_symlinks="$gl_cross_guess_normal" + fi + +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_glob_omit_nondir_symlinks" >&5 +printf "%s\n" "$gl_cv_glob_omit_nondir_symlinks" >&6; } + case "$gl_cv_glob_omit_nondir_symlinks" in + *yes) ;; + *) REPLACE_GLOB=1 ;; + esac + fi + fi if test $ac_cv_func_glob_pattern_p = no; then @@ -45565,7 +45948,14 @@ fi fi if test $HAVE_POSIX_SIGNALBLOCKING = 0; then - : + + + + + if test $gl_cv_header_signal_h_SIGPIPE != yes; then + REPLACE_RAISE=1 + fi + fi fi @@ -45921,6 +46311,87 @@ printf "%s\n" "#define GNULIB_TEST_READLINK 1" >>confdefs.h + + + if test $ac_cv_func_readlinkat = no; then + HAVE_READLINKAT=0 + else + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether readlinkat signature is correct" >&5 +printf %s "checking whether readlinkat signature is correct... " >&6; } +if test ${gl_cv_decl_readlinkat_works+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <unistd.h> + /* Check whether original declaration has correct type. */ + ssize_t readlinkat (int, char const *, char *, size_t); +int +main (void) +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + gl_cv_decl_readlinkat_works=yes +else $as_nop + gl_cv_decl_readlinkat_works=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $gl_cv_decl_readlinkat_works" >&5 +printf "%s\n" "$gl_cv_decl_readlinkat_works" >&6; } + # Assume readlinkat has the same bugs as readlink, + # as is the case on OS X 10.10 with trailing slashes. + case $gl_cv_decl_readlinkat_works,$gl_cv_func_readlink_trailing_slash,$gl_cv_func_readlink_truncate in + *yes,*yes,*yes) + ;; + *) + REPLACE_READLINKAT=1 + ;; + esac + fi + + + if test $HAVE_READLINKAT = 0 || test $REPLACE_READLINKAT = 1; then + GL_COND_OBJ_READLINKAT_TRUE= + GL_COND_OBJ_READLINKAT_FALSE='#' +else + GL_COND_OBJ_READLINKAT_TRUE='#' + GL_COND_OBJ_READLINKAT_FALSE= +fi +: + if test -z "${GL_COND_OBJ_READLINKAT_TRUE}" && test -z "${GL_COND_OBJ_READLINKAT_FALSE}"; then + GL_COND_OBJ_READLINKAT_TRUE='#' + GL_COND_OBJ_READLINKAT_FALSE='#' + fi + + + + + + + + + + + GL_GNULIB_READLINKAT=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_READLINKAT 1" >>confdefs.h + + + + + + if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 0; then { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether realloc (0, 0) returns nonnull" >&5 @@ -47902,6 +48373,42 @@ printf "%s\n" "#define GNULIB_TEST_SIGACTION 1" >>confdefs.h + + +printf "%s\n" "#define GNULIB_SIGPIPE 1" >>confdefs.h + + + + + + + + + GL_GNULIB_SIGNAL_H_SIGPIPE=1 + + + + + + + + + + GL_GNULIB_STDIO_H_SIGPIPE=1 + + + + + + + + + GL_GNULIB_UNISTD_H_SIGPIPE=1 + + + + + HAVE_POSIX_SIGNALBLOCKING=0 if test "$gl_cv_type_sigset_t" = yes; then ac_fn_c_check_func "$LINENO" "sigprocmask" "ac_cv_func_sigprocmask" @@ -48538,10 +49045,6 @@ fi - -printf "%s\n" "#define GNULIB_STATAT 1" >>confdefs.h - - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for working stdalign.h" >&5 printf %s "checking for working stdalign.h... " >&6; } if test ${gl_cv_header_working_stdalign_h+y} @@ -49399,6 +49902,68 @@ printf "%s\n" "#define GNULIB_TEST_FWRITE 1" >>confdefs.h + + + + ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy" +if test "x$ac_cv_func_stpcpy" = xyes +then : + printf "%s\n" "#define HAVE_STPCPY 1" >>confdefs.h + +fi + + if test $ac_cv_func_stpcpy = no; then + HAVE_STPCPY=0 + fi + + + if test $HAVE_STPCPY = 0; then + GL_COND_OBJ_STPCPY_TRUE= + GL_COND_OBJ_STPCPY_FALSE='#' +else + GL_COND_OBJ_STPCPY_TRUE='#' + GL_COND_OBJ_STPCPY_FALSE= +fi +: + if test -z "${GL_COND_OBJ_STPCPY_TRUE}" && test -z "${GL_COND_OBJ_STPCPY_FALSE}"; then + GL_COND_OBJ_STPCPY_TRUE='#' + GL_COND_OBJ_STPCPY_FALSE='#' + fi + + if test -z "$GL_COND_OBJ_STPCPY_TRUE"; then : + + + : + + +fi + + + + + + + + + + + + + + + GL_GNULIB_STPCPY=1 + + + + + +printf "%s\n" "#define GNULIB_TEST_STPCPY 1" >>confdefs.h + + + + + + ac_fn_c_check_func "$LINENO" "strcasecmp" "ac_cv_func_strcasecmp" if test "x$ac_cv_func_strcasecmp" = xyes then : @@ -50614,6 +51179,13 @@ printf "%s\n" "#define GNULIB_TEMPNAME 1" >>confdefs.h + + + + + + + : @@ -58123,7 +58695,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by man-db $as_me 2.10.2, which was +This file was extended by man-db $as_me 2.11.0, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -58191,7 +58763,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -man-db config.status 2.10.2 +man-db config.status 2.11.0 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" @@ -58354,6 +58926,7 @@ lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_q lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`' reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`' reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`' +FILECMD='`$ECHO "$FILECMD" | $SED "$delay_single_quote_subst"`' OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`' file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`' @@ -58362,6 +58935,7 @@ want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`' DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`' AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`' +lt_ar_flags='`$ECHO "$lt_ar_flags" | $SED "$delay_single_quote_subst"`' AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`' archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`' STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`' @@ -58482,6 +59056,7 @@ LN_S \ lt_SP2NL \ lt_NL2SP \ reload_flag \ +FILECMD \ OBJDUMP \ deplibs_check_method \ file_magic_cmd \ @@ -58490,7 +59065,6 @@ want_nocaseglob \ DLLTOOL \ sharedlib_from_linklib_cmd \ AR \ -AR_FLAGS \ archiver_list_spec \ STRIP \ RANLIB \ @@ -59473,6 +60047,9 @@ to_host_file_cmd=$lt_cv_to_host_file_cmd # convert \$build files to toolchain format. to_tool_file_cmd=$lt_cv_to_tool_file_cmd +# A file(cmd) program that detects file types. +FILECMD=$lt_FILECMD + # An object symbol dumper. OBJDUMP=$lt_OBJDUMP @@ -59497,8 +60074,11 @@ sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd # The archiver. AR=$lt_AR +# Flags to create an archive (by configure). +lt_ar_flags=$lt_ar_flags + # Flags to create an archive. -AR_FLAGS=$lt_AR_FLAGS +AR_FLAGS=\${ARFLAGS-"\$lt_ar_flags"} # How to feed a file listing to the archiver. archiver_list_spec=$lt_archiver_list_spec @@ -59874,7 +60454,7 @@ ltmain=$ac_aux_dir/ltmain.sh # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || diff --git a/configure.ac b/configure.ac index 5b3b7f7f..805b0205 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. m4_pattern_forbid([^MAN_]) # Initialise and check we're in the correct directory. -AC_INIT([man-db], [2.10.2], [cjwatson@debian.org]) +AC_INIT([man-db], [2.11.0], [cjwatson@debian.org]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([1.14 -Wall -Wno-override -Werror foreign dist-xz no-dist-gzip parallel-tests]) AM_SILENT_RULES([yes]) @@ -15,7 +15,7 @@ AC_CONFIG_HEADERS([config.h]) AC_CANONICAL_HOST # Define below date and version information to be put into man pages etc. -date=2022-03-17 +date=2022-10-15 AC_SUBST([date])dnl roff_version=`echo AC_PACKAGE_VERSION | sed 's/-/\\-/g'` AC_SUBST([roff_version])dnl @@ -390,7 +390,7 @@ AC_DEFINE_UNQUOTED( [Default compression extension, used for compressing cat pages.]) dnl Decompressors are used for decompressing cat pages and nroff source. dnl To add further decompressors, you will also need to edit -dnl include/comp_src.h. +dnl lib/compression.c. AC_DEFINE_UNQUOTED([PROG_GUNZIP], ["$gunzip"], [Program to use as gunzip.]) AC_DEFINE_UNQUOTED( [PROG_UNCOMPRESS], ["$uncompress"], [Program to use as uncompress.]) diff --git a/docs/COPYING.GPLv2 b/docs/COPYING.GPLv2 new file mode 100644 index 00000000..d159169d --- /dev/null +++ b/docs/COPYING.GPLv2 @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + <signature of Ty Coon>, 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/COPYING.LIB b/docs/COPYING.LIB index 4362b491..4362b491 100644 --- a/COPYING.LIB +++ b/docs/COPYING.LIB diff --git a/docs/HACKING.md b/docs/HACKING.md index a32dbbbc..7b9ee070 100644 --- a/docs/HACKING.md +++ b/docs/HACKING.md @@ -167,7 +167,7 @@ Release process arrive. During this time, test until your eyeballs fall out, but try to avoid changing any translated messages. -4. Once you're ready to release, update `NEWS.md`, `docs/man-db.lsm`, and +4. Once you're ready to release, update `NEWS.md`, and the `AC_INIT` version number and `date` in `configure.ac`. Commit and tag. diff --git a/docs/INSTALL.autoconf b/docs/INSTALL.autoconf index e82fd21d..a093a364 100644 --- a/docs/INSTALL.autoconf +++ b/docs/INSTALL.autoconf @@ -1,7 +1,7 @@ Installation Instructions ************************* - Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free + Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2022 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, diff --git a/docs/Makefile.am b/docs/Makefile.am index c5bcde43..ad9ef3fe 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,7 +1,8 @@ dist_noinst_DATA = \ + COPYING.GPLv2 \ + COPYING.LIB \ HACKING.md \ TODO \ - man-db.lsm \ manpage.example \ manpage.example.mdoc \ manpage.example.pod \ diff --git a/docs/Makefile.in b/docs/Makefile.in index d852c107..ff1c6f53 100644 --- a/docs/Makefile.in +++ b/docs/Makefile.in @@ -212,6 +212,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -223,8 +224,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -232,7 +233,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -251,6 +252,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -301,7 +303,7 @@ am__can_run_installinfo = \ esac DATA = $(dist_noinst_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) -am__DIST_COMMON = $(srcdir)/Makefile.in TODO +am__DIST_COMMON = $(srcdir)/Makefile.in COPYING.LIB TODO DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -351,6 +353,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -371,6 +374,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -662,6 +666,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -790,6 +795,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -967,6 +973,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1122,6 +1129,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1157,6 +1165,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1193,6 +1202,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ @@ -1544,9 +1554,10 @@ vgrind = @vgrind@ xz = @xz@ zstd = @zstd@ dist_noinst_DATA = \ + COPYING.GPLv2 \ + COPYING.LIB \ HACKING.md \ TODO \ - man-db.lsm \ manpage.example \ manpage.example.mdoc \ manpage.example.pod \ diff --git a/docs/man-db.lsm b/docs/man-db.lsm deleted file mode 100644 index 6f47bac0..00000000 --- a/docs/man-db.lsm +++ /dev/null @@ -1,28 +0,0 @@ -Begin4 -Title: man-db -Version: 2.10.2 -Entered-date: 2022-03-17 -Description: This package provides the man command. This utility is - the primary way of examining the system help files - (manual pages). Other utilities provided include the - whatis and apropos commands for searching the manual - page database, the manpath utility for determining the - manual page search path, and the maintenance utilities - mandb, catman, and zsoelim. This package uses the groff - suite of programs to format and display the manual - pages. -Keywords: man, mandb, manpath, apropos, whatis, manpath.conf, - manual pager browser, zsoelim, manconv, accessdb, lexgrog. -Author: jwe@che.utexas.edu (John W Eaton) - G.Wilford@ee.surrey.ac.uk (Graeme Wilford) - fpolacco@debian.org (Fabrizio Polacco) - cjwatson@debian.org (Colin Watson) -Maintained-by: cjwatson@debian.org (Colin Watson) -Primary-site: https://savannah.nongnu.org/download/man-db/ - 1.9M man-db-2.10.2.tar.xz -Alternate-site: http://ftp.debian.org/debian/pool/main/m/man-db/ -Platforms: Requires GNU groff 1.16. - Optionally uses GDBM or Berkeley DB (any version with 1.85 - compatibility). -Copying-policy: GPL -End diff --git a/gl/lib/Makefile.am b/gl/lib/Makefile.am index 8e04cbbb..a8e268e2 100644 --- a/gl/lib/Makefile.am +++ b/gl/lib/Makefile.am @@ -81,14 +81,17 @@ # setenv \ # sigaction \ # signal-h \ +# sigpipe \ # sigprocmask \ # stat-time \ # stdbool \ +# stpcpy \ # strcase \ # strcasestr \ # strerror \ # strsep \ # tempname \ +# termios \ # timespec \ # unlinkat \ # utimens \ @@ -1601,6 +1604,18 @@ endif ## end gnulib module readlink +## begin gnulib module readlinkat + +if GL_COND_OBJ_READLINKAT +libgnu_la_SOURCES += readlinkat.c +endif + +EXTRA_DIST += at-func.c + +EXTRA_libgnu_la_SOURCES += at-func.c + +## end gnulib module readlinkat + ## begin gnulib module realloc-gnu @@ -1807,6 +1822,15 @@ EXTRA_DIST += signal.in.h ## end gnulib module signal-h +## begin gnulib module sigpipe + + +EXTRA_DIST += stdio-write.c + +EXTRA_libgnu_la_SOURCES += stdio-write.c + +## end gnulib module sigpipe + ## begin gnulib module sigprocmask if GL_COND_OBJ_SIGPROCMASK @@ -1905,12 +1929,6 @@ EXTRA_DIST += stat-time.h ## end gnulib module stat-time -## begin gnulib module statat - -libgnu_la_SOURCES += statat.c - -## end gnulib module statat - ## begin gnulib module stdalign BUILT_SOURCES += $(STDALIGN_H) @@ -2356,6 +2374,14 @@ EXTRA_DIST += stdopen.h ## end gnulib module stdopen +## begin gnulib module stpcpy + +if GL_COND_OBJ_STPCPY +libgnu_la_SOURCES += stpcpy.c +endif + +## end gnulib module stpcpy + ## begin gnulib module strcase if GL_COND_OBJ_STRCASECMP @@ -2783,6 +2809,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ + -e 's/@''GNULIB_CHMOD''@/$(GL_GNULIB_CHMOD)/g' \ -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ @@ -2814,6 +2841,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ + -e 's|@''REPLACE_CHMOD''@|$(REPLACE_CHMOD)|g' \ -e 's|@''REPLACE_FCHMODAT''@|$(REPLACE_FCHMODAT)|g' \ -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ @@ -2953,6 +2981,32 @@ EXTRA_DIST += tempname.h ## end gnulib module tempname +## begin gnulib module termios + +BUILT_SOURCES += termios.h + +# We need the following in order to create <termios.h> when the system +# version does not have all declarations. +termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \ + -e 's/@''GNULIB_TCGETSID''@/$(GL_GNULIB_TCGETSID)/g' \ + -e 's|@''HAVE_DECL_TCGETSID''@|$(HAVE_DECL_TCGETSID)|g' \ + -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/termios.in.h > $@-t + $(AM_V_at)mv $@-t $@ +MOSTLYCLEANFILES += termios.h termios.h-t + +EXTRA_DIST += termios.in.h + +## end gnulib module termios + ## begin gnulib module threadlib libgnu_la_SOURCES += glthread/threadlib.c diff --git a/gl/lib/Makefile.in b/gl/lib/Makefile.in index 69b555e4..1ef35a25 100644 --- a/gl/lib/Makefile.in +++ b/gl/lib/Makefile.in @@ -95,14 +95,17 @@ # setenv \ # sigaction \ # signal-h \ +# sigpipe \ # sigprocmask \ # stat-time \ # stdbool \ +# stpcpy \ # strcase \ # strcasestr \ # strerror \ # strsep \ # tempname \ +# termios \ # timespec \ # unlinkat \ # utimens \ @@ -254,40 +257,42 @@ host_triplet = @host@ @GL_COND_OBJ_RAWMEMCHR_TRUE@am__append_59 = rawmemchr.c @GL_COND_OBJ_READDIR_TRUE@am__append_60 = readdir.c @GL_COND_OBJ_READLINK_TRUE@am__append_61 = readlink.c -@GL_COND_OBJ_REALLOCARRAY_TRUE@am__append_62 = reallocarray.c -@GL_COND_OBJ_REGEX_TRUE@am__append_63 = regex.c -@GL_COND_OBJ_RENAME_TRUE@am__append_64 = rename.c -@GL_COND_OBJ_RENAMEAT_TRUE@am__append_65 = renameat.c -@GL_COND_OBJ_REWINDDIR_TRUE@am__append_66 = rewinddir.c -@GL_COND_OBJ_RMDIR_TRUE@am__append_67 = rmdir.c -@GL_COND_OBJ_SELECT_TRUE@am__append_68 = select.c -@GL_COND_OBJ_SETENV_TRUE@am__append_69 = setenv.c -@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__append_70 = setlocale-lock.c -@GL_COND_OBJ_SIGACTION_TRUE@am__append_71 = sigaction.c -@GL_COND_OBJ_SIGPROCMASK_TRUE@am__append_72 = sigprocmask.c -@GL_COND_OBJ_SLEEP_TRUE@am__append_73 = sleep.c -@GL_COND_OBJ_STAT_TRUE@am__append_74 = stat.c -@GL_COND_OBJ_STDIO_READ_TRUE@am__append_75 = stdio-read.c -@GL_COND_OBJ_STDIO_WRITE_TRUE@am__append_76 = stdio-write.c -@GL_COND_OBJ_STRCASECMP_TRUE@am__append_77 = strcasecmp.c -@GL_COND_OBJ_STRNCASECMP_TRUE@am__append_78 = strncasecmp.c -@GL_COND_OBJ_STRCHRNUL_TRUE@am__append_79 = strchrnul.c -@GL_COND_OBJ_STRDUP_TRUE@am__append_80 = strdup.c -@GL_COND_OBJ_STRERROR_TRUE@am__append_81 = strerror.c -@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__append_82 = strerror-override.c -@GL_COND_OBJ_STRNDUP_TRUE@am__append_83 = strndup.c -@GL_COND_OBJ_STRNLEN_TRUE@am__append_84 = strnlen.c -@GL_COND_OBJ_STRSEP_TRUE@am__append_85 = strsep.c -@GL_COND_OBJ_UNLINK_TRUE@am__append_86 = unlink.c -@GL_COND_OBJ_UNLINKAT_TRUE@am__append_87 = unlinkat.c -@GL_COND_OBJ_UTIME_TRUE@am__append_88 = utime.c -@GL_COND_OBJ_WCRTOMB_TRUE@am__append_89 = wcrtomb.c -@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__append_90 = windows-mutex.c -@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__append_91 = windows-once.c -@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__append_92 = windows-recmutex.c -@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__append_93 = windows-rwlock.c -@GL_COND_OBJ_WMEMCHR_TRUE@am__append_94 = wmemchr.c -@GL_COND_OBJ_WMEMPCPY_TRUE@am__append_95 = wmempcpy.c +@GL_COND_OBJ_READLINKAT_TRUE@am__append_62 = readlinkat.c +@GL_COND_OBJ_REALLOCARRAY_TRUE@am__append_63 = reallocarray.c +@GL_COND_OBJ_REGEX_TRUE@am__append_64 = regex.c +@GL_COND_OBJ_RENAME_TRUE@am__append_65 = rename.c +@GL_COND_OBJ_RENAMEAT_TRUE@am__append_66 = renameat.c +@GL_COND_OBJ_REWINDDIR_TRUE@am__append_67 = rewinddir.c +@GL_COND_OBJ_RMDIR_TRUE@am__append_68 = rmdir.c +@GL_COND_OBJ_SELECT_TRUE@am__append_69 = select.c +@GL_COND_OBJ_SETENV_TRUE@am__append_70 = setenv.c +@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__append_71 = setlocale-lock.c +@GL_COND_OBJ_SIGACTION_TRUE@am__append_72 = sigaction.c +@GL_COND_OBJ_SIGPROCMASK_TRUE@am__append_73 = sigprocmask.c +@GL_COND_OBJ_SLEEP_TRUE@am__append_74 = sleep.c +@GL_COND_OBJ_STAT_TRUE@am__append_75 = stat.c +@GL_COND_OBJ_STDIO_READ_TRUE@am__append_76 = stdio-read.c +@GL_COND_OBJ_STDIO_WRITE_TRUE@am__append_77 = stdio-write.c +@GL_COND_OBJ_STPCPY_TRUE@am__append_78 = stpcpy.c +@GL_COND_OBJ_STRCASECMP_TRUE@am__append_79 = strcasecmp.c +@GL_COND_OBJ_STRNCASECMP_TRUE@am__append_80 = strncasecmp.c +@GL_COND_OBJ_STRCHRNUL_TRUE@am__append_81 = strchrnul.c +@GL_COND_OBJ_STRDUP_TRUE@am__append_82 = strdup.c +@GL_COND_OBJ_STRERROR_TRUE@am__append_83 = strerror.c +@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__append_84 = strerror-override.c +@GL_COND_OBJ_STRNDUP_TRUE@am__append_85 = strndup.c +@GL_COND_OBJ_STRNLEN_TRUE@am__append_86 = strnlen.c +@GL_COND_OBJ_STRSEP_TRUE@am__append_87 = strsep.c +@GL_COND_OBJ_UNLINK_TRUE@am__append_88 = unlink.c +@GL_COND_OBJ_UNLINKAT_TRUE@am__append_89 = unlinkat.c +@GL_COND_OBJ_UTIME_TRUE@am__append_90 = utime.c +@GL_COND_OBJ_WCRTOMB_TRUE@am__append_91 = wcrtomb.c +@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__append_92 = windows-mutex.c +@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__append_93 = windows-once.c +@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__append_94 = windows-recmutex.c +@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__append_95 = windows-rwlock.c +@GL_COND_OBJ_WMEMCHR_TRUE@am__append_96 = wmemchr.c +@GL_COND_OBJ_WMEMPCPY_TRUE@am__append_97 = wmempcpy.c subdir = gl/lib ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ @@ -412,6 +417,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -423,8 +429,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -432,7 +438,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -451,6 +457,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -516,25 +523,25 @@ am__libgnu_la_SOURCES_DIST = argp.h argp-ba.c argp-eexst.c \ pthread_sigmask.c raise.c rawmemchr.c gl_rbtree_list.h \ gl_rbtree_list.c gl_anyrbtree_list1.h gl_anyrbtree_list2.h \ gl_anytree_list1.h gl_anytree_list2.h readdir.c readlink.c \ - reallocarray.c regex.c rename.c renameat.c renameatu.c \ - rewinddir.c rmdir.c save-cwd.c malloc/scratch_buffer_dupfree.c \ - malloc/scratch_buffer_grow.c \ + readlinkat.c reallocarray.c regex.c rename.c renameat.c \ + renameatu.c rewinddir.c rmdir.c save-cwd.c \ + malloc/scratch_buffer_dupfree.c malloc/scratch_buffer_grow.c \ malloc/scratch_buffer_grow_preserve.c \ malloc/scratch_buffer_set_array_size.c select.c gl_set.h \ gl_set.c setenv.c setlocale_null.c setlocale-lock.c \ sigaction.c sig-handler.c sigprocmask.c size_max.h sleep.c \ - sockets.h sockets.c stat.c stat-time.c statat.c stdio-read.c \ - stdio-write.c stdopen.c strcasecmp.c strncasecmp.c strchrnul.c \ - strdup.c strerror.c strerror-override.c strndup.c strnlen.c \ - strnlen1.h strnlen1.c strsep.c sys_socket.c tempname.c \ - glthread/threadlib.c timespec.c unistd.c dup-safer.c \ - fd-safer.c pipe-safer.c unlink.c unlinkat.c utime.c utimens.c \ - verror.h verror.c wcrtomb.c wctype-h.c windows-mutex.c \ - windows-once.c windows-recmutex.c windows-rwlock.c wmemchr.c \ - wmempcpy.c xmalloc.c xalloc-die.c xgetcwd.c gl_xlist.h \ - gl_xlist.c gl_xmap.h gl_xmap.c gl_xset.h gl_xset.c xsize.h \ - xsize.c xstdopen.c xstrndup.h xstrndup.c xvasprintf.h \ - xvasprintf.c xasprintf.c + sockets.h sockets.c stat.c stat-time.c stdio-read.c \ + stdio-write.c stdopen.c stpcpy.c strcasecmp.c strncasecmp.c \ + strchrnul.c strdup.c strerror.c strerror-override.c strndup.c \ + strnlen.c strnlen1.h strnlen1.c strsep.c sys_socket.c \ + tempname.c glthread/threadlib.c timespec.c unistd.c \ + dup-safer.c fd-safer.c pipe-safer.c unlink.c unlinkat.c \ + utime.c utimens.c verror.h verror.c wcrtomb.c wctype-h.c \ + windows-mutex.c windows-once.c windows-recmutex.c \ + windows-rwlock.c wmemchr.c wmempcpy.c xmalloc.c xalloc-die.c \ + xgetcwd.c gl_xlist.h gl_xlist.c gl_xmap.h gl_xmap.c gl_xset.h \ + gl_xset.c xsize.h xsize.c xstdopen.c xstrndup.h xstrndup.c \ + xvasprintf.h xvasprintf.c xasprintf.c @GL_COND_OBJ_BTOWC_TRUE@am__objects_1 = libgnu_la-btowc.lo @GL_COND_OBJ_CANONICALIZE_LGPL_TRUE@am__objects_2 = libgnu_la-canonicalize-lgpl.lo @GL_COND_OBJ_CHDIR_LONG_TRUE@am__objects_3 = libgnu_la-chdir-long.lo @@ -606,48 +613,50 @@ am__dirstamp = $(am__leading_dot)dirstamp @GL_COND_OBJ_RAWMEMCHR_TRUE@am__objects_59 = libgnu_la-rawmemchr.lo @GL_COND_OBJ_READDIR_TRUE@am__objects_60 = libgnu_la-readdir.lo @GL_COND_OBJ_READLINK_TRUE@am__objects_61 = libgnu_la-readlink.lo -@GL_COND_OBJ_REALLOCARRAY_TRUE@am__objects_62 = \ +@GL_COND_OBJ_READLINKAT_TRUE@am__objects_62 = libgnu_la-readlinkat.lo +@GL_COND_OBJ_REALLOCARRAY_TRUE@am__objects_63 = \ @GL_COND_OBJ_REALLOCARRAY_TRUE@ libgnu_la-reallocarray.lo -@GL_COND_OBJ_REGEX_TRUE@am__objects_63 = libgnu_la-regex.lo -@GL_COND_OBJ_RENAME_TRUE@am__objects_64 = libgnu_la-rename.lo -@GL_COND_OBJ_RENAMEAT_TRUE@am__objects_65 = libgnu_la-renameat.lo -@GL_COND_OBJ_REWINDDIR_TRUE@am__objects_66 = libgnu_la-rewinddir.lo -@GL_COND_OBJ_RMDIR_TRUE@am__objects_67 = libgnu_la-rmdir.lo -@GL_COND_OBJ_SELECT_TRUE@am__objects_68 = libgnu_la-select.lo -@GL_COND_OBJ_SETENV_TRUE@am__objects_69 = libgnu_la-setenv.lo -@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__objects_70 = \ +@GL_COND_OBJ_REGEX_TRUE@am__objects_64 = libgnu_la-regex.lo +@GL_COND_OBJ_RENAME_TRUE@am__objects_65 = libgnu_la-rename.lo +@GL_COND_OBJ_RENAMEAT_TRUE@am__objects_66 = libgnu_la-renameat.lo +@GL_COND_OBJ_REWINDDIR_TRUE@am__objects_67 = libgnu_la-rewinddir.lo +@GL_COND_OBJ_RMDIR_TRUE@am__objects_68 = libgnu_la-rmdir.lo +@GL_COND_OBJ_SELECT_TRUE@am__objects_69 = libgnu_la-select.lo +@GL_COND_OBJ_SETENV_TRUE@am__objects_70 = libgnu_la-setenv.lo +@GL_COND_OBJ_SETLOCALE_LOCK_TRUE@am__objects_71 = \ @GL_COND_OBJ_SETLOCALE_LOCK_TRUE@ libgnu_la-setlocale-lock.lo -@GL_COND_OBJ_SIGACTION_TRUE@am__objects_71 = libgnu_la-sigaction.lo -@GL_COND_OBJ_SIGPROCMASK_TRUE@am__objects_72 = \ +@GL_COND_OBJ_SIGACTION_TRUE@am__objects_72 = libgnu_la-sigaction.lo +@GL_COND_OBJ_SIGPROCMASK_TRUE@am__objects_73 = \ @GL_COND_OBJ_SIGPROCMASK_TRUE@ libgnu_la-sigprocmask.lo -@GL_COND_OBJ_SLEEP_TRUE@am__objects_73 = libgnu_la-sleep.lo -@GL_COND_OBJ_STAT_TRUE@am__objects_74 = libgnu_la-stat.lo -@GL_COND_OBJ_STDIO_READ_TRUE@am__objects_75 = libgnu_la-stdio-read.lo -@GL_COND_OBJ_STDIO_WRITE_TRUE@am__objects_76 = \ +@GL_COND_OBJ_SLEEP_TRUE@am__objects_74 = libgnu_la-sleep.lo +@GL_COND_OBJ_STAT_TRUE@am__objects_75 = libgnu_la-stat.lo +@GL_COND_OBJ_STDIO_READ_TRUE@am__objects_76 = libgnu_la-stdio-read.lo +@GL_COND_OBJ_STDIO_WRITE_TRUE@am__objects_77 = \ @GL_COND_OBJ_STDIO_WRITE_TRUE@ libgnu_la-stdio-write.lo -@GL_COND_OBJ_STRCASECMP_TRUE@am__objects_77 = libgnu_la-strcasecmp.lo -@GL_COND_OBJ_STRNCASECMP_TRUE@am__objects_78 = \ +@GL_COND_OBJ_STPCPY_TRUE@am__objects_78 = libgnu_la-stpcpy.lo +@GL_COND_OBJ_STRCASECMP_TRUE@am__objects_79 = libgnu_la-strcasecmp.lo +@GL_COND_OBJ_STRNCASECMP_TRUE@am__objects_80 = \ @GL_COND_OBJ_STRNCASECMP_TRUE@ libgnu_la-strncasecmp.lo -@GL_COND_OBJ_STRCHRNUL_TRUE@am__objects_79 = libgnu_la-strchrnul.lo -@GL_COND_OBJ_STRDUP_TRUE@am__objects_80 = libgnu_la-strdup.lo -@GL_COND_OBJ_STRERROR_TRUE@am__objects_81 = libgnu_la-strerror.lo -@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__objects_82 = libgnu_la-strerror-override.lo -@GL_COND_OBJ_STRNDUP_TRUE@am__objects_83 = libgnu_la-strndup.lo -@GL_COND_OBJ_STRNLEN_TRUE@am__objects_84 = libgnu_la-strnlen.lo -@GL_COND_OBJ_STRSEP_TRUE@am__objects_85 = libgnu_la-strsep.lo -@GL_COND_OBJ_UNLINK_TRUE@am__objects_86 = libgnu_la-unlink.lo -@GL_COND_OBJ_UNLINKAT_TRUE@am__objects_87 = libgnu_la-unlinkat.lo -@GL_COND_OBJ_UTIME_TRUE@am__objects_88 = libgnu_la-utime.lo -@GL_COND_OBJ_WCRTOMB_TRUE@am__objects_89 = libgnu_la-wcrtomb.lo -@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__objects_90 = \ +@GL_COND_OBJ_STRCHRNUL_TRUE@am__objects_81 = libgnu_la-strchrnul.lo +@GL_COND_OBJ_STRDUP_TRUE@am__objects_82 = libgnu_la-strdup.lo +@GL_COND_OBJ_STRERROR_TRUE@am__objects_83 = libgnu_la-strerror.lo +@GL_COND_OBJ_STRERROR_OVERRIDE_TRUE@am__objects_84 = libgnu_la-strerror-override.lo +@GL_COND_OBJ_STRNDUP_TRUE@am__objects_85 = libgnu_la-strndup.lo +@GL_COND_OBJ_STRNLEN_TRUE@am__objects_86 = libgnu_la-strnlen.lo +@GL_COND_OBJ_STRSEP_TRUE@am__objects_87 = libgnu_la-strsep.lo +@GL_COND_OBJ_UNLINK_TRUE@am__objects_88 = libgnu_la-unlink.lo +@GL_COND_OBJ_UNLINKAT_TRUE@am__objects_89 = libgnu_la-unlinkat.lo +@GL_COND_OBJ_UTIME_TRUE@am__objects_90 = libgnu_la-utime.lo +@GL_COND_OBJ_WCRTOMB_TRUE@am__objects_91 = libgnu_la-wcrtomb.lo +@GL_COND_OBJ_WINDOWS_MUTEX_TRUE@am__objects_92 = \ @GL_COND_OBJ_WINDOWS_MUTEX_TRUE@ libgnu_la-windows-mutex.lo -@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__objects_91 = \ +@GL_COND_OBJ_WINDOWS_ONCE_TRUE@am__objects_93 = \ @GL_COND_OBJ_WINDOWS_ONCE_TRUE@ libgnu_la-windows-once.lo -@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__objects_92 = libgnu_la-windows-recmutex.lo -@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__objects_93 = \ +@GL_COND_OBJ_WINDOWS_RECMUTEX_TRUE@am__objects_94 = libgnu_la-windows-recmutex.lo +@GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@am__objects_95 = \ @GL_COND_OBJ_WINDOWS_RWLOCK_TRUE@ libgnu_la-windows-rwlock.lo -@GL_COND_OBJ_WMEMCHR_TRUE@am__objects_94 = libgnu_la-wmemchr.lo -@GL_COND_OBJ_WMEMPCPY_TRUE@am__objects_95 = libgnu_la-wmempcpy.lo +@GL_COND_OBJ_WMEMCHR_TRUE@am__objects_96 = libgnu_la-wmemchr.lo +@GL_COND_OBJ_WMEMPCPY_TRUE@am__objects_97 = libgnu_la-wmempcpy.lo am_libgnu_la_OBJECTS = libgnu_la-argp-ba.lo libgnu_la-argp-eexst.lo \ libgnu_la-argp-fmtstream.lo libgnu_la-argp-fs-xinl.lo \ libgnu_la-argp-help.lo libgnu_la-argp-parse.lo \ @@ -697,30 +706,30 @@ am_libgnu_la_OBJECTS = libgnu_la-argp-ba.lo libgnu_la-argp-eexst.lo \ $(am__objects_59) libgnu_la-gl_rbtree_list.lo \ $(am__objects_60) $(am__objects_61) $(am__objects_62) \ $(am__objects_63) $(am__objects_64) $(am__objects_65) \ - libgnu_la-renameatu.lo $(am__objects_66) $(am__objects_67) \ - libgnu_la-save-cwd.lo \ + $(am__objects_66) libgnu_la-renameatu.lo $(am__objects_67) \ + $(am__objects_68) libgnu_la-save-cwd.lo \ malloc/libgnu_la-scratch_buffer_dupfree.lo \ malloc/libgnu_la-scratch_buffer_grow.lo \ malloc/libgnu_la-scratch_buffer_grow_preserve.lo \ malloc/libgnu_la-scratch_buffer_set_array_size.lo \ - $(am__objects_68) libgnu_la-gl_set.lo $(am__objects_69) \ - libgnu_la-setlocale_null.lo $(am__objects_70) \ - $(am__objects_71) libgnu_la-sig-handler.lo $(am__objects_72) \ - $(am__objects_73) libgnu_la-sockets.lo $(am__objects_74) \ - libgnu_la-stat-time.lo libgnu_la-statat.lo $(am__objects_75) \ - $(am__objects_76) libgnu_la-stdopen.lo $(am__objects_77) \ - $(am__objects_78) $(am__objects_79) $(am__objects_80) \ - $(am__objects_81) $(am__objects_82) $(am__objects_83) \ - $(am__objects_84) libgnu_la-strnlen1.lo $(am__objects_85) \ + $(am__objects_69) libgnu_la-gl_set.lo $(am__objects_70) \ + libgnu_la-setlocale_null.lo $(am__objects_71) \ + $(am__objects_72) libgnu_la-sig-handler.lo $(am__objects_73) \ + $(am__objects_74) libgnu_la-sockets.lo $(am__objects_75) \ + libgnu_la-stat-time.lo $(am__objects_76) $(am__objects_77) \ + libgnu_la-stdopen.lo $(am__objects_78) $(am__objects_79) \ + $(am__objects_80) $(am__objects_81) $(am__objects_82) \ + $(am__objects_83) $(am__objects_84) $(am__objects_85) \ + $(am__objects_86) libgnu_la-strnlen1.lo $(am__objects_87) \ libgnu_la-sys_socket.lo libgnu_la-tempname.lo \ glthread/libgnu_la-threadlib.lo libgnu_la-timespec.lo \ libgnu_la-unistd.lo libgnu_la-dup-safer.lo \ libgnu_la-fd-safer.lo libgnu_la-pipe-safer.lo \ - $(am__objects_86) $(am__objects_87) $(am__objects_88) \ - libgnu_la-utimens.lo libgnu_la-verror.lo $(am__objects_89) \ - libgnu_la-wctype-h.lo $(am__objects_90) $(am__objects_91) \ - $(am__objects_92) $(am__objects_93) $(am__objects_94) \ - $(am__objects_95) libgnu_la-xmalloc.lo libgnu_la-xalloc-die.lo \ + $(am__objects_88) $(am__objects_89) $(am__objects_90) \ + libgnu_la-utimens.lo libgnu_la-verror.lo $(am__objects_91) \ + libgnu_la-wctype-h.lo $(am__objects_92) $(am__objects_93) \ + $(am__objects_94) $(am__objects_95) $(am__objects_96) \ + $(am__objects_97) libgnu_la-xmalloc.lo libgnu_la-xalloc-die.lo \ libgnu_la-xgetcwd.lo libgnu_la-gl_xlist.lo \ libgnu_la-gl_xmap.lo libgnu_la-gl_xset.lo libgnu_la-xsize.lo \ libgnu_la-xstdopen.lo libgnu_la-xstrndup.lo \ @@ -878,6 +887,7 @@ am__depfiles_remade = ./$(DEPDIR)/alloca.Plo \ ./$(DEPDIR)/libgnu_la-rawmemchr.Plo \ ./$(DEPDIR)/libgnu_la-readdir.Plo \ ./$(DEPDIR)/libgnu_la-readlink.Plo \ + ./$(DEPDIR)/libgnu_la-readlinkat.Plo \ ./$(DEPDIR)/libgnu_la-realloc.Plo \ ./$(DEPDIR)/libgnu_la-reallocarray.Plo \ ./$(DEPDIR)/libgnu_la-regcomp.Plo \ @@ -902,10 +912,10 @@ am__depfiles_remade = ./$(DEPDIR)/alloca.Plo \ ./$(DEPDIR)/libgnu_la-stat-time.Plo \ ./$(DEPDIR)/libgnu_la-stat-w32.Plo \ ./$(DEPDIR)/libgnu_la-stat.Plo \ - ./$(DEPDIR)/libgnu_la-statat.Plo \ ./$(DEPDIR)/libgnu_la-stdio-read.Plo \ ./$(DEPDIR)/libgnu_la-stdio-write.Plo \ ./$(DEPDIR)/libgnu_la-stdopen.Plo \ + ./$(DEPDIR)/libgnu_la-stpcpy.Plo \ ./$(DEPDIR)/libgnu_la-strcasecmp.Plo \ ./$(DEPDIR)/libgnu_la-strcasestr.Plo \ ./$(DEPDIR)/libgnu_la-strchrnul.Plo \ @@ -1096,6 +1106,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -1116,6 +1127,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -1407,6 +1419,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1535,6 +1548,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1712,6 +1726,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1867,6 +1882,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1902,6 +1918,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1938,6 +1955,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ @@ -2316,28 +2334,28 @@ EXTRA_DIST = alloca.c alloca.in.h assure.h attribute.h basename-lgpl.h \ memchr.valgrind memmem.c memmem.c str-two-way.h msvc-inval.h \ msvc-nothrow.h windows-initguard.h nonblocking.h stdio-read.c \ stdio-write.c openat.h dirent-private.h pathmax.h \ - rawmemchr.valgrind dirent-private.h realloc.c realloc.c \ - regcomp.c regex.h regex_internal.c regex_internal.h regexec.c \ - at-func2.c at-func2.c renameatu.h dirent-private.h \ + rawmemchr.valgrind dirent-private.h at-func.c realloc.c \ + realloc.c regcomp.c regex.h regex_internal.c regex_internal.h \ + regexec.c at-func2.c at-func2.c renameatu.h dirent-private.h \ same-inode.h save-cwd.h malloc/scratch_buffer.h \ scratch_buffer.h setlocale_null.h windows-initguard.h \ - sig-handler.h signal.in.h _Noreturn.h arg-nonnull.h c++defs.h \ - warn-on-use.h w32sock.h stat-w32.c stat-w32.h stat-time.h \ - stdalign.in.h stdarg.in.h stdbool.in.h stddef.in.h stdint.in.h \ - stdio.in.h stdlib.in.h stdopen.h strcasestr.c str-two-way.h \ - strcasestr.c strchrnul.valgrind streq.h strerror-override.h \ - string.in.h strings.in.h sys_file.in.h sys_ioctl.in.h \ - sys_random.in.h sys_select.in.h sys_socket.in.h sys_stat.in.h \ - sys_time.in.h sys_types.in.h sys_uio.in.h sysexits.in.h \ - tempname.h time.in.h timespec.h unistd.in.h unistd--.h \ - unistd-safer.h at-func.c utime.in.h utimens.h asnprintf.c \ - float+.h printf-args.c printf-args.h printf-parse.c \ - printf-parse.h vasnprintf.c vasnprintf.h asprintf.c \ - vasprintf.c verify.h vsnprintf.c wchar.in.h wctype.in.h \ - windows-initguard.h windows-mutex.h windows-once.h \ - windows-initguard.h windows-recmutex.h windows-initguard.h \ - windows-rwlock.h wmemchr-impl.h xalloc.h xalloc.h \ - xalloc-oversized.h xgetcwd.h xstdopen.h xalloc.h + sig-handler.h signal.in.h stdio-write.c _Noreturn.h \ + arg-nonnull.h c++defs.h warn-on-use.h w32sock.h stat-w32.c \ + stat-w32.h stat-time.h stdalign.in.h stdarg.in.h stdbool.in.h \ + stddef.in.h stdint.in.h stdio.in.h stdlib.in.h stdopen.h \ + strcasestr.c str-two-way.h strcasestr.c strchrnul.valgrind \ + streq.h strerror-override.h string.in.h strings.in.h \ + sys_file.in.h sys_ioctl.in.h sys_random.in.h sys_select.in.h \ + sys_socket.in.h sys_stat.in.h sys_time.in.h sys_types.in.h \ + sys_uio.in.h sysexits.in.h tempname.h termios.in.h time.in.h \ + timespec.h unistd.in.h unistd--.h unistd-safer.h at-func.c \ + utime.in.h utimens.h asnprintf.c float+.h printf-args.c \ + printf-args.h printf-parse.c printf-parse.h vasnprintf.c \ + vasnprintf.h asprintf.c vasprintf.c verify.h vsnprintf.c \ + wchar.in.h wctype.in.h windows-initguard.h windows-mutex.h \ + windows-once.h windows-initguard.h windows-recmutex.h \ + windows-initguard.h windows-rwlock.h wmemchr-impl.h xalloc.h \ + xalloc.h xalloc-oversized.h xgetcwd.h xstdopen.h xalloc.h BUILT_SOURCES = $(ALLOCA_H) ctype.h dirent.h malloc/dynarray.gl.h \ malloc/dynarray-skeleton.gl.h $(ERRNO_H) fcntl.h $(FLOAT_H) \ $(FNMATCH_H) $(GETOPT_H) $(GETOPT_CDEFS_H) $(GLOB_H) \ @@ -2346,7 +2364,8 @@ BUILT_SOURCES = $(ALLOCA_H) ctype.h dirent.h malloc/dynarray.gl.h \ $(STDBOOL_H) $(STDDEF_H) $(STDINT_H) stdio.h stdlib.h string.h \ strings.h sys/file.h sys/ioctl.h sys/random.h sys/select.h \ sys/socket.h sys/stat.h sys/time.h sys/types.h sys/uio.h \ - $(SYSEXITS_H) time.h unistd.h utime.h wchar.h wctype.h + $(SYSEXITS_H) termios.h time.h unistd.h utime.h wchar.h \ + wctype.h SUFFIXES = MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t ctype.h \ ctype.h-t dirent.h dirent.h-t malloc/dynarray.gl.h \ @@ -2365,8 +2384,9 @@ MOSTLYCLEANFILES = core *.stackdump alloca.h alloca.h-t ctype.h \ sys/random.h-t sys/select.h sys/select.h-t sys/socket.h \ sys/socket.h-t sys/stat.h sys/stat.h-t sys/time.h sys/time.h-t \ sys/types.h sys/types.h-t sys/uio.h sys/uio.h-t sysexits.h \ - sysexits.h-t time.h time.h-t unistd.h unistd.h-t utime.h \ - utime.h-t wchar.h wchar.h-t wctype.h wctype.h-t + sysexits.h-t termios.h termios.h-t time.h time.h-t unistd.h \ + unistd.h-t utime.h utime.h-t wchar.h wchar.h-t wctype.h \ + wctype.h-t MOSTLYCLEANDIRS = sys sys sys sys sys sys sys CLEANFILES = DISTCLEANFILES = @@ -2418,25 +2438,25 @@ libgnu_la_SOURCES = argp.h argp-ba.c argp-eexst.c argp-fmtstream.c \ gl_anyrbtree_list1.h gl_anyrbtree_list2.h gl_anytree_list1.h \ gl_anytree_list2.h $(am__append_60) $(am__append_61) \ $(am__append_62) $(am__append_63) $(am__append_64) \ - $(am__append_65) renameatu.c $(am__append_66) $(am__append_67) \ - save-cwd.c malloc/scratch_buffer_dupfree.c \ + $(am__append_65) $(am__append_66) renameatu.c $(am__append_67) \ + $(am__append_68) save-cwd.c malloc/scratch_buffer_dupfree.c \ malloc/scratch_buffer_grow.c \ malloc/scratch_buffer_grow_preserve.c \ - malloc/scratch_buffer_set_array_size.c $(am__append_68) \ - gl_set.h gl_set.c $(am__append_69) setlocale_null.c \ - $(am__append_70) $(am__append_71) sig-handler.c \ - $(am__append_72) size_max.h $(am__append_73) sockets.h \ - sockets.c $(am__append_74) stat-time.c statat.c \ - $(am__append_75) $(am__append_76) stdopen.c $(am__append_77) \ - $(am__append_78) $(am__append_79) $(am__append_80) \ - $(am__append_81) $(am__append_82) $(am__append_83) \ - $(am__append_84) strnlen1.h strnlen1.c $(am__append_85) \ + malloc/scratch_buffer_set_array_size.c $(am__append_69) \ + gl_set.h gl_set.c $(am__append_70) setlocale_null.c \ + $(am__append_71) $(am__append_72) sig-handler.c \ + $(am__append_73) size_max.h $(am__append_74) sockets.h \ + sockets.c $(am__append_75) stat-time.c $(am__append_76) \ + $(am__append_77) stdopen.c $(am__append_78) $(am__append_79) \ + $(am__append_80) $(am__append_81) $(am__append_82) \ + $(am__append_83) $(am__append_84) $(am__append_85) \ + $(am__append_86) strnlen1.h strnlen1.c $(am__append_87) \ sys_socket.c tempname.c glthread/threadlib.c timespec.c \ - unistd.c dup-safer.c fd-safer.c pipe-safer.c $(am__append_86) \ - $(am__append_87) $(am__append_88) utimens.c verror.h verror.c \ - $(am__append_89) wctype-h.c $(am__append_90) $(am__append_91) \ - $(am__append_92) $(am__append_93) $(am__append_94) \ - $(am__append_95) xmalloc.c xalloc-die.c xgetcwd.c gl_xlist.h \ + unistd.c dup-safer.c fd-safer.c pipe-safer.c $(am__append_88) \ + $(am__append_89) $(am__append_90) utimens.c verror.h verror.c \ + $(am__append_91) wctype-h.c $(am__append_92) $(am__append_93) \ + $(am__append_94) $(am__append_95) $(am__append_96) \ + $(am__append_97) xmalloc.c xalloc-die.c xgetcwd.c gl_xlist.h \ gl_xlist.c gl_xmap.h gl_xmap.c gl_xset.h gl_xset.c xsize.h \ xsize.c xstdopen.c xstrndup.h xstrndup.c xvasprintf.h \ xvasprintf.c xasprintf.c @@ -2447,10 +2467,11 @@ EXTRA_libgnu_la_SOURCES = alloca.c calloc.c calloc.c stripslash.c \ malloc/dynarray-skeleton.c fnmatch.c fnmatch_loop.c fnmatch.c \ stat-w32.c at-func.c malloc.c malloc.c lc-charset-dispatch.c \ mbtowc-lock.c mbsrtowcs-state.c memmem.c memmem.c stdio-read.c \ - stdio-write.c realloc.c realloc.c regcomp.c regex_internal.c \ - regexec.c at-func2.c at-func2.c stat-w32.c strcasestr.c \ - strcasestr.c at-func.c asnprintf.c printf-args.c \ - printf-parse.c vasnprintf.c asprintf.c vasprintf.c vsnprintf.c + stdio-write.c at-func.c realloc.c realloc.c regcomp.c \ + regex_internal.c regexec.c at-func2.c at-func2.c stdio-write.c \ + stat-w32.c strcasestr.c strcasestr.c at-func.c asnprintf.c \ + printf-args.c printf-parse.c vasnprintf.c asprintf.c \ + vasprintf.c vsnprintf.c libgnu_la_LDFLAGS = $(AM_LDFLAGS) -no-undefined $(LIBSOCKET) \ $(LIBTHREAD) $(LIB_CLOCK_GETTIME) $(LIB_GETLOGIN) \ $(LIB_GETRANDOM) $(LIB_HARD_LOCALE) $(LIB_MBRTOWC) \ @@ -2726,6 +2747,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-rawmemchr.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-readdir.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-readlink.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-readlinkat.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-realloc.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-reallocarray.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-regcomp.Plo@am__quote@ # am--include-marker @@ -2750,10 +2772,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-stat-time.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-stat-w32.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-stat.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-statat.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-stdio-read.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-stdio-write.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-stdopen.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-stpcpy.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-strcasecmp.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-strcasestr.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libgnu_la-strchrnul.Plo@am__quote@ # am--include-marker @@ -3649,6 +3671,13 @@ libgnu_la-readlink.lo: readlink.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -c -o libgnu_la-readlink.lo `test -f 'readlink.c' || echo '$(srcdir)/'`readlink.c +libgnu_la-readlinkat.lo: readlinkat.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -MT libgnu_la-readlinkat.lo -MD -MP -MF $(DEPDIR)/libgnu_la-readlinkat.Tpo -c -o libgnu_la-readlinkat.lo `test -f 'readlinkat.c' || echo '$(srcdir)/'`readlinkat.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_la-readlinkat.Tpo $(DEPDIR)/libgnu_la-readlinkat.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='readlinkat.c' object='libgnu_la-readlinkat.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -c -o libgnu_la-readlinkat.lo `test -f 'readlinkat.c' || echo '$(srcdir)/'`readlinkat.c + libgnu_la-reallocarray.lo: reallocarray.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -MT libgnu_la-reallocarray.lo -MD -MP -MF $(DEPDIR)/libgnu_la-reallocarray.Tpo -c -o libgnu_la-reallocarray.lo `test -f 'reallocarray.c' || echo '$(srcdir)/'`reallocarray.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_la-reallocarray.Tpo $(DEPDIR)/libgnu_la-reallocarray.Plo @@ -3817,13 +3846,6 @@ libgnu_la-stat-time.lo: stat-time.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -c -o libgnu_la-stat-time.lo `test -f 'stat-time.c' || echo '$(srcdir)/'`stat-time.c -libgnu_la-statat.lo: statat.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -MT libgnu_la-statat.lo -MD -MP -MF $(DEPDIR)/libgnu_la-statat.Tpo -c -o libgnu_la-statat.lo `test -f 'statat.c' || echo '$(srcdir)/'`statat.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_la-statat.Tpo $(DEPDIR)/libgnu_la-statat.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='statat.c' object='libgnu_la-statat.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -c -o libgnu_la-statat.lo `test -f 'statat.c' || echo '$(srcdir)/'`statat.c - libgnu_la-stdio-read.lo: stdio-read.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -MT libgnu_la-stdio-read.lo -MD -MP -MF $(DEPDIR)/libgnu_la-stdio-read.Tpo -c -o libgnu_la-stdio-read.lo `test -f 'stdio-read.c' || echo '$(srcdir)/'`stdio-read.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_la-stdio-read.Tpo $(DEPDIR)/libgnu_la-stdio-read.Plo @@ -3845,6 +3867,13 @@ libgnu_la-stdopen.lo: stdopen.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -c -o libgnu_la-stdopen.lo `test -f 'stdopen.c' || echo '$(srcdir)/'`stdopen.c +libgnu_la-stpcpy.lo: stpcpy.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -MT libgnu_la-stpcpy.lo -MD -MP -MF $(DEPDIR)/libgnu_la-stpcpy.Tpo -c -o libgnu_la-stpcpy.lo `test -f 'stpcpy.c' || echo '$(srcdir)/'`stpcpy.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_la-stpcpy.Tpo $(DEPDIR)/libgnu_la-stpcpy.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stpcpy.c' object='libgnu_la-stpcpy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -c -o libgnu_la-stpcpy.lo `test -f 'stpcpy.c' || echo '$(srcdir)/'`stpcpy.c + libgnu_la-strcasecmp.lo: strcasecmp.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libgnu_la_CFLAGS) $(CFLAGS) -MT libgnu_la-strcasecmp.lo -MD -MP -MF $(DEPDIR)/libgnu_la-strcasecmp.Tpo -c -o libgnu_la-strcasecmp.lo `test -f 'strcasecmp.c' || echo '$(srcdir)/'`strcasecmp.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libgnu_la-strcasecmp.Tpo $(DEPDIR)/libgnu_la-strcasecmp.Plo @@ -4663,6 +4692,7 @@ distclean: distclean-recursive -rm -f ./$(DEPDIR)/libgnu_la-rawmemchr.Plo -rm -f ./$(DEPDIR)/libgnu_la-readdir.Plo -rm -f ./$(DEPDIR)/libgnu_la-readlink.Plo + -rm -f ./$(DEPDIR)/libgnu_la-readlinkat.Plo -rm -f ./$(DEPDIR)/libgnu_la-realloc.Plo -rm -f ./$(DEPDIR)/libgnu_la-reallocarray.Plo -rm -f ./$(DEPDIR)/libgnu_la-regcomp.Plo @@ -4687,10 +4717,10 @@ distclean: distclean-recursive -rm -f ./$(DEPDIR)/libgnu_la-stat-time.Plo -rm -f ./$(DEPDIR)/libgnu_la-stat-w32.Plo -rm -f ./$(DEPDIR)/libgnu_la-stat.Plo - -rm -f ./$(DEPDIR)/libgnu_la-statat.Plo -rm -f ./$(DEPDIR)/libgnu_la-stdio-read.Plo -rm -f ./$(DEPDIR)/libgnu_la-stdio-write.Plo -rm -f ./$(DEPDIR)/libgnu_la-stdopen.Plo + -rm -f ./$(DEPDIR)/libgnu_la-stpcpy.Plo -rm -f ./$(DEPDIR)/libgnu_la-strcasecmp.Plo -rm -f ./$(DEPDIR)/libgnu_la-strcasestr.Plo -rm -f ./$(DEPDIR)/libgnu_la-strchrnul.Plo @@ -4920,6 +4950,7 @@ maintainer-clean: maintainer-clean-recursive -rm -f ./$(DEPDIR)/libgnu_la-rawmemchr.Plo -rm -f ./$(DEPDIR)/libgnu_la-readdir.Plo -rm -f ./$(DEPDIR)/libgnu_la-readlink.Plo + -rm -f ./$(DEPDIR)/libgnu_la-readlinkat.Plo -rm -f ./$(DEPDIR)/libgnu_la-realloc.Plo -rm -f ./$(DEPDIR)/libgnu_la-reallocarray.Plo -rm -f ./$(DEPDIR)/libgnu_la-regcomp.Plo @@ -4944,10 +4975,10 @@ maintainer-clean: maintainer-clean-recursive -rm -f ./$(DEPDIR)/libgnu_la-stat-time.Plo -rm -f ./$(DEPDIR)/libgnu_la-stat-w32.Plo -rm -f ./$(DEPDIR)/libgnu_la-stat.Plo - -rm -f ./$(DEPDIR)/libgnu_la-statat.Plo -rm -f ./$(DEPDIR)/libgnu_la-stdio-read.Plo -rm -f ./$(DEPDIR)/libgnu_la-stdio-write.Plo -rm -f ./$(DEPDIR)/libgnu_la-stdopen.Plo + -rm -f ./$(DEPDIR)/libgnu_la-stpcpy.Plo -rm -f ./$(DEPDIR)/libgnu_la-strcasecmp.Plo -rm -f ./$(DEPDIR)/libgnu_la-strcasestr.Plo -rm -f ./$(DEPDIR)/libgnu_la-strchrnul.Plo @@ -6010,6 +6041,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \ -e 's|@''WINDOWS_64_BIT_ST_SIZE''@|$(WINDOWS_64_BIT_ST_SIZE)|g' \ -e 's|@''WINDOWS_STAT_TIMESPEC''@|$(WINDOWS_STAT_TIMESPEC)|g' \ + -e 's/@''GNULIB_CHMOD''@/$(GL_GNULIB_CHMOD)/g' \ -e 's/@''GNULIB_FCHMODAT''@/$(GL_GNULIB_FCHMODAT)/g' \ -e 's/@''GNULIB_FSTAT''@/$(GL_GNULIB_FSTAT)/g' \ -e 's/@''GNULIB_FSTATAT''@/$(GL_GNULIB_FSTATAT)/g' \ @@ -6041,6 +6073,7 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \ -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \ -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \ + -e 's|@''REPLACE_CHMOD''@|$(REPLACE_CHMOD)|g' \ -e 's|@''REPLACE_FCHMODAT''@|$(REPLACE_FCHMODAT)|g' \ -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \ -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \ @@ -6126,6 +6159,23 @@ sys/uio.h: sys_uio.in.h $(top_builddir)/config.status @GL_GENERATE_SYSEXITS_H_FALSE@sysexits.h: $(top_builddir)/config.status @GL_GENERATE_SYSEXITS_H_FALSE@ rm -f $@ +# We need the following in order to create <termios.h> when the system +# version does not have all declarations. +termios.h: termios.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_USE_H) + $(gl_V_at)$(SED_HEADER_STDOUT) \ + -e 's|@''GUARD_PREFIX''@|GL|g' \ + -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \ + -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \ + -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \ + -e 's|@''NEXT_TERMIOS_H''@|$(NEXT_TERMIOS_H)|g' \ + -e 's/@''GNULIB_TCGETSID''@/$(GL_GNULIB_TCGETSID)/g' \ + -e 's|@''HAVE_DECL_TCGETSID''@|$(HAVE_DECL_TCGETSID)|g' \ + -e 's|@''HAVE_TERMIOS_H''@|$(HAVE_TERMIOS_H)|g' \ + -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \ + -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \ + $(srcdir)/termios.in.h > $@-t + $(AM_V_at)mv $@-t $@ + # We need the following in order to create <time.h> when the system # doesn't have one that works with the given compiler. time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H) diff --git a/gl/lib/alloca.c b/gl/lib/alloca.c index 48802832..5eb16a9f 100644 --- a/gl/lib/alloca.c +++ b/gl/lib/alloca.c @@ -30,17 +30,6 @@ #include <string.h> #include <stdlib.h> -#ifdef emacs -# include "lisp.h" -# include "blockinput.h" -# ifdef EMACS_FREE -# undef free -# define free EMACS_FREE -# endif -#else -# define memory_full() abort () -#endif - /* If compiling with GCC or clang, this file is not needed. */ #if !(defined __GNUC__ || defined __clang__) @@ -48,22 +37,6 @@ there must be some other way alloca is supposed to work. */ # ifndef alloca -# ifdef emacs -# ifdef static -/* actually, only want this if static is defined as "" - -- this is for usg, in which emacs must undefine static - in order to make unexec workable - */ -# ifndef STACK_DIRECTION -you -lose --- must know STACK_DIRECTION at compile-time -/* Using #error here is not wise since this file should work for - old and obscure compilers. */ -# endif /* STACK_DIRECTION undefined */ -# endif /* static */ -# endif /* emacs */ - /* Define STACK_DIRECTION if you know the direction of stack growth for your system; otherwise it will be automatically deduced at run-time. @@ -145,10 +118,6 @@ alloca (size_t size) { register header *hp; /* Traverses linked list. */ -# ifdef emacs - BLOCK_INPUT; -# endif - for (hp = last_alloca_header; hp != NULL;) if ((STACK_DIR > 0 && hp->h.deep > depth) || (STACK_DIR < 0 && hp->h.deep < depth)) @@ -163,10 +132,6 @@ alloca (size_t size) break; /* Rest are not deeper. */ last_alloca_header = hp; /* -> last valid storage. */ - -# ifdef emacs - UNBLOCK_INPUT; -# endif } if (size == 0) diff --git a/gl/lib/cdefs.h b/gl/lib/cdefs.h index cb251450..7b8ed5b3 100644 --- a/gl/lib/cdefs.h +++ b/gl/lib/cdefs.h @@ -164,13 +164,13 @@ || (__builtin_constant_p (__l) && (__l) > 0)) /* Length is known to be safe at compile time if the __L * __S <= __OBJSZ - condition can be folded to a constant and if it is true. The -1 check is - redundant because since it implies that __glibc_safe_len_cond is true. */ + condition can be folded to a constant and if it is true, or unknown (-1) */ #define __glibc_safe_or_unknown_len(__l, __s, __osz) \ - (__glibc_unsigned_or_positive (__l) \ - && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \ - __s, __osz)) \ - && __glibc_safe_len_cond ((__SIZE_TYPE__) (__l), __s, __osz)) + ((__osz) == (__SIZE_TYPE__) -1 \ + || (__glibc_unsigned_or_positive (__l) \ + && __builtin_constant_p (__glibc_safe_len_cond ((__SIZE_TYPE__) (__l), \ + (__s), (__osz))) \ + && __glibc_safe_len_cond ((__SIZE_TYPE__) (__l), (__s), (__osz)))) /* Conversely, we know at compile time that the length is unsafe if the __L * __S <= __OBJSZ condition can be folded to a constant and if it is diff --git a/gl/lib/fcntl.in.h b/gl/lib/fcntl.in.h index 3e0c302a..9270ced8 100644 --- a/gl/lib/fcntl.in.h +++ b/gl/lib/fcntl.in.h @@ -435,6 +435,10 @@ _GL_WARN_ON_USE (openat, "openat is not portable - " # define AT_EACCESS 4 #endif +/* Ignore this flag if not supported. */ +#ifndef AT_NO_AUTOMOUNT +# define AT_NO_AUTOMOUNT 0 +#endif #endif /* _@GUARD_PREFIX@_FCNTL_H */ #endif /* _@GUARD_PREFIX@_FCNTL_H */ diff --git a/gl/lib/glob.c b/gl/lib/glob.c index f8d8a306..57cb3bd1 100644 --- a/gl/lib/glob.c +++ b/gl/lib/glob.c @@ -28,6 +28,7 @@ #include <glob.h> #include <errno.h> +#include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> #include <stdbool.h> @@ -56,6 +57,8 @@ # define sysconf(id) __sysconf (id) # define closedir(dir) __closedir (dir) # define opendir(name) __opendir (name) +# undef dirfd +# define dirfd(str) __dirfd (str) # define readdir(str) __readdir64 (str) # define getpwnam_r(name, bufp, buf, len, res) \ __getpwnam_r (name, bufp, buf, len, res) @@ -69,11 +72,8 @@ # ifndef GLOB_LSTAT # define GLOB_LSTAT gl_lstat # endif -# ifndef GLOB_STAT64 -# define GLOB_STAT64 __stat64 -# endif -# ifndef GLOB_LSTAT64 -# define GLOB_LSTAT64 __lstat64 +# ifndef GLOB_FSTATAT64 +# define GLOB_FSTATAT64 __fstatat64 # endif # include <shlib-compat.h> #else /* !_LIBC */ @@ -88,8 +88,7 @@ # define struct_stat struct stat # define struct_stat64 struct stat # define GLOB_LSTAT gl_lstat -# define GLOB_STAT64 stat -# define GLOB_LSTAT64 lstat +# define GLOB_FSTATAT64 fstatat #endif /* _LIBC */ #include <fnmatch.h> @@ -215,7 +214,8 @@ glob_lstat (glob_t *pglob, int flags, const char *fullname) } ust; return (__glibc_unlikely (flags & GLOB_ALTDIRFUNC) ? pglob->GLOB_LSTAT (fullname, &ust.st) - : GLOB_LSTAT64 (fullname, &ust.st64)); + : GLOB_FSTATAT64 (AT_FDCWD, fullname, &ust.st64, + AT_SYMLINK_NOFOLLOW)); } /* Set *R = A + B. Return true if the answer is mathematically @@ -257,7 +257,8 @@ is_dir (char const *filename, int flags, glob_t const *pglob) struct_stat64 st64; return (__glibc_unlikely (flags & GLOB_ALTDIRFUNC) ? pglob->gl_stat (filename, &st) == 0 && S_ISDIR (st.st_mode) - : GLOB_STAT64 (filename, &st64) == 0 && S_ISDIR (st64.st_mode)); + : (GLOB_FSTATAT64 (AT_FDCWD, filename, &st64, 0) == 0 + && S_ISDIR (st64.st_mode))); } /* Find the end of the sub-pattern in a brace expression. */ @@ -1283,6 +1284,8 @@ glob_in_dir (const char *pattern, const char *directory, int flags, { size_t dirlen = strlen (directory); void *stream = NULL; + struct scratch_buffer s; + scratch_buffer_init (&s); # define GLOBNAMES_MEMBERS(nnames) \ struct globnames *next; size_t count; char *name[nnames]; struct globnames { GLOBNAMES_MEMBERS (FLEXIBLE_ARRAY_MEMBER) }; @@ -1354,6 +1357,8 @@ glob_in_dir (const char *pattern, const char *directory, int flags, } else { + DIR *dirp = stream; + int dfd = dirfd (dirp); int fnm_flags = ((!(flags & GLOB_PERIOD) ? FNM_PERIOD : 0) | ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)); flags |= GLOB_MAGCHAR; @@ -1381,8 +1386,32 @@ glob_in_dir (const char *pattern, const char *directory, int flags, if (flags & GLOB_ONLYDIR) switch (readdir_result_type (d)) { - case DT_DIR: case DT_LNK: case DT_UNKNOWN: break; default: continue; + case DT_DIR: break; + case DT_LNK: case DT_UNKNOWN: + /* The filesystem was too lazy to give us a hint, + so we have to do it the hard way. */ + if (__glibc_unlikely (dfd < 0 || flags & GLOB_ALTDIRFUNC)) + { + size_t namelen = strlen (d.name); + size_t need = dirlen + 1 + namelen + 1; + if (s.length < need + && !scratch_buffer_set_array_size (&s, need, 1)) + goto memory_error; + char *p = mempcpy (s.data, directory, dirlen); + *p = '/'; + p += p[-1] != '/'; + memcpy (p, d.name, namelen + 1); + if (! is_dir (s.data, flags, pglob)) + continue; + } + else + { + struct_stat64 st64; + if (! (GLOB_FSTATAT64 (dfd, d.name, &st64, 0) == 0 + && S_ISDIR (st64.st_mode))) + continue; + } } if (fnmatch (pattern, d.name, fnm_flags) == 0) @@ -1514,5 +1543,6 @@ glob_in_dir (const char *pattern, const char *directory, int flags, __set_errno (save); } + scratch_buffer_free (&s); return result; } diff --git a/gl/lib/lchown.c b/gl/lib/lchown.c index 105c2d99..8b0d871a 100644 --- a/gl/lib/lchown.c +++ b/gl/lib/lchown.c @@ -45,9 +45,9 @@ lchown (const char *file, uid_t uid, gid_t gid) { # if HAVE_CHOWN # if ! CHOWN_MODIFIES_SYMLINK - struct stat stats; + char readlink_buf[1]; - if (lstat (file, &stats) == 0 && S_ISLNK (stats.st_mode)) + if (0 <= readlink (file, readlink_buf, sizeof readlink_buf)) { errno = EOPNOTSUPP; return -1; diff --git a/gl/lib/libc-config.h b/gl/lib/libc-config.h index 8fec4893..a56665b1 100644 --- a/gl/lib/libc-config.h +++ b/gl/lib/libc-config.h @@ -121,6 +121,7 @@ # undef __attr_dealloc # undef __attr_dealloc_free # undef __attribute__ +# undef __attribute_alloc_align__ # undef __attribute_alloc_size__ # undef __attribute_artificial__ # undef __attribute_const__ @@ -129,6 +130,7 @@ # undef __attribute_format_arg__ # undef __attribute_format_strfmon__ # undef __attribute_malloc__ +# undef __attribute_maybe_unused__ # undef __attribute_noinline__ # undef __attribute_nonstring__ # undef __attribute_pure__ @@ -142,16 +144,24 @@ # undef __extern_always_inline # undef __extern_inline # undef __flexarr +# undef __fortified_attr_access # undef __fortify_function # undef __glibc_c99_flexarr_available +# undef __glibc_fortify +# undef __glibc_fortify_n # undef __glibc_has_attribute # undef __glibc_has_builtin # undef __glibc_has_extension +# undef __glibc_likely # undef __glibc_macro_warning # undef __glibc_macro_warning1 # undef __glibc_objsize # undef __glibc_objsize0 +# undef __glibc_safe_len_cond +# undef __glibc_safe_or_unknown_len # undef __glibc_unlikely +# undef __glibc_unsafe_len +# undef __glibc_unsigned_or_positive # undef __inline # undef __ptr_t # undef __restrict @@ -159,6 +169,7 @@ # undef __va_arg_pack # undef __va_arg_pack_len # undef __warnattr +# undef __wur /* Include our copy of glibc <sys/cdefs.h>. */ # include <cdefs.h> diff --git a/gl/lib/openat.h b/gl/lib/openat.h index 5c8ff90b..56919ef8 100644 --- a/gl/lib/openat.h +++ b/gl/lib/openat.h @@ -98,12 +98,14 @@ lchmodat (int fd, char const *file, mode_t mode) # define STATAT_INLINE _GL_INLINE # endif +_GL_ATTRIBUTE_DEPRECATED STATAT_INLINE int statat (int fd, char const *name, struct stat *st) { return fstatat (fd, name, st, 0); } +_GL_ATTRIBUTE_DEPRECATED STATAT_INLINE int lstatat (int fd, char const *name, struct stat *st) { diff --git a/gl/lib/readlinkat.c b/gl/lib/readlinkat.c new file mode 100644 index 00000000..ab45e140 --- /dev/null +++ b/gl/lib/readlinkat.c @@ -0,0 +1,113 @@ +/* Read a symlink relative to an open directory. + Copyright (C) 2009-2022 Free Software Foundation, Inc. + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +/* written by Eric Blake */ + +#include <config.h> + +/* Specification. */ +#include <unistd.h> + +#include <errno.h> +#include <stdlib.h> +#include <string.h> +#include <sys/stat.h> + +#if HAVE_READLINKAT + +# undef fstatat +# undef readlinkat + +ssize_t +rpl_readlinkat (int fd, char const *file, char *buf, size_t bufsize) +{ +# if READLINK_TRAILING_SLASH_BUG + size_t file_len = strlen (file); + if (file_len && file[file_len - 1] == '/') + { + /* Even if FILE without the slash is a symlink to a directory, + both lstat() and stat() must resolve the trailing slash to + the directory rather than the symlink. We can therefore + safely use fstatat(..., 0) to distinguish between EINVAL and + ENOTDIR/ENOENT, avoiding extra overhead of rpl_fstatat(). */ + struct stat st; + if (fstatat (fd, file, &st, 0) == 0 || errno == EOVERFLOW) + errno = EINVAL; + return -1; + } +# endif /* READLINK_TRAILING_SLASH_BUG */ + + ssize_t r = readlinkat (fd, file, buf, bufsize); + +# if READLINK_TRUNCATE_BUG + if (r < 0 && errno == ERANGE) + { + /* Try again with a bigger buffer. This is just for test cases; + real code invariably discards short reads. */ + char stackbuf[4032]; + r = readlinkat (fd, file, stackbuf, sizeof stackbuf); + if (r < 0) + { + if (errno == ERANGE) + { + /* Clear the buffer, which is good enough for real code. + Thankfully, no test cases try short reads of enormous + symlinks and what would be the point anyway? */ + r = bufsize; + memset (buf, 0, r); + } + } + else + { + if (bufsize < r) + r = bufsize; + memcpy (buf, stackbuf, r); + } + } +# endif + + return r; +} + +#else + +/* Gnulib provides a readlink stub for mingw; use it for distinction + between EINVAL and ENOENT, rather than always failing with ENOSYS. */ + +/* POSIX 2008 says that unlike readlink, readlinkat returns 0 for + success instead of the buffer length. But this would render + readlinkat worthless since readlink does not guarantee a + NUL-terminated buffer. Assume this was a bug in POSIX. */ + +/* Read the contents of symlink FILE into buffer BUF of size BUFSIZE, in the + directory open on descriptor FD. If possible, do it without changing + the working directory. Otherwise, resort to using save_cwd/fchdir, + then readlink/restore_cwd. If either the save_cwd or the restore_cwd + fails, then give a diagnostic and exit nonzero. */ + +# define AT_FUNC_NAME readlinkat +# define AT_FUNC_F1 readlink +# define AT_FUNC_POST_FILE_PARAM_DECLS , char *buf, size_t bufsize +# define AT_FUNC_POST_FILE_ARGS , buf, bufsize +# define AT_FUNC_RESULT ssize_t +# include "at-func.c" +# undef AT_FUNC_NAME +# undef AT_FUNC_F1 +# undef AT_FUNC_POST_FILE_PARAM_DECLS +# undef AT_FUNC_POST_FILE_ARGS +# undef AT_FUNC_RESULT + +#endif diff --git a/gl/lib/regcomp.c b/gl/lib/regcomp.c index b607c853..122c3de5 100644 --- a/gl/lib/regcomp.c +++ b/gl/lib/regcomp.c @@ -2038,15 +2038,25 @@ peek_token_bracket (re_token_t *token, re_string_t *input, reg_syntax_t syntax) } switch (c) { - case '-': - token->type = OP_CHARSET_RANGE; - break; case ']': token->type = OP_CLOSE_BRACKET; break; case '^': token->type = OP_NON_MATCH_LIST; break; + case '-': + /* In V7 Unix grep and Unix awk and mawk, [...---...] + (3 adjacent minus signs) stands for a single minus sign. + Support that without breaking anything else. */ + if (! (re_string_cur_idx (input) + 2 < re_string_length (input) + && re_string_peek_byte (input, 1) == '-' + && re_string_peek_byte (input, 2) == '-')) + { + token->type = OP_CHARSET_RANGE; + break; + } + re_string_skip_bytes (input, 2); + FALLTHROUGH; default: token->type = CHARACTER; } diff --git a/gl/lib/regex_internal.c b/gl/lib/regex_internal.c index 3945ee7e..0e6919f3 100644 --- a/gl/lib/regex_internal.c +++ b/gl/lib/regex_internal.c @@ -1396,24 +1396,22 @@ re_dfa_add_node (re_dfa_t *dfa, re_token_t token) if (__glibc_unlikely (new_nodes == NULL)) return -1; dfa->nodes = new_nodes; + dfa->nodes_alloc = new_nodes_alloc; new_nexts = re_realloc (dfa->nexts, Idx, new_nodes_alloc); + if (new_nexts != NULL) + dfa->nexts = new_nexts; new_indices = re_realloc (dfa->org_indices, Idx, new_nodes_alloc); + if (new_indices != NULL) + dfa->org_indices = new_indices; new_edests = re_realloc (dfa->edests, re_node_set, new_nodes_alloc); + if (new_edests != NULL) + dfa->edests = new_edests; new_eclosures = re_realloc (dfa->eclosures, re_node_set, new_nodes_alloc); + if (new_eclosures != NULL) + dfa->eclosures = new_eclosures; if (__glibc_unlikely (new_nexts == NULL || new_indices == NULL || new_edests == NULL || new_eclosures == NULL)) - { - re_free (new_nexts); - re_free (new_indices); - re_free (new_edests); - re_free (new_eclosures); - return -1; - } - dfa->nexts = new_nexts; - dfa->org_indices = new_indices; - dfa->edests = new_edests; - dfa->eclosures = new_eclosures; - dfa->nodes_alloc = new_nodes_alloc; + return -1; } dfa->nodes[dfa->nodes_len] = token; dfa->nodes[dfa->nodes_len].constraint = 0; diff --git a/gl/lib/regexec.c b/gl/lib/regexec.c index aea1e7da..521cb028 100644 --- a/gl/lib/regexec.c +++ b/gl/lib/regexec.c @@ -1308,8 +1308,8 @@ push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node, re_node_set *eps_via_nodes) { reg_errcode_t err; - Idx num = fs->num++; - if (fs->num == fs->alloc) + Idx num = fs->num; + if (num == fs->alloc) { struct re_fail_stack_ent_t *new_array; new_array = re_realloc (fs->stack, struct re_fail_stack_ent_t, @@ -1324,6 +1324,7 @@ push_fail_stack (struct re_fail_stack_t *fs, Idx str_idx, Idx dest_node, fs->stack[num].regs = re_malloc (regmatch_t, 2 * nregs); if (fs->stack[num].regs == NULL) return REG_ESPACE; + fs->num = num + 1; memcpy (fs->stack[num].regs, regs, sizeof (regmatch_t) * nregs); memcpy (fs->stack[num].regs + nregs, prevregs, sizeof (regmatch_t) * nregs); err = re_node_set_init_copy (&fs->stack[num].eps_via_nodes, eps_via_nodes); diff --git a/gl/lib/renameatu.c b/gl/lib/renameatu.c index 0eb33ab6..7ba186ca 100644 --- a/gl/lib/renameatu.c +++ b/gl/lib/renameatu.c @@ -133,12 +133,13 @@ renameatu (int fd1, char const *src, int fd2, char const *dst, break; case RENAME_NOREPLACE: - /* This has a race between the call to lstatat and the calls to - renameat below. This lstatat is needed even if RENAME_EXCL + /* This has a race between the call to fstatat and the calls to + renameat below. This fstatat is needed even if RENAME_EXCL is defined, because RENAME_EXCL is buggy on macOS 11.2: renameatx_np (fd, "X", fd, "X", RENAME_EXCL) incorrectly succeeds when X exists. */ - if (lstatat (fd2, dst, &dst_st) == 0 || errno == EOVERFLOW) + if (fstatat (fd2, dst, &dst_st, AT_SYMLINK_NOFOLLOW) == 0 + || errno == EOVERFLOW) return errno_fail (EEXIST); if (errno != ENOENT) return -1; @@ -164,14 +165,14 @@ renameatu (int fd1, char const *src, int fd2, char const *dst, the source does not exist, or if the destination cannot be turned into a directory, give up now. Otherwise, strip trailing slashes before calling rename. */ - if (lstatat (fd1, src, &src_st)) + if (fstatat (fd1, src, &src_st, AT_SYMLINK_NOFOLLOW)) return -1; if (dst_found_nonexistent) { if (!S_ISDIR (src_st.st_mode)) return errno_fail (ENOENT); } - else if (lstatat (fd2, dst, &dst_st)) + else if (fstatat (fd2, dst, &dst_st, AT_SYMLINK_NOFOLLOW)) { if (errno != ENOENT || !S_ISDIR (src_st.st_mode)) return -1; @@ -196,7 +197,7 @@ renameatu (int fd1, char const *src, int fd2, char const *dst, goto out; } strip_trailing_slashes (src_temp); - if (lstatat (fd1, src_temp, &src_st)) + if (fstatat (fd1, src_temp, &src_st, AT_SYMLINK_NOFOLLOW)) { rename_errno = errno; goto out; @@ -213,15 +214,16 @@ renameatu (int fd1, char const *src, int fd2, char const *dst, goto out; } strip_trailing_slashes (dst_temp); - if (lstatat (fd2, dst_temp, &dst_st)) + char readlink_buf[1]; + if (readlinkat (fd2, dst_temp, readlink_buf, sizeof readlink_buf) < 0) { - if (errno != ENOENT) + if (errno != ENOENT && errno != EINVAL) { rename_errno = errno; goto out; } } - else if (S_ISLNK (dst_st.st_mode)) + else goto out; } # endif /* RENAME_TRAILING_SLASH_SOURCE_BUG */ diff --git a/gl/lib/statat.c b/gl/lib/statat.c deleted file mode 100644 index bf96d3b4..00000000 --- a/gl/lib/statat.c +++ /dev/null @@ -1,21 +0,0 @@ -/* Return info about a file at a directory. - - Copyright (C) 2012-2022 Free Software Foundation, Inc. - - This file is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation, either version 3 of the License, - or (at your option) any later version. - - This file is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. */ - -#include <config.h> - -#define STATAT_INLINE _GL_EXTERN_INLINE -#include "openat.h" diff --git a/gl/lib/stdlib.in.h b/gl/lib/stdlib.in.h index d52c2f79..a86643c3 100644 --- a/gl/lib/stdlib.in.h +++ b/gl/lib/stdlib.in.h @@ -184,7 +184,11 @@ _GL_WARN_ON_USE (_Exit, "_Exit is unportable - " # undef free # define free rpl_free # endif +# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) +_GL_FUNCDECL_RPL (free, void, (void *ptr) throw ()); +# else _GL_FUNCDECL_RPL (free, void, (void *ptr)); +# endif _GL_CXXALIAS_RPL (free, void, (void *ptr)); # else _GL_CXXALIAS_SYS (free, void, (void *ptr)); diff --git a/gl/lib/stpcpy.c b/gl/lib/stpcpy.c new file mode 100644 index 00000000..434f84ae --- /dev/null +++ b/gl/lib/stpcpy.c @@ -0,0 +1,49 @@ +/* stpcpy.c -- copy a string and return pointer to end of new string + Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2022 Free Software + Foundation, Inc. + + NOTE: The canonical source of this file is maintained with the GNU C Library. + Bugs can be reported to bug-glibc@prep.ai.mit.edu. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#include <config.h> + +#include <string.h> + +#undef __stpcpy +#ifdef _LIBC +# undef stpcpy +#endif + +#ifndef weak_alias +# define __stpcpy stpcpy +#endif + +/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */ +char * +__stpcpy (char *dest, const char *src) +{ + register char *d = dest; + register const char *s = src; + + do + *d++ = *s; + while (*s++ != '\0'); + + return d - 1; +} +#ifdef weak_alias +weak_alias (__stpcpy, stpcpy) +#endif diff --git a/gl/lib/str-two-way.h b/gl/lib/str-two-way.h index 7ee344ae..b00017c0 100644 --- a/gl/lib/str-two-way.h +++ b/gl/lib/str-two-way.h @@ -231,7 +231,7 @@ critical_factorization (const unsigned char *needle, size_t needle_len, most 2 * HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching. If AVAILABLE modifies HAYSTACK_LEN (as in strstr), then at most 3 * HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching. */ -static RETURN_TYPE +static RETURN_TYPE _GL_ATTRIBUTE_PURE two_way_short_needle (const unsigned char *haystack, size_t haystack_len, const unsigned char *needle, size_t needle_len) { @@ -325,7 +325,7 @@ two_way_short_needle (const unsigned char *haystack, size_t haystack_len, If AVAILABLE modifies HAYSTACK_LEN (as in strstr), then at most 3 * HAYSTACK_LEN - NEEDLE_LEN comparisons occur in searching, and sublinear performance is not possible. */ -static RETURN_TYPE +static RETURN_TYPE _GL_ATTRIBUTE_PURE two_way_long_needle (const unsigned char *haystack, size_t haystack_len, const unsigned char *needle, size_t needle_len) { diff --git a/gl/lib/string.in.h b/gl/lib/string.in.h index c9432948..3996da9f 100644 --- a/gl/lib/string.in.h +++ b/gl/lib/string.in.h @@ -122,17 +122,33 @@ _GL_EXTERN_C void rpl_free (void *); # undef _GL_ATTRIBUTE_DEALLOC_FREE # define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1) # else -# if defined _MSC_VER -_GL_EXTERN_C void __cdecl free (void *); +# if defined _MSC_VER && !defined free +_GL_EXTERN_C +# if defined _DLL + __declspec (dllimport) +# endif + void __cdecl free (void *); # else +# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) +_GL_EXTERN_C void free (void *) throw (); +# else _GL_EXTERN_C void free (void *); +# endif # endif # endif #else -# if defined _MSC_VER -_GL_EXTERN_C void __cdecl free (void *); +# if defined _MSC_VER && !defined free +_GL_EXTERN_C +# if defined _DLL + __declspec (dllimport) +# endif + void __cdecl free (void *); # else +# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) +_GL_EXTERN_C void free (void *) throw (); +# else _GL_EXTERN_C void free (void *); +# endif # endif #endif @@ -230,10 +246,11 @@ _GL_CXXALIAS_SYS_CAST2 (memchr, void const *, (void const *__s, int __c, size_t __n)); # endif # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) -_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n)); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ + || defined __clang__) +_GL_CXXALIASWARN1 (memchr, void *, (void *__s, int __c, size_t __n) throw ()); _GL_CXXALIASWARN1 (memchr, void const *, - (void const *__s, int __c, size_t __n)); + (void const *__s, int __c, size_t __n) throw ()); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (memchr); # endif @@ -315,9 +332,10 @@ _GL_CXXALIAS_SYS_CAST2 (memrchr, void *, (void const *, int, size_t), void const *, (void const *, int, size_t)); # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) -_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t)); -_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t)); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ + || defined __clang__) +_GL_CXXALIASWARN1 (memrchr, void *, (void *, int, size_t) throw ()); +_GL_CXXALIASWARN1 (memrchr, void const *, (void const *, int, size_t) throw ()); # else _GL_CXXALIASWARN (memrchr); # endif @@ -345,9 +363,11 @@ _GL_CXXALIAS_SYS_CAST2 (rawmemchr, void *, (void const *__s, int __c_in), void const *, (void const *__s, int __c_in)); # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) -_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in)); -_GL_CXXALIASWARN1 (rawmemchr, void const *, (void const *__s, int __c_in)); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ + || defined __clang__) +_GL_CXXALIASWARN1 (rawmemchr, void *, (void *__s, int __c_in) throw ()); +_GL_CXXALIASWARN1 (rawmemchr, void const *, + (void const *__s, int __c_in) throw ()); # else _GL_CXXALIASWARN (rawmemchr); # endif @@ -449,9 +469,11 @@ _GL_CXXALIAS_SYS_CAST2 (strchrnul, char const *, (char const *__s, int __c_in)); # endif # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) -_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in)); -_GL_CXXALIASWARN1 (strchrnul, char const *, (char const *__s, int __c_in)); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ + || defined __clang__) +_GL_CXXALIASWARN1 (strchrnul, char *, (char *__s, int __c_in) throw ()); +_GL_CXXALIASWARN1 (strchrnul, char const *, + (char const *__s, int __c_in) throw ()); # else _GL_CXXALIASWARN (strchrnul); # endif @@ -569,7 +591,7 @@ _GL_FUNCDECL_RPL (strndup, char *, _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE); _GL_CXXALIAS_RPL (strndup, char *, (char const *__s, size_t __n)); # else -# if !@HAVE_DECL_STRNDUP@ || __GNUC__ >= 11 +# if !@HAVE_DECL_STRNDUP@ || (__GNUC__ >= 11 && !defined strndup) _GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n) _GL_ARG_NONNULL ((1)) @@ -579,7 +601,7 @@ _GL_CXXALIAS_SYS (strndup, char *, (char const *__s, size_t __n)); # endif _GL_CXXALIASWARN (strndup); #else -# if __GNUC__ >= 11 +# if __GNUC__ >= 11 && !defined strndup /* For -Wmismatched-dealloc: Associate strndup with free or rpl_free. */ _GL_FUNCDECL_SYS (strndup, char *, (char const *__s, size_t __n) @@ -651,10 +673,11 @@ _GL_CXXALIAS_SYS_CAST2 (strpbrk, char *, (char const *__s, char const *__accept), const char *, (char const *__s, char const *__accept)); # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) -_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept)); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ + || defined __clang__) +_GL_CXXALIASWARN1 (strpbrk, char *, (char *__s, char const *__accept) throw ()); _GL_CXXALIASWARN1 (strpbrk, char const *, - (char const *__s, char const *__accept)); + (char const *__s, char const *__accept) throw ()); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strpbrk); # endif @@ -759,10 +782,12 @@ _GL_CXXALIAS_SYS_CAST2 (strstr, const char *, (const char *haystack, const char *needle)); # endif # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) -_GL_CXXALIASWARN1 (strstr, char *, (char *haystack, const char *needle)); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ + || defined __clang__) +_GL_CXXALIASWARN1 (strstr, char *, + (char *haystack, const char *needle) throw ()); _GL_CXXALIASWARN1 (strstr, const char *, - (const char *haystack, const char *needle)); + (const char *haystack, const char *needle) throw ()); # elif __GLIBC__ >= 2 _GL_CXXALIASWARN (strstr); # endif @@ -808,10 +833,12 @@ _GL_CXXALIAS_SYS_CAST2 (strcasestr, const char *, (const char *haystack, const char *needle)); # endif # if ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 10) && !defined __UCLIBC__) \ - && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) -_GL_CXXALIASWARN1 (strcasestr, char *, (char *haystack, const char *needle)); + && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) \ + || defined __clang__) +_GL_CXXALIASWARN1 (strcasestr, char *, + (char *haystack, const char *needle) throw ()); _GL_CXXALIASWARN1 (strcasestr, const char *, - (const char *haystack, const char *needle)); + (const char *haystack, const char *needle) throw ()); # else _GL_CXXALIASWARN (strcasestr); # endif diff --git a/gl/lib/sys_stat.in.h b/gl/lib/sys_stat.in.h index 28ddd42f..714c3cb1 100644 --- a/gl/lib/sys_stat.in.h +++ b/gl/lib/sys_stat.in.h @@ -391,7 +391,33 @@ struct stat #endif -#if @GNULIB_MDA_CHMOD@ +#if @GNULIB_CHMOD@ +# if @REPLACE_CHMOD@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef chmod +# define chmod rpl_chmod +# endif +_GL_FUNCDECL_RPL (chmod, int, (const char *filename, mode_t mode) + _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (chmod, int, (const char *filename, mode_t mode)); +# elif defined _WIN32 && !defined __CYGWIN__ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef chmod +# define chmod _chmod +# endif +/* Need to cast, because in mingw the last argument is 'int mode'. */ +_GL_CXXALIAS_MDA_CAST (chmod, int, (const char *filename, mode_t mode)); +# else +_GL_CXXALIAS_SYS (chmod, int, (const char *filename, mode_t mode)); +# endif +_GL_CXXALIASWARN (chmod); +#elif defined GNULIB_POSIXCHECK +# undef chmod +# if HAVE_RAW_DECL_CHMOD +_GL_WARN_ON_USE (chmod, "chmod has portability problems - " + "use gnulib module chmod for portability"); +# endif +#elif @GNULIB_MDA_CHMOD@ /* On native Windows, map 'chmod' to '_chmod', so that -loldnames is not required. In C++ with GNULIB_NAMESPACE, avoid differences between platforms by defining GNULIB_NAMESPACE::chmod always. */ diff --git a/gl/lib/termios.in.h b/gl/lib/termios.in.h new file mode 100644 index 00000000..32b7c5b3 --- /dev/null +++ b/gl/lib/termios.in.h @@ -0,0 +1,73 @@ +/* Substitute for and wrapper around <termios.h>. + Copyright (C) 2010-2022 Free Software Foundation, Inc. + + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. */ + +#ifndef _@GUARD_PREFIX@_TERMIOS_H + +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif +@PRAGMA_COLUMNS@ + +/* On HP-UX 11.00, some of the function declarations in <sys/termio.h>, + included by <termios.h>, are not protected by extern "C". Enforce + "C" linkage for these functions nevertheless. */ +#if defined __hpux && defined __cplusplus +# include <sys/types.h> +# include <sys/ioctl.h> +extern "C" { +# include <sys/termio.h> +} +#endif + +/* The include_next requires a split double-inclusion guard. */ +#if @HAVE_TERMIOS_H@ +# @INCLUDE_NEXT@ @NEXT_TERMIOS_H@ +#endif + +#ifndef _@GUARD_PREFIX@_TERMIOS_H +#define _@GUARD_PREFIX@_TERMIOS_H + +/* Get pid_t. */ +#include <sys/types.h> + +/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ + +/* The definition of _GL_WARN_ON_USE is copied here. */ + + +/* Declare overridden functions. */ + +#if @GNULIB_TCGETSID@ +/* Return the session ID of the controlling terminal of the current process. + The argument is a descriptor if this controlling terminal. + Return -1, with errno set, upon failure. errno = ENOSYS means that the + function is unsupported. */ +# if !@HAVE_DECL_TCGETSID@ +_GL_FUNCDECL_SYS (tcgetsid, pid_t, (int fd)); +# endif +_GL_CXXALIAS_SYS (tcgetsid, pid_t, (int fd)); +_GL_CXXALIASWARN (tcgetsid); +#elif defined GNULIB_POSIXCHECK +# undef tcgetsid +# if HAVE_RAW_DECL_TCGETSID +_GL_WARN_ON_USE (tcgetsid, "tcgetsid is not portable - " + "use gnulib module tcgetsid for portability"); +# endif +#endif + + +#endif /* _@GUARD_PREFIX@_TERMIOS_H */ +#endif /* _@GUARD_PREFIX@_TERMIOS_H */ diff --git a/gl/lib/unlinkat.c b/gl/lib/unlinkat.c index eae60074..c9ff3ab2 100644 --- a/gl/lib/unlinkat.c +++ b/gl/lib/unlinkat.c @@ -58,7 +58,7 @@ rpl_unlinkat (int fd, char const *name, int flag) rule of letting unlink("link-to-dir/") attempt to unlink a directory. */ struct stat st; - result = lstatat (fd, name, &st); + result = fstatat (fd, name, &st, AT_SYMLINK_NOFOLLOW); if (result == 0 || errno == EOVERFLOW) { /* Trailing NUL will overwrite the trailing slash. */ @@ -71,7 +71,8 @@ rpl_unlinkat (int fd, char const *name, int flag) memcpy (short_name, name, len); while (len && ISSLASH (short_name[len - 1])) short_name[--len] = '\0'; - if (len && (lstatat (fd, short_name, &st) || S_ISLNK (st.st_mode))) + if (len && (fstatat (fd, short_name, &st, AT_SYMLINK_NOFOLLOW) + || S_ISLNK (st.st_mode))) { free (short_name); errno = EPERM; diff --git a/gl/lib/vasnprintf.c b/gl/lib/vasnprintf.c index 48574524..285c674b 100644 --- a/gl/lib/vasnprintf.c +++ b/gl/lib/vasnprintf.c @@ -915,8 +915,7 @@ divide (mpn_t a, mpn_t b, mpn_t *q) q_ptr[q_len++] = 1; } keep_q: - if (tmp_roomptr != NULL) - free (tmp_roomptr); + free (tmp_roomptr); q->limbs = q_ptr; q->nlimbs = q_len; return roomptr; @@ -1873,11 +1872,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, free (a.arg); if (PRINTF_FETCHARGS (args, &a) < 0) - { - CLEANUP (); - errno = EINVAL; - return NULL; - } + goto fail_1_with_EINVAL; { size_t buf_neededlength; @@ -1913,19 +1908,12 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, buf_malloced = buf; } - if (resultbuf != NULL) - { - result = resultbuf; - allocated = *lengthp; - } - else - { - result = NULL; - allocated = 0; - } + result = resultbuf; + allocated = (resultbuf != NULL ? *lengthp : 0); length = 0; /* Invariants: - result is either == resultbuf or == NULL or malloc-allocated. + result is either == resultbuf or malloc-allocated. + If result == NULL, resultbuf is == NULL as well. If length > 0, then result != NULL. */ /* Ensures that allocated >= needed. Aborts through a jump to @@ -1942,7 +1930,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, memory_size = xtimes (allocated, sizeof (DCHAR_T)); \ if (size_overflow_p (memory_size)) \ oom_statement \ - if (result == resultbuf || result == NULL) \ + if (result == resultbuf) \ memory = (DCHAR_T *) malloc (memory_size); \ else \ memory = (DCHAR_T *) realloc (result, memory_size); \ @@ -2112,15 +2100,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (count == 0) break; if (count < 0) - { - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - errno = EILSEQ; - return NULL; - } + goto fail_with_EILSEQ; arg_end += count; characters++; } @@ -2137,15 +2117,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (count == 0) break; if (count < 0) - { - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - errno = EILSEQ; - return NULL; - } + goto fail_with_EILSEQ; arg_end += count; characters++; } @@ -2191,14 +2163,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, converted, &converted_len); # endif if (converted == NULL) - { - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - return NULL; - } + goto fail_with_errno; if (converted != result + length) { ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), @@ -2237,15 +2202,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (count == 0) break; if (count < 0) - { - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - errno = EILSEQ; - return NULL; - } + goto fail_with_EILSEQ; arg_end += count; characters++; } @@ -2262,15 +2219,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (count == 0) break; if (count < 0) - { - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - errno = EILSEQ; - return NULL; - } + goto fail_with_EILSEQ; arg_end += count; characters++; } @@ -2316,14 +2265,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, converted, &converted_len); # endif if (converted == NULL) - { - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - return NULL; - } + goto fail_with_errno; if (converted != result + length) { ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), @@ -2362,15 +2304,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (count == 0) break; if (count < 0) - { - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - errno = EILSEQ; - return NULL; - } + goto fail_with_EILSEQ; arg_end += count; characters++; } @@ -2387,15 +2321,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (count == 0) break; if (count < 0) - { - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - errno = EILSEQ; - return NULL; - } + goto fail_with_EILSEQ; arg_end += count; characters++; } @@ -2441,14 +2367,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, converted, &converted_len); # endif if (converted == NULL) - { - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - return NULL; - } + goto fail_with_errno; if (converted != result + length) { ENSURE_ALLOCATION_ELSE (xsum (length, converted_len), @@ -2590,16 +2509,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, /* Found the terminating NUL. */ break; if (count < 0) - { - /* Invalid or incomplete multibyte character. */ - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - errno = EILSEQ; - return NULL; - } + /* Invalid or incomplete multibyte character. */ + goto fail_with_EILSEQ; arg_end += count; characters++; } @@ -2626,16 +2537,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, /* Found the terminating NUL. */ break; if (count < 0) - { - /* Invalid or incomplete multibyte character. */ - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - errno = EILSEQ; - return NULL; - } + /* Invalid or incomplete multibyte character. */ + goto fail_with_EILSEQ; arg_end += count; characters++; } @@ -2752,16 +2655,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, break; count = local_wcrtomb (cbuf, *arg_end, &state); if (count < 0) - { - /* Cannot convert. */ - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - errno = EILSEQ; - return NULL; - } + /* Cannot convert. */ + goto fail_with_EILSEQ; if (precision < (unsigned int) count) break; arg_end++; @@ -2793,16 +2688,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, break; count = local_wcrtomb (cbuf, *arg_end, &state); if (count < 0) - { - /* Cannot convert. */ - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - errno = EILSEQ; - return NULL; - } + /* Cannot convert. */ + goto fail_with_EILSEQ; arg_end++; characters += count; } @@ -2859,12 +2746,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, if (tmpdst == NULL) { free (tmpsrc); - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - return NULL; + goto fail_with_errno; } free (tmpsrc); # endif @@ -2938,16 +2820,8 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, abort (); count = local_wcrtomb (cbuf, *arg, &state); if (count <= 0) - { - /* Cannot convert. */ - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - errno = EILSEQ; - return NULL; - } + /* Cannot convert. */ + goto fail_with_EILSEQ; ENSURE_ALLOCATION (xsum (length, count)); memcpy (result + length, cbuf, count); length += count; @@ -3083,14 +2957,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, NULL, NULL, &tmpdst_len); if (tmpdst == NULL) - { - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - return NULL; - } + goto fail_with_errno; # endif if (has_width) @@ -5463,13 +5330,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, errno = EINVAL; } - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - - return NULL; + goto fail_with_errno; } #if USE_SNPRINTF @@ -5603,14 +5464,7 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, NULL, NULL, &tmpdst_len); if (tmpdst == NULL) - { - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); - return NULL; - } + goto fail_with_errno; ENSURE_ALLOCATION_ELSE (xsum (length, tmpdst_len), { free (tmpdst); goto out_of_memory; }); DCHAR_CPY (result + length, tmpdst, tmpdst_len); @@ -5835,25 +5689,40 @@ VASNPRINTF (DCHAR_T *resultbuf, size_t *lengthp, #if USE_SNPRINTF overflow: - if (!(result == resultbuf || result == NULL)) - free (result); - if (buf_malloced != NULL) - free (buf_malloced); - CLEANUP (); errno = EOVERFLOW; - return NULL; + goto fail_with_errno; #endif out_of_memory: - if (!(result == resultbuf || result == NULL)) + errno = ENOMEM; + goto fail_with_errno; + +#if ENABLE_UNISTDIO || ((!USE_SNPRINTF || !HAVE_SNPRINTF_RETVAL_C99 || USE_MSVC__SNPRINTF || (NEED_PRINTF_DIRECTIVE_LS && !defined IN_LIBINTL) || ENABLE_WCHAR_FALLBACK) && HAVE_WCHAR_T) + fail_with_EILSEQ: + errno = EILSEQ; + goto fail_with_errno; +#endif + + fail_with_errno: + if (result != resultbuf) free (result); if (buf_malloced != NULL) free (buf_malloced); - out_of_memory_1: CLEANUP (); - errno = ENOMEM; return NULL; } + + out_of_memory_1: + errno = ENOMEM; + goto fail_1_with_errno; + + fail_1_with_EINVAL: + errno = EINVAL; + goto fail_1_with_errno; + + fail_1_with_errno: + CLEANUP (); + return NULL; } #undef MAX_ROOM_NEEDED diff --git a/gl/lib/verify.h b/gl/lib/verify.h index 07b2f486..c5c63ae9 100644 --- a/gl/lib/verify.h +++ b/gl/lib/verify.h @@ -34,7 +34,7 @@ #ifndef __cplusplus # if (201112L <= __STDC_VERSION__ \ || (!defined __STRICT_ANSI__ \ - && (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 4 <= __clang_major__))) + && (4 < __GNUC__ + (6 <= __GNUC_MINOR__) || 5 <= __clang_major__))) # define _GL_HAVE__STATIC_ASSERT 1 # endif # if (202000L <= __STDC_VERSION__ \ @@ -215,6 +215,9 @@ template <int w> # define _GL_VERIFY(R, DIAGNOSTIC, ...) \ extern int (*_GL_GENSYM (_gl_verify_function) (void)) \ [_GL_VERIFY_TRUE (R, DIAGNOSTIC)] +# if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) +# pragma GCC diagnostic ignored "-Wnested-externs" +# endif #endif /* _GL_STATIC_ASSERT_H is defined if this code is copied into assert.h. */ diff --git a/gl/lib/wchar.in.h b/gl/lib/wchar.in.h index d7792e5f..835ddbe6 100644 --- a/gl/lib/wchar.in.h +++ b/gl/lib/wchar.in.h @@ -185,17 +185,33 @@ _GL_EXTERN_C void rpl_free (void *); # undef _GL_ATTRIBUTE_DEALLOC_FREE # define _GL_ATTRIBUTE_DEALLOC_FREE _GL_ATTRIBUTE_DEALLOC (rpl_free, 1) # else -# if defined _MSC_VER -_GL_EXTERN_C void __cdecl free (void *); +# if defined _MSC_VER && !defined free +_GL_EXTERN_C +# if defined _DLL + __declspec (dllimport) +# endif + void __cdecl free (void *); # else +# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) +_GL_EXTERN_C void free (void *) throw (); +# else _GL_EXTERN_C void free (void *); +# endif # endif # endif #else -# if defined _MSC_VER -_GL_EXTERN_C void __cdecl free (void *); +# if defined _MSC_VER && !defined free +_GL_EXTERN_C +# if defined _DLL + __declspec (dllimport) +# endif + void __cdecl free (void *); # else +# if defined __cplusplus && (__GLIBC__ + (__GLIBC_MINOR__ >= 14) > 2) +_GL_EXTERN_C void free (void *) throw (); +# else _GL_EXTERN_C void free (void *); +# endif # endif #endif diff --git a/gl/m4/glob.m4 b/gl/m4/glob.m4 index 0d142638..f59b84ff 100644 --- a/gl/m4/glob.m4 +++ b/gl/m4/glob.m4 @@ -1,4 +1,4 @@ -# glob.m4 serial 24 +# glob.m4 serial 26 dnl Copyright (C) 2005-2007, 2009-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -66,6 +66,45 @@ char a[_GNU_GLOB_INTERFACE_VERSION == 1 || _GNU_GLOB_INTERFACE_VERSION == 2 ? 1 esac fi + if test $REPLACE_GLOB = 0; then + AC_CACHE_CHECK([whether glob NOTDIR*/ omits symlink to nondir], + [gl_cv_glob_omit_nondir_symlinks], + [if test $cross_compiling != yes; then + if ln -s conf$$-file conf$$-globtest 2>/dev/null && touch conf$$-file + then + gl_cv_glob_omit_nondir_symlinks=maybe + else + # If we can't make a symlink, then we cannot test this issue. Be + # pessimistic about this. + gl_cv_glob_omit_nondir_symlinks=no + fi + if test $gl_cv_glob_omit_nondir_symlinks = maybe; then + AC_RUN_IFELSE( + [AC_LANG_PROGRAM( + [[#include <stddef.h> + #include <glob.h>]], + [[glob_t found; + if (glob ("conf*-globtest/", 0, NULL, &found) != GLOB_NOMATCH) + return 1; + globfree (&found); + ]])], + [gl_cv_glob_omit_nondir_symlinks=yes], + [gl_cv_glob_omit_nondir_symlinks=no], + [dnl We don't get here. + : + ]) + fi + rm -f conf$$-file conf$$-globtest + else + gl_cv_glob_omit_nondir_symlinks="$gl_cross_guess_normal" + fi + ]) + case "$gl_cv_glob_omit_nondir_symlinks" in + *yes) ;; + *) REPLACE_GLOB=1 ;; + esac + fi + fi if test $ac_cv_func_glob_pattern_p = no; then diff --git a/gl/m4/gnulib-common.m4 b/gl/m4/gnulib-common.m4 index c5ced04f..30911d15 100644 --- a/gl/m4/gnulib-common.m4 +++ b/gl/m4/gnulib-common.m4 @@ -1,4 +1,4 @@ -# gnulib-common.m4 serial 72 +# gnulib-common.m4 serial 73 dnl Copyright (C) 2007-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -106,6 +106,10 @@ AC_DEFUN([gl_COMMON_BODY], [ #endif #ifdef __has_c_attribute +# if ((defined __STDC_VERSION__ ? __STDC_VERSION__ : 0) <= 201710 \ + && _GL_GNUC_PREREQ (4, 6)) +# pragma GCC diagnostic ignored "-Wpedantic" +# endif # define _GL_HAS_C_ATTRIBUTE(attr) __has_c_attribute (__##attr##__) #else # define _GL_HAS_C_ATTRIBUTE(attr) 0 diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4 index 431d879e..55a0a2c1 100644 --- a/gl/m4/gnulib-comp.m4 +++ b/gl/m4/gnulib-comp.m4 @@ -192,6 +192,7 @@ AC_DEFUN([gl_EARLY], # Code from module rbtree-list: # Code from module readdir: # Code from module readlink: + # Code from module readlinkat: # Code from module realloc-gnu: # Code from module realloc-posix: # Code from module reallocarray: @@ -210,6 +211,7 @@ AC_DEFUN([gl_EARLY], # Code from module setlocale-null: # Code from module sigaction: # Code from module signal-h: + # Code from module sigpipe: # Code from module sigprocmask: # Code from module size_max: # Code from module sleep: @@ -223,7 +225,6 @@ AC_DEFUN([gl_EARLY], # Code from module ssize_t: # Code from module stat: # Code from module stat-time: - # Code from module statat: # Code from module std-gnu11: # Code from module stdalign: # Code from module stdarg: @@ -236,6 +237,7 @@ AC_DEFUN([gl_EARLY], # Code from module stdio: # Code from module stdlib: # Code from module stdopen: + # Code from module stpcpy: # Code from module strcase: # Code from module strcasestr: # Code from module strcasestr-simple: @@ -261,6 +263,7 @@ AC_DEFUN([gl_EARLY], # Code from module sys_uio: # Code from module sysexits: # Code from module tempname: + # Code from module termios: # Code from module threadlib: gl_THREADLIB_EARLY # Code from module time: @@ -810,6 +813,10 @@ AC_SUBST([LTALLOCA]) gl_PREREQ_READLINK ]) gl_UNISTD_MODULE_INDICATOR([readlink]) + gl_FUNC_READLINKAT + gl_CONDITIONAL([GL_COND_OBJ_READLINKAT], + [test $HAVE_READLINKAT = 0 || test $REPLACE_READLINKAT = 1]) + gl_UNISTD_MODULE_INDICATOR([readlinkat]) gl_FUNC_REALLOC_GNU if test $REPLACE_REALLOC_FOR_REALLOC_GNU = 1; then AC_LIBOBJ([realloc]) @@ -878,6 +885,19 @@ AC_SUBST([LTALLOCA]) gl_SIGNAL_H gl_SIGNAL_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P + gl_SIGNAL_SIGPIPE + dnl Define the C macro GNULIB_SIGPIPE to 1. + gl_MODULE_INDICATOR([sigpipe]) + dnl Define the substituted variable GNULIB_SIGNAL_H_SIGPIPE to 1. + gl_SIGNAL_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE], [1]) + dnl Define the substituted variable GNULIB_STDIO_H_SIGPIPE to 1. + gl_STDIO_H_REQUIRE_DEFAULTS + AC_REQUIRE([gl_ASM_SYMBOL_PREFIX]) + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE], [1]) + dnl Define the substituted variable GNULIB_UNISTD_H_SIGPIPE to 1. + gl_UNISTD_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE], [1]) gl_SIGNALBLOCKING gl_CONDITIONAL([GL_COND_OBJ_SIGPROCMASK], [test $HAVE_POSIX_SIGNALBLOCKING = 0]) AM_COND_IF([GL_COND_OBJ_SIGPROCMASK], [ @@ -906,7 +926,6 @@ AC_SUBST([LTALLOCA]) gl_SYS_STAT_MODULE_INDICATOR([stat]) gl_STAT_TIME gl_STAT_BIRTHTIME - gl_MODULE_INDICATOR([statat]) dnl for lib/openat.h gl_STDALIGN_H gl_CONDITIONAL_HEADER([stdalign.h]) AC_PROG_MKDIR_P @@ -956,6 +975,12 @@ AC_SUBST([LTALLOCA]) gl_STDLIB_H gl_STDLIB_H_REQUIRE_DEFAULTS AC_PROG_MKDIR_P + gl_FUNC_STPCPY + gl_CONDITIONAL([GL_COND_OBJ_STPCPY], [test $HAVE_STPCPY = 0]) + AM_COND_IF([GL_COND_OBJ_STPCPY], [ + gl_PREREQ_STPCPY + ]) + gl_STRING_MODULE_INDICATOR([stpcpy]) gl_STRCASE gl_CONDITIONAL([GL_COND_OBJ_STRCASECMP], [test $HAVE_STRCASECMP = 0]) AM_COND_IF([GL_COND_OBJ_STRCASECMP], [ @@ -1055,6 +1080,9 @@ AC_SUBST([LTALLOCA]) AC_PROG_MKDIR_P gl_FUNC_GEN_TEMPNAME gl_MODULE_INDICATOR([tempname]) + gl_TERMIOS_H + gl_TERMIOS_H_REQUIRE_DEFAULTS + AC_PROG_MKDIR_P AC_REQUIRE([gl_THREADLIB]) gl_TIME_H gl_TIME_H_REQUIRE_DEFAULTS @@ -1551,6 +1579,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/rawmemchr.valgrind lib/readdir.c lib/readlink.c + lib/readlinkat.c lib/realloc.c lib/reallocarray.c lib/regcomp.c @@ -1588,7 +1617,6 @@ AC_DEFUN([gl_FILE_LIST], [ lib/stat-w32.c lib/stat-w32.h lib/stat.c - lib/statat.c lib/stdalign.in.h lib/stdarg.in.h lib/stdbool.in.h @@ -1600,6 +1628,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/stdlib.in.h lib/stdopen.c lib/stdopen.h + lib/stpcpy.c lib/str-two-way.h lib/strcasecmp.c lib/strcasestr.c @@ -1632,6 +1661,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/sysexits.in.h lib/tempname.c lib/tempname.h + lib/termios.in.h lib/time.in.h lib/timespec.c lib/timespec.h @@ -1815,6 +1845,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/rawmemchr.m4 m4/readdir.m4 m4/readlink.m4 + m4/readlinkat.m4 m4/realloc.m4 m4/reallocarray.m4 m4/regex.m4 @@ -1829,6 +1860,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/sigaction.m4 m4/signal_h.m4 m4/signalblocking.m4 + m4/sigpipe.m4 m4/size_max.m4 m4/sleep.m4 m4/socketlib.m4 @@ -1847,6 +1879,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/stdint_h.m4 m4/stdio_h.m4 m4/stdlib_h.m4 + m4/stpcpy.m4 m4/strcase.m4 m4/strcasestr.m4 m4/strchrnul.m4 @@ -1868,6 +1901,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/sys_uio_h.m4 m4/sysexits.m4 m4/tempname.m4 + m4/termios_h.m4 m4/threadlib.m4 m4/time_h.m4 m4/timespec.m4 diff --git a/gl/m4/lib-link.m4 b/gl/m4/lib-link.m4 index ed5186af..3b75bcd0 100644 --- a/gl/m4/lib-link.m4 +++ b/gl/m4/lib-link.m4 @@ -1,4 +1,4 @@ -# lib-link.m4 serial 32 +# lib-link.m4 serial 33 dnl Copyright (C) 2001-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -196,8 +196,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\" ]) AC_ARG_WITH(PACK[-prefix], -[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib - --without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], +[[ --with-]]PACK[[-prefix[=DIR] search for ]]PACKLIBS[[ in DIR/include and DIR/lib + --without-]]PACK[[-prefix don't search for ]]PACKLIBS[[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no diff --git a/gl/m4/libtool.m4 b/gl/m4/libtool.m4 index c4c02946..e7b68334 100644 --- a/gl/m4/libtool.m4 +++ b/gl/m4/libtool.m4 @@ -1,6 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -31,7 +32,7 @@ m4_define([_LT_COPYING], [dnl # along with this program. If not, see <http://www.gnu.org/licenses/>. ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -181,6 +182,7 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -219,8 +221,8 @@ esac ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -777,7 +779,7 @@ _LT_EOF # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1041,8 +1043,8 @@ int forced_loaded() { return 2;} _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cr libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cr libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1066,17 +1068,12 @@ _LT_EOF _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[912]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*|11.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1125,12 +1122,12 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1244,7 +1241,8 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes]) # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1261,7 +1259,7 @@ case $with_sysroot in #( fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1291,7 +1289,7 @@ ia64-*-hpux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1308,7 +1306,7 @@ ia64-*-hpux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1320,7 +1318,7 @@ ia64-*-hpux*) ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1342,7 +1340,7 @@ mips64*-*linux*) echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1350,7 +1348,7 @@ mips64*-*linux*) emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1358,7 +1356,7 @@ mips64*-*linux*) emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1378,14 +1376,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1453,7 +1451,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1492,9 +1490,22 @@ need_locks=$enable_libtool_lock m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cr} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1713,7 +1724,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1756,7 +1767,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2206,26 +2217,35 @@ m4_defun([_LT_CMD_STRIPLIB], striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2548,7 +2568,7 @@ cygwin* | mingw* | pw32* | cegcc*) case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2558,14 +2578,14 @@ m4_if([$1], [],[ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2584,7 +2604,7 @@ m4_if([$1], [],[ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2621,7 +2641,7 @@ m4_if([$1], [],[ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2654,7 +2674,7 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -3465,7 +3485,7 @@ beos*) bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3499,14 +3519,14 @@ darwin* | rhapsody*) lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3520,7 +3540,7 @@ haiku*) ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3567,7 +3587,7 @@ netbsd* | netbsdelf*-gnu) newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3694,13 +3714,13 @@ else mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3726,7 +3746,7 @@ else # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3966,7 +3986,7 @@ esac if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* \(.*\)$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'" @@ -3984,20 +4004,20 @@ fi # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* \(.*\)$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4021,7 +4041,7 @@ for ac_symprfx in "" "_"; do if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4039,9 +4059,9 @@ for ac_symprfx in "" "_"; do " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4329,7 +4349,7 @@ m4_if([$1], [CXX], [ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4412,7 +4432,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4754,7 +4774,7 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4937,7 +4957,7 @@ m4_if([$1], [CXX], [ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4945,7 +4965,7 @@ m4_if([$1], [CXX], [ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -5005,15 +5025,15 @@ dnl Note also adjust exclude_expsyms for C++ above. case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -5068,7 +5088,7 @@ dnl Note also adjust exclude_expsyms for C++ above. _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5180,6 +5200,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5194,7 +5215,7 @@ _LT_EOF # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5237,7 +5258,7 @@ _LT_EOF _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5249,13 +5270,14 @@ _LT_EOF if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi case $cc_basename in tcc*) + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic' ;; xlf* | bgf* | bgxlf* | mpixlf*) @@ -5265,7 +5287,7 @@ _LT_EOF _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5397,7 +5419,7 @@ _LT_EOF if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5580,12 +5602,12 @@ _LT_EOF cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5626,7 +5648,7 @@ _LT_EOF fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5674,7 +5696,7 @@ _LT_EOF ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5815,6 +5837,7 @@ _LT_EOF # Fabrice Bellard et al's Tiny C Compiler _LT_TAGVAR(ld_shlibs, $1)=yes _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir' ;; esac ;; @@ -5886,6 +5909,7 @@ _LT_EOF emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6656,8 +6680,8 @@ if test yes != "$_lt_caught_CXX_error"; then cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6755,6 +6779,7 @@ if test yes != "$_lt_caught_CXX_error"; then emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6785,7 +6810,7 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6922,7 +6947,7 @@ if test yes != "$_lt_caught_CXX_error"; then # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7062,13 +7087,13 @@ if test yes != "$_lt_caught_CXX_error"; then _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8214,6 +8239,14 @@ _LT_DECL([], [DLLTOOL], [1], [DLL creation program]) AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates diff --git a/gl/m4/ltoptions.m4 b/gl/m4/ltoptions.m4 index 94b08297..b0b5e9c2 100644 --- a/gl/m4/ltoptions.m4 +++ b/gl/m4/ltoptions.m4 @@ -1,7 +1,7 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives diff --git a/gl/m4/ltsugar.m4 b/gl/m4/ltsugar.m4 index 48bc9344..902508bd 100644 --- a/gl/m4/ltsugar.m4 +++ b/gl/m4/ltsugar.m4 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff --git a/gl/m4/ltversion.m4 b/gl/m4/ltversion.m4 index fa04b52a..b155d0ac 100644 --- a/gl/m4/ltversion.m4 +++ b/gl/m4/ltversion.m4 @@ -1,6 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/gl/m4/lt~obsolete.m4 b/gl/m4/lt~obsolete.m4 index c6b26f88..0f7a8759 100644 --- a/gl/m4/lt~obsolete.m4 +++ b/gl/m4/lt~obsolete.m4 @@ -1,7 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives diff --git a/gl/m4/manywarnings.m4 b/gl/m4/manywarnings.m4 index 253393e5..f4b5853f 100644 --- a/gl/m4/manywarnings.m4 +++ b/gl/m4/manywarnings.m4 @@ -167,11 +167,13 @@ AC_DEFUN([gl_MANYWARN_ALL_GCC(C)], # them here so that the above 'comm' command doesn't report a false match. gl_AS_VAR_APPEND([$1], [' -Warray-bounds=2']) gl_AS_VAR_APPEND([$1], [' -Wattribute-alias=2']) + gl_AS_VAR_APPEND([$1], [' -Wbidi-chars=any,ucn']) gl_AS_VAR_APPEND([$1], [' -Wformat-overflow=2']) gl_AS_VAR_APPEND([$1], [' -Wformat=2']) gl_AS_VAR_APPEND([$1], [' -Wformat-truncation=2']) gl_AS_VAR_APPEND([$1], [' -Wimplicit-fallthrough=5']) gl_AS_VAR_APPEND([$1], [' -Wshift-overflow=2']) + gl_AS_VAR_APPEND([$1], [' -Wuse-after-free=3']) gl_AS_VAR_APPEND([$1], [' -Wunused-const-variable=2']) gl_AS_VAR_APPEND([$1], [' -Wvla-larger-than=4031']) diff --git a/gl/m4/readlinkat.m4 b/gl/m4/readlinkat.m4 new file mode 100644 index 00000000..63c5205e --- /dev/null +++ b/gl/m4/readlinkat.m4 @@ -0,0 +1,39 @@ +# serial 6 +# See if we need to provide readlinkat replacement. + +dnl Copyright (C) 2009-2022 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +# Written by Eric Blake. + +AC_DEFUN([gl_FUNC_READLINKAT], +[ + AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) + AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) + AC_CHECK_FUNCS_ONCE([readlinkat]) + AC_REQUIRE([gl_FUNC_READLINK]) + if test $ac_cv_func_readlinkat = no; then + HAVE_READLINKAT=0 + else + AC_CACHE_CHECK([whether readlinkat signature is correct], + [gl_cv_decl_readlinkat_works], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [[#include <unistd.h> + /* Check whether original declaration has correct type. */ + ssize_t readlinkat (int, char const *, char *, size_t);]])], + [gl_cv_decl_readlinkat_works=yes], + [gl_cv_decl_readlinkat_works=no])]) + # Assume readlinkat has the same bugs as readlink, + # as is the case on OS X 10.10 with trailing slashes. + case $gl_cv_decl_readlinkat_works,$gl_cv_func_readlink_trailing_slash,$gl_cv_func_readlink_truncate in + *yes,*yes,*yes) + ;; + *) + REPLACE_READLINKAT=1 + ;; + esac + fi +]) diff --git a/gl/m4/sigpipe.m4 b/gl/m4/sigpipe.m4 new file mode 100644 index 00000000..e0524443 --- /dev/null +++ b/gl/m4/sigpipe.m4 @@ -0,0 +1,29 @@ +# sigpipe.m4 serial 3 +dnl Copyright (C) 2008-2022 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +dnl Tests whether SIGPIPE is provided by <signal.h>. +dnl Sets gl_cv_header_signal_h_SIGPIPE. +AC_DEFUN([gl_SIGNAL_SIGPIPE], +[ + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. + AC_REQUIRE([gl_SIGNAL_SIGPIPE_BODY]) +]) + +AC_DEFUN([gl_SIGNAL_SIGPIPE_BODY], +[ + AC_REQUIRE([AC_PROG_CC]) + AC_CACHE_CHECK([for SIGPIPE], [gl_cv_header_signal_h_SIGPIPE], [ + AC_EGREP_CPP([booboo],[ +#include <signal.h> +#if !defined SIGPIPE +booboo +#endif + ], + [gl_cv_header_signal_h_SIGPIPE=no], + [gl_cv_header_signal_h_SIGPIPE=yes]) + ]) +]) diff --git a/gl/m4/stpcpy.m4 b/gl/m4/stpcpy.m4 new file mode 100644 index 00000000..241e68c8 --- /dev/null +++ b/gl/m4/stpcpy.m4 @@ -0,0 +1,25 @@ +# stpcpy.m4 serial 9 +dnl Copyright (C) 2002, 2007, 2009-2022 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN([gl_FUNC_STPCPY], +[ + dnl Persuade glibc <string.h> to declare stpcpy(). + AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) + + dnl The stpcpy() declaration in lib/string.in.h uses 'restrict'. + AC_REQUIRE([AC_C_RESTRICT]) + + AC_REQUIRE([gl_STRING_H_DEFAULTS]) + AC_CHECK_FUNCS([stpcpy]) + if test $ac_cv_func_stpcpy = no; then + HAVE_STPCPY=0 + fi +]) + +# Prerequisites of lib/stpcpy.c. +AC_DEFUN([gl_PREREQ_STPCPY], [ + : +]) diff --git a/gl/m4/sys_stat_h.m4 b/gl/m4/sys_stat_h.m4 index b5a9789b..2adbfdee 100644 --- a/gl/m4/sys_stat_h.m4 +++ b/gl/m4/sys_stat_h.m4 @@ -1,4 +1,4 @@ -# sys_stat_h.m4 serial 41 -*- Autoconf -*- +# sys_stat_h.m4 serial 42 -*- Autoconf -*- dnl Copyright (C) 2006-2022 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -46,7 +46,7 @@ AC_DEFUN_ONCE([gl_SYS_STAT_H], dnl Check for declarations of anything we want to poison if the dnl corresponding gnulib module is not in use. gl_WARN_ON_USE_PREPARE([[#include <sys/stat.h> - ]], [fchmodat fstat fstatat futimens getumask lchmod lstat + ]], [chmod fchmodat fstat fstatat futimens getumask lchmod lstat mkdirat mkfifo mkfifoat mknod mknodat stat utimensat]) AC_REQUIRE([AC_C_RESTRICT]) @@ -72,6 +72,7 @@ AC_DEFUN([gl_SYS_STAT_H_REQUIRE_DEFAULTS], [ m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_STAT_H_MODULE_INDICATOR_DEFAULTS], [ gl_UNISTD_H_REQUIRE_DEFAULTS dnl for REPLACE_FCHDIR + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CHMOD]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCHMODAT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTAT]) gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FSTATAT]) @@ -112,6 +113,7 @@ AC_DEFUN([gl_SYS_STAT_H_DEFAULTS], HAVE_MKNOD=1; AC_SUBST([HAVE_MKNOD]) HAVE_MKNODAT=1; AC_SUBST([HAVE_MKNODAT]) HAVE_UTIMENSAT=1; AC_SUBST([HAVE_UTIMENSAT]) + REPLACE_CHMOD=0; AC_SUBST([REPLACE_CHMOD]) REPLACE_FCHMODAT=0; AC_SUBST([REPLACE_FCHMODAT]) REPLACE_FSTAT=0; AC_SUBST([REPLACE_FSTAT]) REPLACE_FSTATAT=0; AC_SUBST([REPLACE_FSTATAT]) diff --git a/gl/m4/termios_h.m4 b/gl/m4/termios_h.m4 new file mode 100644 index 00000000..6c835388 --- /dev/null +++ b/gl/m4/termios_h.m4 @@ -0,0 +1,58 @@ +# termios_h.m4 serial 7 +dnl Copyright (C) 2010-2022 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. + +AC_DEFUN_ONCE([gl_TERMIOS_H], +[ + dnl Ensure to expand the default settings once only, before all statements + dnl that occur in other macros. + AC_REQUIRE([gl_TERMIOS_H_DEFAULTS]) + + gl_CHECK_NEXT_HEADERS([termios.h]) + if test $ac_cv_header_termios_h != yes; then + HAVE_TERMIOS_H=0 + fi + + dnl Ensure the type pid_t gets defined. + AC_REQUIRE([AC_TYPE_PID_T]) + + dnl Check for declarations of anything we want to poison if the + dnl corresponding gnulib module is not in use, and which is not + dnl guaranteed by C89. + gl_WARN_ON_USE_PREPARE([[#include <termios.h>]], + [tcgetsid]) +]) + +# gl_TERMIOS_MODULE_INDICATOR([modulename]) +# sets the shell variable that indicates the presence of the given module +# to a C preprocessor expression that will evaluate to 1. +# This macro invocation must not occur in macros that are AC_REQUIREd. +AC_DEFUN([gl_TERMIOS_MODULE_INDICATOR], +[ + dnl Ensure to expand the default settings once only. + gl_TERMIOS_H_REQUIRE_DEFAULTS + gl_MODULE_INDICATOR_SET_VARIABLE([$1]) + dnl Define it also as a C macro, for the benefit of the unit tests. + gl_MODULE_INDICATOR_FOR_TESTS([$1]) +]) + +# Initializes the default values for AC_SUBSTed shell variables. +# This macro must not be AC_REQUIREd. It must only be invoked, and only +# outside of macros or in macros that are not AC_REQUIREd. +AC_DEFUN([gl_TERMIOS_H_REQUIRE_DEFAULTS], +[ + m4_defun(GL_MODULE_INDICATOR_PREFIX[_TERMIOS_H_MODULE_INDICATOR_DEFAULTS], [ + gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_TCGETSID]) + ]) + m4_require(GL_MODULE_INDICATOR_PREFIX[_TERMIOS_H_MODULE_INDICATOR_DEFAULTS]) + AC_REQUIRE([gl_TERMIOS_H_DEFAULTS]) +]) + +AC_DEFUN([gl_TERMIOS_H_DEFAULTS], +[ + dnl Assume proper GNU behavior unless another module says otherwise. + HAVE_DECL_TCGETSID=1; AC_SUBST([HAVE_DECL_TCGETSID]) + HAVE_TERMIOS_H=1; AC_SUBST([HAVE_TERMIOS_H]) +]) diff --git a/gl/po/POTFILES.in b/gl/po/POTFILES.in index 4e22461c..d168187f 100644 --- a/gl/po/POTFILES.in +++ b/gl/po/POTFILES.in @@ -267,6 +267,7 @@ gl/lib/rawmemchr.c gl/lib/rawmemchr.valgrind gl/lib/readdir.c gl/lib/readlink.c +gl/lib/readlinkat.c gl/lib/realloc.c gl/lib/reallocarray.c gl/lib/regcomp.c @@ -304,7 +305,6 @@ gl/lib/stat-time.h gl/lib/stat-w32.c gl/lib/stat-w32.h gl/lib/stat.c -gl/lib/statat.c gl/lib/stdalign.in.h gl/lib/stdarg.in.h gl/lib/stdbool.in.h @@ -316,6 +316,7 @@ gl/lib/stdio.in.h gl/lib/stdlib.in.h gl/lib/stdopen.c gl/lib/stdopen.h +gl/lib/stpcpy.c gl/lib/str-two-way.h gl/lib/strcasecmp.c gl/lib/strcasestr.c @@ -348,6 +349,7 @@ gl/lib/sys_uio.in.h gl/lib/sysexits.in.h gl/lib/tempname.c gl/lib/tempname.h +gl/lib/termios.in.h gl/lib/time.in.h gl/lib/timespec.c gl/lib/timespec.h diff --git a/gl/po/af.po b/gl/po/af.po index 3f97c982..2f72bf6a 100644 --- a/gl/po/af.po +++ b/gl/po/af.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.2.1\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2004-03-17 11:58+0200\n" "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n" "Language-Team: Afrikaans <i18n@af.org.za>\n" diff --git a/gl/po/be.po b/gl/po/be.po index 49593534..c0d683c8 100644 --- a/gl/po/be.po +++ b/gl/po/be.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.0.91\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2003-10-30 01:10+0200\n" "Last-Translator: Ales Nyakhaychyk <nab@mail.by>\n" "Language-Team: Belarusian <i18n@mova.org>\n" diff --git a/gl/po/bg.po b/gl/po/bg.po index 5cbdb596..0d9e7f55 100644 --- a/gl/po/bg.po +++ b/gl/po/bg.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2020-03-10 09:45+0100\n" "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n" "Language-Team: Bulgarian <dict@ludost.net>\n" diff --git a/gl/po/ca.po b/gl/po/ca.po index 923a3c3a..bd77d212 100644 --- a/gl/po/ca.po +++ b/gl/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: mailutils 0.6.90\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2005-05-21 04:10+0200\n" "Last-Translator: Jordi Mallach <jordi@gnu.org>\n" "Language-Team: Catalan <ca@dodds.net>\n" diff --git a/gl/po/cs.po b/gl/po/cs.po index 2f4f4585..2607aea5 100644 --- a/gl/po/cs.po +++ b/gl/po/cs.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2011-12-04 08:50+0100\n" "Last-Translator: Marek ÄŒernocký <marek@manet.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" diff --git a/gl/po/da.po b/gl/po/da.po index 6951ebfc..54d9c8b6 100644 --- a/gl/po/da.po +++ b/gl/po/da.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 2.0.0.3462.e9796\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2011-01-20 22:11+0100\n" "Last-Translator: Keld Simonsen <keld@keldix.com>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" diff --git a/gl/po/de.po b/gl/po/de.po index 0312609f..5591ba15 100644 --- a/gl/po/de.po +++ b/gl/po/de.po @@ -35,7 +35,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-05-22 20:00+0200\n" "Last-Translator: Roland Illig <roland.illig@gmx.de>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" diff --git a/gl/po/el.po b/gl/po/el.po index 44c348f8..d55c320a 100644 --- a/gl/po/el.po +++ b/gl/po/el.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2012-03-11 11:25+0100\n" "Last-Translator: Simos Xenitellis <simos.lists@googlemail.com>\n" "Language-Team: Greek <team@lists.gnome.gr>\n" diff --git a/gl/po/eo.po b/gl/po/eo.po index 7ba7d00f..5374d1bf 100644 --- a/gl/po/eo.po +++ b/gl/po/eo.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-05-19 18:26-0300\n" "Last-Translator: Felipe Castro <fefcas@gmail.com>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" diff --git a/gl/po/es.gmo b/gl/po/es.gmo Binary files differindex 72be68a1..4117425d 100644 --- a/gl/po/es.gmo +++ b/gl/po/es.gmo diff --git a/gl/po/es.po b/gl/po/es.po index 4e3f244e..57fce728 100644 --- a/gl/po/es.po +++ b/gl/po/es.po @@ -1,7 +1,7 @@ -# Mensajes en español para gnulib 3.0.0.6062.a6b16. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +# Mensajes en español para gnulib 4.0.0.2567 +# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2022 Free Software Foundation, Inc. # This file is distributed under the same license as the gnulib package. -# Cristian Othón MartÃnez Vera <cfuga@cfuga.mx>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011. +# Cristian Othón MartÃnez Vera <cfuga@cfuga.mx>, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2022. # # Los mensajes iniciales de esta traducción provienen de la traducción # de mailutils. @@ -11,12 +11,12 @@ # msgid "" msgstr "" -"Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" +"Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" -"PO-Revision-Date: 2011-08-24 11:23-0500\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" +"PO-Revision-Date: 2022-04-06 18:22-0500\n" "Last-Translator: Cristian Othón MartÃnez Vera <cfuga@cfuga.mx>\n" -"Language-Team: Spanish <es@li.org>\n" +"Language-Team: Spanish <es@tp.org.es>\n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -65,9 +65,9 @@ msgid " [OPTION...]" msgstr " [OPCIÓN...]" #: gl/lib/argp-help.c:1783 -#, fuzzy, c-format +#, c-format msgid "Try '%s --help' or '%s --usage' for more information.\n" -msgstr "Pruebe `%s --help' ó `%s --usage' para más información.\n" +msgstr "Pruebe '%s --help' ó `%s --usage' para más información.\n" #: gl/lib/argp-help.c:1811 #, c-format @@ -120,29 +120,29 @@ msgid "(PROGRAM ERROR) Option should have been recognized!?" msgstr "(ERROR DEL PROGRAMA) ¿¡La opción deberÃa reconocerse!?" #: gl/lib/getopt.c:278 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous\n" -msgstr "%s: la opción '-W %s' es ambigua\n" +msgstr "%s: la opción '%s%s' es ambigua\n" #: gl/lib/getopt.c:284 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' is ambiguous; possibilities:" -msgstr "%s: la opción '%s' es ambigua; posibilidades:" +msgstr "%s: la opción '%s%s' es ambigua; posibilidades:" #: gl/lib/getopt.c:319 -#, fuzzy, c-format +#, c-format msgid "%s: unrecognized option '%s%s'\n" -msgstr "%s: no se reconoce la opción '%c%s'\n" +msgstr "%s: no se reconoce la opción '%s%s'\n" #: gl/lib/getopt.c:345 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' doesn't allow an argument\n" -msgstr "%s: la opción '%c%s' no admite un argumento\n" +msgstr "%s: la opción '%s%s' no admite un argumento\n" #: gl/lib/getopt.c:360 -#, fuzzy, c-format +#, c-format msgid "%s: option '%s%s' requires an argument\n" -msgstr "%s: la opción '--%s' requiere de un argumento\n" +msgstr "%s: la opción '%s%s' requiere de un argumento\n" #: gl/lib/getopt.c:621 #, c-format @@ -193,9 +193,8 @@ msgid "Invalid back reference" msgstr "Referencia hacia atrás inválida" #: gl/lib/regcomp.c:143 -#, fuzzy msgid "Unmatched [, [^, [:, [., or [=" -msgstr "[ o [^ sin pareja" +msgstr "[, [^, [:, [., o [= sin pareja" #: gl/lib/regcomp.c:146 msgid "Unmatched ( or \\(" @@ -249,7 +248,7 @@ msgstr "memoria agotada" #: gl/lib/xstdopen.c:34 #, c-format msgid "standard file descriptors" -msgstr "" +msgstr "descriptores de fichero estándar" #, c-format #~ msgid "invalid argument %s for %s" @@ -259,13 +258,62 @@ msgstr "" #~ msgid "ambiguous argument %s for %s" #~ msgstr "argumento %s ambiguo para %s" -#, c-format #~ msgid "Valid arguments are:" #~ msgstr "Los argumentos válidos son:" #, c-format -#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive" -#~ msgstr "%.*s: El parámetro ARGP_HELP_FMT debe ser positivo" +#~ msgid "%u bitset_allocs, %u freed (%.2f%%).\n" +#~ msgstr "%u bitset_allocs, %u liberados (%.2f%%).\n" + +#, c-format +#~ msgid "%u bitset_sets, %u cached (%.2f%%)\n" +#~ msgstr "%u bitset_sets, %u en caché (%.2f%%)\n" + +#, c-format +#~ msgid "%u bitset_resets, %u cached (%.2f%%)\n" +#~ msgstr "%u bitset_resets, %u en caché (%.2f%%)\n" + +#, c-format +#~ msgid "%u bitset_tests, %u cached (%.2f%%)\n" +#~ msgstr "%u bitset_tests, %u en caché (%.2f%%)\n" + +#, c-format +#~ msgid "%u bitset_lists\n" +#~ msgstr "%u bitset_lists\n" + +#~ msgid "count log histogram\n" +#~ msgstr "histograma de registro de cuenta\n" + +#~ msgid "size log histogram\n" +#~ msgstr "histograma de registro de tamaño\n" + +#~ msgid "density histogram\n" +#~ msgstr "histograma de densidad\n" + +#, c-format +#~ msgid "" +#~ "Bitset statistics:\n" +#~ "\n" +#~ msgstr "" +#~ "EstadÃsticas de conjuntos de bits:\n" +#~ "\n" + +#, c-format +#~ msgid "Accumulated runs = %u\n" +#~ msgstr "Ejecuciones acumuladas = %u\n" + +#~ msgid "cannot read stats file" +#~ msgstr "no se puede leer el fichero de estadÃsticas" + +#, c-format +#~ msgid "bad stats file size\n" +#~ msgstr "tamaño erróneo de fichero de estadÃsticas\n" + +#~ msgid "cannot write stats file" +#~ msgstr "no se puede escribir el fichero de estadÃsticas" + +#~ msgid "cannot open stats file for writing" +#~ msgstr "no se puede abrir el fichero de estadÃsticas para escritura" #~ msgid "program error" #~ msgstr "error del programa" @@ -273,7 +321,6 @@ msgstr "" #~ msgid "stack overflow" #~ msgstr "desbordamiento de la pila" -#, c-format #~ msgid "cannot find a temporary directory, try setting $TMPDIR" #~ msgstr "" #~ "no se puede encontrar un directorio temporal, pruebe definir $TMPDIR" @@ -301,36 +348,60 @@ msgstr "" #~ msgstr "se conservan los permisos de %s" #, c-format -#~ msgid "error while opening \"%s\" for reading" -#~ msgstr "error al abrir \"%s\" para lectura" +#~ msgid "error while opening %s for reading" +#~ msgstr "error al abrir %s para lectura" #, c-format -#~ msgid "cannot open backup file \"%s\" for writing" -#~ msgstr "no se puede abrir el fichero de respaldo \"%s\" para escritura" +#~ msgid "cannot open backup file %s for writing" +#~ msgstr "no se puede abrir el fichero de respaldo %s para escritura" #, c-format -#~ msgid "error reading \"%s\"" -#~ msgstr "error al leer \"%s\"" +#~ msgid "error reading %s" +#~ msgstr "error al leer %s" #, c-format -#~ msgid "error writing \"%s\"" -#~ msgstr "error al escribir en \"%s\"" +#~ msgid "error writing %s" +#~ msgstr "error al escribir en %s" #, c-format -#~ msgid "error after reading \"%s\"" -#~ msgstr "error después de leer \"%s\"" +#~ msgid "error after reading %s" +#~ msgstr "error después de leer %s" -#, c-format #~ msgid "fdopen() failed" #~ msgstr "falló fdopen()" -#, c-format -#~ msgid "C# compiler not found, try installing pnet" -#~ msgstr "No se encontró un compilador de C#, pruebe instalando pnet" +#~ msgid "C# compiler not found, try installing mono" +#~ msgstr "No se encontró un compilador de C#, pruebe instalando mono" -#, c-format -#~ msgid "C# virtual machine not found, try installing pnet" -#~ msgstr "No se encontró una máquina virtual de C#, pruebe instalando pnet" +#~ msgid "C# virtual machine not found, try installing mono" +#~ msgstr "No se encontró una máquina virtual de C#, pruebe instalando mono" + +#~ msgid "unbalanced [" +#~ msgstr "[ sin pareja" + +#~ msgid "invalid character class" +#~ msgstr "clase de carácter inválida" + +#~ msgid "character class syntax is [[:space:]], not [:space:]" +#~ msgstr "la sintaxis de clase de carácter es [[:space:]], no [:space:]" + +#~ msgid "unfinished \\ escape" +#~ msgstr "escape \\ sin terminar" + +#~ msgid "invalid content of \\{\\}" +#~ msgstr "contenido inválido de \\{\\}" + +#~ msgid "regular expression too big" +#~ msgstr "expresión regular demasiado grande" + +#~ msgid "unbalanced (" +#~ msgstr "( sin pareja" + +#~ msgid "no syntax specified" +#~ msgstr "no se especificó la sintaxis" + +#~ msgid "unbalanced )" +#~ msgstr ") sin pareja" #, c-format #~ msgid "%s subprocess failed" @@ -345,21 +416,9 @@ msgstr "" #~ msgid "directory" #~ msgstr "directorio" -#~ msgid "block special file" -#~ msgstr "fichero especial de bloques" - -#~ msgid "character special file" -#~ msgstr "fichero especial de caracteres" - -#~ msgid "fifo" -#~ msgstr "`fifo'" - #~ msgid "symbolic link" #~ msgstr "enlace simbólico" -#~ msgid "socket" -#~ msgstr "`socket'" - #~ msgid "message queue" #~ msgstr "cola de mensajes" @@ -372,6 +431,51 @@ msgstr "" #~ msgid "typed memory object" #~ msgstr "objeto de memoria con tipo" +#~ msgid "block special file" +#~ msgstr "fichero especial de bloques" + +#~ msgid "character special file" +#~ msgstr "fichero especial de caracteres" + +#~ msgid "contiguous data" +#~ msgstr "datos contiguos" + +#~ msgid "fifo" +#~ msgstr "`fifo'" + +#~ msgid "door" +#~ msgstr "puerta" + +#~ msgid "multiplexed block special file" +#~ msgstr "fichero especial de bloques multiplexado" + +#~ msgid "multiplexed character special file" +#~ msgstr "fichero especial de caracteres multiplexado" + +#~ msgid "multiplexed file" +#~ msgstr "fichero multiplexado" + +#~ msgid "named file" +#~ msgstr "fichero nombrado" + +#~ msgid "network special file" +#~ msgstr "fichero especial de red" + +#~ msgid "migrated file with data" +#~ msgstr "fichero migrado con datos" + +#~ msgid "migrated file without data" +#~ msgstr "fichero migrado sin datos" + +#~ msgid "port" +#~ msgstr "puerto" + +#~ msgid "socket" +#~ msgstr "`socket'" + +#~ msgid "whiteout" +#~ msgstr "blanqueado" + #~ msgid "weird file" #~ msgstr "fichero extraño" @@ -432,27 +536,9 @@ msgstr "" #~ msgid "Unknown error" #~ msgstr "Error desconocido" -#, c-format -#~ msgid "%s: option '--%s' doesn't allow an argument\n" -#~ msgstr "%s: la opción '--%s' no admite un argumento\n" - -#, c-format -#~ msgid "%s: unrecognized option '--%s'\n" -#~ msgstr "%s: no se reconoce la opción '--%s'\n" - -#, c-format -#~ msgid "%s: option '-W %s' doesn't allow an argument\n" -#~ msgstr "%s: la opción '-W %s' no admite un argumento\n" - -#, c-format -#~ msgid "%s: option '-W %s' requires an argument\n" -#~ msgstr "%s: la opción '-W %s' requiere de un argumento\n" - -#, c-format #~ msgid "invalid source_version argument to compile_java_class" #~ msgstr "argumento source_version inválido para compile_java_class" -#, c-format #~ msgid "invalid target_version argument to compile_java_class" #~ msgstr "argumento target_version inválido para compile_java_class" @@ -464,13 +550,11 @@ msgstr "" #~ msgid "error while writing \"%s\" file" #~ msgstr "error al escribir el fichero \"%s\"" -#, c-format #~ msgid "Java compiler not found, try installing gcj or set $JAVAC" #~ msgstr "" #~ "No se encontró un compilador de Java, pruebe instalando gcj o definiendo " #~ "$JAVAC" -#, c-format #~ msgid "Java virtual machine not found, try installing gij or set $JAVA" #~ msgstr "" #~ "No se encontró una máquina virtual de Java, pruebe instalando gij o " @@ -481,6 +565,10 @@ msgstr "" #~ msgstr "%s: error de E/S del subproceso" #, c-format +#~ msgid "cannot stat %s" +#~ msgstr "no se puede ejecutar stat sobre %s" + +#, c-format #~ msgid "cannot change permissions of %s" #~ msgstr "no se pueden cambiar los permisos de %s" @@ -488,11 +576,9 @@ msgstr "" #~ msgid "cannot create directory %s" #~ msgstr "no se puede crear el directorio %s" -#, c-format #~ msgid "Failed to open /dev/zero for read" #~ msgstr "Falló al abrir /dev/zero para lectura" -#, c-format #~ msgid "creation of reading thread failed" #~ msgstr "falló la creación del hilo de lectura" @@ -516,7 +602,6 @@ msgstr "" #~ msgid "subprocess %s terminated with exit code %d" #~ msgstr "el subproceso %s terminó con el código de salida %d" -#, c-format #~ msgid "creation of threads failed" #~ msgstr "falló la creación de hilos" @@ -524,9 +609,6 @@ msgstr "" #~ msgid "%s subprocess terminated with exit code %d" #~ msgstr "subproceso %s terminado con el código de salida %d" -#~ msgid "Franc,ois Pinard" -#~ msgstr "François Pinard" - # Vamos a probar con el sÃmbolo de cita tradicional en español, # a ver qué tal queda la cosa. #~ msgid "`" @@ -652,9 +734,8 @@ msgstr "" #~ msgid "error writing to a closed pipe or socket" #~ msgstr "error al escribir a una tuberÃa o socket cerrados" -#, c-format #~ msgid "cannot create pipe" -#~ msgstr "no se puede una tuberÃa" +#~ msgstr "no se puede crear una tuberÃa" #, c-format #~ msgid "Real-time signal %d" @@ -664,6 +745,18 @@ msgstr "" #~ msgid "Unknown signal %d" #~ msgstr "Señal %d desconocida" +#~ msgid "Execution times (seconds)" +#~ msgstr "Tiempos de ejecución (segundos)" + +#~ msgid "CPU user" +#~ msgstr "CPU de usuario" + +#~ msgid "CPU system" +#~ msgstr "CPU de sistema" + +#~ msgid "wall clock" +#~ msgstr "reloj de pared" + #~ msgid "iconv function not usable" #~ msgstr "la función iconv no es utilizable" @@ -729,17 +822,13 @@ msgstr "" #~ msgid "(C)" #~ msgstr "(C)" +#, c-format #~ msgid "" -#~ "\n" -#~ "License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl." -#~ "html>.\n" +#~ "License GPLv3+: GNU GPL version 3 or later <%s>.\n" #~ "This is free software: you are free to change and redistribute it.\n" #~ "There is NO WARRANTY, to the extent permitted by law.\n" -#~ "\n" #~ msgstr "" -#~ "\n" -#~ "Licencia GPLv3+: GPL de GNU versión 3 o posterior\n" -#~ "<http://gnu.org/licenses/gpl.html>.\n" +#~ "Licencia GPLv3+: GPL de GNU versión 3 o posterior <%s>.\n" #~ "Esto es software libre: tiene la libertad de cambiarlo y redistribuirlo.\n" #~ "No tiene GARANTÃA, en la extensión permitida por la ley.\n" #~ "\n" @@ -819,13 +908,8 @@ msgstr "" #~ "%s, %s, y otros.\n" #, c-format -#~ msgid "" -#~ "\n" -#~ "Report bugs to: %s\n" -#~ msgstr "" -#~ "\n" -#~ "Reporte bichos a: %s.\n" -#~ "Reporte errores de traducción a: es@li.org\n" +#~ msgid "Report bugs to: %s\n" +#~ msgstr "Reporte bichos a: %s.\n" #, c-format #~ msgid "Report %s bugs to: %s\n" @@ -836,14 +920,9 @@ msgstr "" #~ msgstr "Página web de %s: <%s>\n" #, c-format -#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n" -#~ msgstr "Página web de %s: <http://www.gnu.org/software/%s/>\n" +#~ msgid "General help using GNU software: <%s>\n" +#~ msgstr "Ayuda general para usar software de GNU: <%s>\n" -#~ msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n" -#~ msgstr "" -#~ "Ayuda general para usar software de GNU: <http://www.gnu.org/gethelp/>\n" - -#, c-format #~ msgid "_open_osfhandle failed" #~ msgstr "falló _open_osfhandle" @@ -859,6 +938,9 @@ msgstr "" #~ msgid "%s subprocess got fatal signal %d" #~ msgstr "el subproceso %s recibió la señal fatal %d" +#~ msgid "failed to set file descriptor text/binary mode" +#~ msgstr "falló al establecer el modo texto/binario del descriptor de fichero" + #~ msgid "stdin" #~ msgstr "entrada estándard" @@ -875,11 +957,9 @@ msgstr "" #~ msgid "failed to reopen %s with mode %s" #~ msgstr "falló al reabrir %s con modo %s" -#, c-format #~ msgid "string comparison failed" #~ msgstr "la comparación de cadenas falló" -#, c-format #~ msgid "Set LC_ALL='C' to work around the problem." #~ msgstr "" #~ "Establezca LC_ALL='C' para solucionar este problema de forma temporal." @@ -888,21 +968,41 @@ msgstr "" #~ msgid "The strings compared were %s and %s." #~ msgstr "Las cadenas comparadas eran %s y %s." -#, c-format #~ msgid "cannot perform formatted output" #~ msgstr "no se puede mostrar la salida con formato" #, c-format -#~ msgid "invalid %s%s argument `%s'" -#~ msgstr "argumento `$3%s' inválido para $1%s$2%s" +#~ msgid "invalid %s%s argument '%s'" +#~ msgstr "el argumento %s%s '%s' es inválido" #, c-format -#~ msgid "invalid suffix in %s%s argument `%s'" -#~ msgstr "sufijo inválido en el argumento `$3%s' para $1%s$2%s" +#~ msgid "invalid suffix in %s%s argument '%s'" +#~ msgstr "sufijo inválido en %s%s argumento '%s'" #, c-format -#~ msgid "%s%s argument `%s' too large" -#~ msgstr "el argumento `$3%s' es demasiado grande para $1%s$2%s" +#~ msgid "%s%s argument '%s' too large" +#~ msgstr "el argumento %s%s '%s' es demasiado grande" + +#~ msgid "%.*s: ARGP_HELP_FMT parameter must be positive" +#~ msgstr "%.*s: El parámetro ARGP_HELP_FMT debe ser positivo" + +#~ msgid "%s: option '--%s' doesn't allow an argument\n" +#~ msgstr "%s: la opción '--%s' no admite un argumento\n" + +#~ msgid "%s: unrecognized option '--%s'\n" +#~ msgstr "%s: no se reconoce la opción '--%s'\n" + +#~ msgid "%s: option '-W %s' doesn't allow an argument\n" +#~ msgstr "%s: la opción '-W %s' no admite un argumento\n" + +#~ msgid "%s: option '-W %s' requires an argument\n" +#~ msgstr "%s: la opción '-W %s' requiere de un argumento\n" + +#~ msgid "Franc,ois Pinard" +#~ msgstr "François Pinard" + +#~ msgid "%s home page: <http://www.gnu.org/software/%s/>\n" +#~ msgstr "Página web de %s: <http://www.gnu.org/software/%s/>\n" #~ msgid "%s: illegal option -- %c\n" #~ msgstr "%s: opción ilegal -- %c\n" diff --git a/gl/po/et.po b/gl/po/et.po index a95384f8..bf2740c2 100644 --- a/gl/po/et.po +++ b/gl/po/et.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 2.0.0.3462.e9796\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2011-05-19 15:10+0300\n" "Last-Translator: Toomas Soome <Toomas.Soome@microlink.ee>\n" "Language-Team: Estonian <linux-ee@lists.eenet.ee>\n" diff --git a/gl/po/eu.po b/gl/po/eu.po index a86eccf9..edea833e 100644 --- a/gl/po/eu.po +++ b/gl/po/eu.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils-5.2.1\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2005-01-04 20:27+0100\n" "Last-Translator: Mikel Olasagasti <hey_neken@mundurat.net>\n" "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n" diff --git a/gl/po/fi.po b/gl/po/fi.po index f7accabe..6f2da2a3 100644 --- a/gl/po/fi.po +++ b/gl/po/fi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-12-26 12:28+0200\n" "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" diff --git a/gl/po/fr.po b/gl/po/fr.po index 9144eac8..80436a05 100644 --- a/gl/po/fr.po +++ b/gl/po/fr.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-05-21 20:15+0200\n" "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n" "Language-Team: French <traduc@traduc.org>\n" diff --git a/gl/po/ga.po b/gl/po/ga.po index e9de21a6..6c06a6c0 100644 --- a/gl/po/ga.po +++ b/gl/po/ga.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 1.1\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2007-07-20 12:24-0600\n" "Last-Translator: Kevin Scannell <kscanne@gmail.com>\n" "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n" diff --git a/gl/po/gl.po b/gl/po/gl.po index 2ea167fa..d57501c1 100644 --- a/gl/po/gl.po +++ b/gl/po/gl.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2012-11-11 13:26+0200\n" "Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n" "Language-Team: Galician <proxecto@trasno.net>\n" diff --git a/gl/po/hu.po b/gl/po/hu.po index 21ef6fc0..ece522ef 100644 --- a/gl/po/hu.po +++ b/gl/po/hu.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2014-06-25 19:51+0200\n" "Last-Translator: Balázs Úr <urbalazs@gmail.com>\n" "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n" diff --git a/gl/po/it.po b/gl/po/it.po index e0fb00f6..5e54d69c 100644 --- a/gl/po/it.po +++ b/gl/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-05-21 14:07+0200\n" "Last-Translator: Milo Casagrande <milo@milo.name>\n" "Language-Team: Italian <tp@lists.linux.it>\n" diff --git a/gl/po/ja.po b/gl/po/ja.po index 5410dd65..8e25cbba 100644 --- a/gl/po/ja.po +++ b/gl/po/ja.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2011-09-02 18:39+0900\n" "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" diff --git a/gl/po/ko.po b/gl/po/ko.po index 2b1fda6c..69356a8d 100644 --- a/gl/po/ko.po +++ b/gl/po/ko.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU textutils 2.0.22\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2002-07-22 20:02+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <translation-team-ko@lists.sourceforge.net>\n" diff --git a/gl/po/man-db-gnulib.pot b/gl/po/man-db-gnulib.pot index c739083b..1abc2267 100644 --- a/gl/po/man-db-gnulib.pot +++ b/gl/po/man-db-gnulib.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: man-db 2.10.2\n" +"Project-Id-Version: man-db 2.11.0\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/gl/po/ms.po b/gl/po/ms.po index 30c0188b..b3c4536e 100644 --- a/gl/po/ms.po +++ b/gl/po/ms.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.0.90\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2003-08-10 16:00+0800\n" "Last-Translator: Hasbullah Bin Pit <sebol@ikhlas.com>\n" "Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n" diff --git a/gl/po/nb.po b/gl/po/nb.po index 19df6a02..49db19c0 100644 --- a/gl/po/nb.po +++ b/gl/po/nb.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU textutils 2.0.20\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2002-01-27 21:35+0100\n" "Last-Translator: Eivind Tagseth <eivindt@multinet.no>\n" "Language-Team: Norwegian <i18n-nb@lister.ping.uio.no>\n" diff --git a/gl/po/nl.po b/gl/po/nl.po index f253b1fa..261c8160 100644 --- a/gl/po/nl.po +++ b/gl/po/nl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-05-29 13:31+0200\n" "Last-Translator: Benno Schulenberg <vertaling@coevern.nl>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" diff --git a/gl/po/pl.po b/gl/po/pl.po index 344b61ab..1d404f4a 100644 --- a/gl/po/pl.po +++ b/gl/po/pl.po @@ -11,7 +11,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-05-19 20:02+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" diff --git a/gl/po/pt.po b/gl/po/pt.po index b8eebd7b..0af291f8 100644 --- a/gl/po/pt.po +++ b/gl/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-05-26 10:40+0100\n" "Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n" "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n" diff --git a/gl/po/pt_BR.po b/gl/po/pt_BR.po index 18b9b8c8..738e41e9 100644 --- a/gl/po/pt_BR.po +++ b/gl/po/pt_BR.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-08-28 15:29-0300\n" "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." diff --git a/gl/po/ro.po b/gl/po/ro.po index c7f9c1cb..0d3fff19 100644 --- a/gl/po/ro.po +++ b/gl/po/ro.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2022-02-19 23:11+0100\n" "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" diff --git a/gl/po/ru.po b/gl/po/ru.po index b125b96c..42b0d67b 100644 --- a/gl/po/ru.po +++ b/gl/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-05-21 18:46+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <gnu@d07.ru>\n" diff --git a/gl/po/rw.po b/gl/po/rw.po index 4f67b440..f31c0ea2 100644 --- a/gl/po/rw.po +++ b/gl/po/rw.po @@ -16,7 +16,7 @@ msgid "" msgstr "" "Project-Id-Version: mailutils 0.6\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2005-04-04 10:55-0700\n" "Last-Translator: Steven Michael Murphy <murf@e-tools.com>\n" "Language-Team: Kinyarwanda <translation-team-rw@lists.sourceforge.net>\n" diff --git a/gl/po/sk.po b/gl/po/sk.po index 00267205..990af8f4 100644 --- a/gl/po/sk.po +++ b/gl/po/sk.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: textutils 2.0.14\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2001-06-08 22:10 +02:00\n" "Last-Translator: Stanislav Meduna <stano@trillian.eunet.sk>\n" "Language-Team: Slovak <sk-i18n@rak.isternet.sk>\n" diff --git a/gl/po/sl.po b/gl/po/sl.po index f51116fb..94512a2c 100644 --- a/gl/po/sl.po +++ b/gl/po/sl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2012-05-20 13:08+0200\n" "Last-Translator: Primož Peterlin <primozz.peterlin@gmail.com>\n" "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n" diff --git a/gl/po/sr.po b/gl/po/sr.po index 84ed5e69..e63a34db 100644 --- a/gl/po/sr.po +++ b/gl/po/sr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2020-04-20 09:38+0200\n" "Last-Translator: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" diff --git a/gl/po/sv.po b/gl/po/sv.po index 4fba6689..aa0f9cc9 100644 --- a/gl/po/sv.po +++ b/gl/po/sv.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2020-05-28 21:40+0200\n" "Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n" "Language-Team: Swedish <tp-sv-list@lists.sourceforge.net>\n" diff --git a/gl/po/tr.po b/gl/po/tr.po index dc745541..1aec32a9 100644 --- a/gl/po/tr.po +++ b/gl/po/tr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: coreutils 5.3.0\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2005-03-14 04:17+0200\n" "Last-Translator: Deniz Akkus Kanca <deniz@arayan.com>\n" "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" diff --git a/gl/po/uk.po b/gl/po/uk.po index f6200e9c..1b962c31 100644 --- a/gl/po/uk.po +++ b/gl/po/uk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-05-19 14:26+0300\n" "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n" "Language-Team: Ukrainian <trans-uk@lists.fedoraproject.org>\n" diff --git a/gl/po/vi.po b/gl/po/vi.po index 5c825559..7c49aba6 100644 --- a/gl/po/vi.po +++ b/gl/po/vi.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib-3.0.0.6062.a6b16\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2014-01-13 08:31+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" diff --git a/gl/po/zh_CN.po b/gl/po/zh_CN.po index 0be59fbd..ab4db33b 100644 --- a/gl/po/zh_CN.po +++ b/gl/po/zh_CN.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 2.0.0.3462.e9796\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2010-02-26 09:54+0800\n" "Last-Translator: Ji ZhengYu <zhengyuji@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" diff --git a/gl/po/zh_TW.po b/gl/po/zh_TW.po index d7003626..989f162b 100644 --- a/gl/po/zh_TW.po +++ b/gl/po/zh_TW.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: gnulib 4.0.0.2567\n" "Report-Msgid-Bugs-To: bug-gnulib@gnu.org\n" -"POT-Creation-Date: 2022-03-17 18:46+0000\n" +"POT-Creation-Date: 2022-10-15 13:44+0000\n" "PO-Revision-Date: 2019-12-15 13:01+0800\n" "Last-Translator: pan93412 <pan93412@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n" diff --git a/include/manconfig.h b/include/manconfig.h index 056d4df6..0baa4412 100644 --- a/include/manconfig.h +++ b/include/manconfig.h @@ -148,21 +148,6 @@ extern int _nl_msg_cat_cntr; # define locale_changed() #endif /* ENABLE_NLS */ -struct compression { - /* The following are const because they should be pointers to parts - * of strings allocated elsewhere and should not be written through - * or freed themselves. - */ - const char *prog; - const char *ext; - /* The following should be freed when discarding an instance of this - * structure. - */ - char *stem; -}; - -extern struct compression comp_list[]; - extern int quiet; /* be quiet(er) if 1 */ /*--------------------------*/ @@ -203,4 +188,14 @@ extern int quiet; /* be quiet(er) if 1 */ #define VER_KEY "$version$" /* version key */ #define VER_ID "2.5.0" /* version content */ +/* Macros for argp option handling. */ + +#define OPT(name, key, arg, ...) {name, key, arg, 0, __VA_ARGS__} +#define OPT_FULL(name, key, arg, flags, ...) {name, key, arg, flags, __VA_ARGS__} +#define OPT_ALIAS(name, key) {name, key, 0, OPTION_ALIAS} +#define OPT_HIDDEN(name, key) {name, key, 0, OPTION_HIDDEN} +#define OPT_GROUP_HEADER(doc, group) {0, 0, 0, 0, doc, group} +/* compatibility for --help */ +#define OPT_HELP_COMPAT OPT_HIDDEN(0, 'h') + #endif /* MANCONFIG_H */ diff --git a/init/Makefile.in b/init/Makefile.in index 4782e03b..1edde3e0 100644 --- a/init/Makefile.in +++ b/init/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -406,6 +408,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -426,6 +429,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -717,6 +721,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -845,6 +850,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1022,6 +1028,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1177,6 +1184,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1212,6 +1220,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1248,6 +1257,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/init/systemd/Makefile.in b/init/systemd/Makefile.in index 05f59d2a..4a99af84 100644 --- a/init/systemd/Makefile.in +++ b/init/systemd/Makefile.in @@ -213,6 +213,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -224,8 +225,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -233,7 +234,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -252,6 +253,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -384,6 +386,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -404,6 +407,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -695,6 +699,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -823,6 +828,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1000,6 +1006,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1155,6 +1162,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1190,6 +1198,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1226,6 +1235,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/lib/Makefile.am b/lib/Makefile.am index 49f7809f..8623ea44 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -36,12 +36,16 @@ libman_la_SOURCES = \ appendstr.h \ cleanup.c \ cleanup.h \ + compression.c \ + compression.h \ debug.c \ debug.h \ encodings.c \ encodings.h \ fatal.c \ fatal.h \ + filenames.c \ + filenames.h \ glcontainers.c \ glcontainers.h \ linelength.c \ diff --git a/lib/Makefile.in b/lib/Makefile.in index d05eec68..1a54f1a2 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -213,6 +213,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -224,8 +225,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -233,7 +234,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -252,6 +253,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -312,11 +314,12 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) libman_la_DEPENDENCIES = ../gl/lib/libgnu.la $(LTLIBOBJS) am_libman_la_OBJECTS = libman_la-appendstr.lo libman_la-cleanup.lo \ - libman_la-debug.lo libman_la-encodings.lo libman_la-fatal.lo \ - libman_la-glcontainers.lo libman_la-linelength.lo \ - libman_la-orderfiles.lo libman_la-pathsearch.lo \ - libman_la-sandbox.lo libman_la-security.lo \ - libman_la-tempfile.lo libman_la-util.lo \ + libman_la-compression.lo libman_la-debug.lo \ + libman_la-encodings.lo libman_la-fatal.lo \ + libman_la-filenames.lo libman_la-glcontainers.lo \ + libman_la-linelength.lo libman_la-orderfiles.lo \ + libman_la-pathsearch.lo libman_la-sandbox.lo \ + libman_la-security.lo libman_la-tempfile.lo libman_la-util.lo \ libman_la-wordfnmatch.lo libman_la-xregcomp.lo libman_la_OBJECTS = $(am_libman_la_OBJECTS) AM_V_lt = $(am__v_lt_@AM_V@) @@ -343,9 +346,11 @@ depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/libman_la-appendstr.Plo \ ./$(DEPDIR)/libman_la-cleanup.Plo \ + ./$(DEPDIR)/libman_la-compression.Plo \ ./$(DEPDIR)/libman_la-debug.Plo \ ./$(DEPDIR)/libman_la-encodings.Plo \ ./$(DEPDIR)/libman_la-fatal.Plo \ + ./$(DEPDIR)/libman_la-filenames.Plo \ ./$(DEPDIR)/libman_la-glcontainers.Plo \ ./$(DEPDIR)/libman_la-linelength.Plo \ ./$(DEPDIR)/libman_la-orderfiles.Plo \ @@ -451,6 +456,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -471,6 +477,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -762,6 +769,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -890,6 +898,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1067,6 +1076,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1222,6 +1232,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1257,6 +1268,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1293,6 +1305,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ @@ -1658,12 +1671,16 @@ libman_la_SOURCES = \ appendstr.h \ cleanup.c \ cleanup.h \ + compression.c \ + compression.h \ debug.c \ debug.h \ encodings.c \ encodings.h \ fatal.c \ fatal.h \ + filenames.c \ + filenames.h \ glcontainers.c \ glcontainers.h \ linelength.c \ @@ -1775,9 +1792,11 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libman_la-appendstr.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libman_la-cleanup.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libman_la-compression.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libman_la-debug.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libman_la-encodings.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libman_la-fatal.Plo@am__quote@ # am--include-marker +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libman_la-filenames.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libman_la-glcontainers.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libman_la-linelength.Plo@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libman_la-orderfiles.Plo@am__quote@ # am--include-marker @@ -1830,6 +1849,13 @@ libman_la-cleanup.lo: cleanup.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libman_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libman_la-cleanup.lo `test -f 'cleanup.c' || echo '$(srcdir)/'`cleanup.c +libman_la-compression.lo: compression.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libman_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libman_la-compression.lo -MD -MP -MF $(DEPDIR)/libman_la-compression.Tpo -c -o libman_la-compression.lo `test -f 'compression.c' || echo '$(srcdir)/'`compression.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libman_la-compression.Tpo $(DEPDIR)/libman_la-compression.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='compression.c' object='libman_la-compression.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libman_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libman_la-compression.lo `test -f 'compression.c' || echo '$(srcdir)/'`compression.c + libman_la-debug.lo: debug.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libman_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libman_la-debug.lo -MD -MP -MF $(DEPDIR)/libman_la-debug.Tpo -c -o libman_la-debug.lo `test -f 'debug.c' || echo '$(srcdir)/'`debug.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libman_la-debug.Tpo $(DEPDIR)/libman_la-debug.Plo @@ -1851,6 +1877,13 @@ libman_la-fatal.lo: fatal.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libman_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libman_la-fatal.lo `test -f 'fatal.c' || echo '$(srcdir)/'`fatal.c +libman_la-filenames.lo: filenames.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libman_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libman_la-filenames.lo -MD -MP -MF $(DEPDIR)/libman_la-filenames.Tpo -c -o libman_la-filenames.lo `test -f 'filenames.c' || echo '$(srcdir)/'`filenames.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libman_la-filenames.Tpo $(DEPDIR)/libman_la-filenames.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='filenames.c' object='libman_la-filenames.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libman_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libman_la-filenames.lo `test -f 'filenames.c' || echo '$(srcdir)/'`filenames.c + libman_la-glcontainers.lo: glcontainers.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libman_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libman_la-glcontainers.lo -MD -MP -MF $(DEPDIR)/libman_la-glcontainers.Tpo -c -o libman_la-glcontainers.lo `test -f 'glcontainers.c' || echo '$(srcdir)/'`glcontainers.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libman_la-glcontainers.Tpo $(DEPDIR)/libman_la-glcontainers.Plo @@ -2056,9 +2089,11 @@ clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ distclean: distclean-am -rm -f ./$(DEPDIR)/libman_la-appendstr.Plo -rm -f ./$(DEPDIR)/libman_la-cleanup.Plo + -rm -f ./$(DEPDIR)/libman_la-compression.Plo -rm -f ./$(DEPDIR)/libman_la-debug.Plo -rm -f ./$(DEPDIR)/libman_la-encodings.Plo -rm -f ./$(DEPDIR)/libman_la-fatal.Plo + -rm -f ./$(DEPDIR)/libman_la-filenames.Plo -rm -f ./$(DEPDIR)/libman_la-glcontainers.Plo -rm -f ./$(DEPDIR)/libman_la-linelength.Plo -rm -f ./$(DEPDIR)/libman_la-orderfiles.Plo @@ -2116,9 +2151,11 @@ installcheck-am: maintainer-clean: maintainer-clean-am -rm -f ./$(DEPDIR)/libman_la-appendstr.Plo -rm -f ./$(DEPDIR)/libman_la-cleanup.Plo + -rm -f ./$(DEPDIR)/libman_la-compression.Plo -rm -f ./$(DEPDIR)/libman_la-debug.Plo -rm -f ./$(DEPDIR)/libman_la-encodings.Plo -rm -f ./$(DEPDIR)/libman_la-fatal.Plo + -rm -f ./$(DEPDIR)/libman_la-filenames.Plo -rm -f ./$(DEPDIR)/libman_la-glcontainers.Plo -rm -f ./$(DEPDIR)/libman_la-linelength.Plo -rm -f ./$(DEPDIR)/libman_la-orderfiles.Plo @@ -2,10 +2,12 @@ These library source files have various authors and specific licenses, but may all be used as part of a complete work that is distributed under the terms of the GNU General Public License version 2 or later. -See the files ../COPYING and ../COPYING.LIB for relevant information. +See the files ../docs/COPYING.GPLv2 and ../docs/COPYING.LIB for relevant +information. appendstr.* author - Markus Armbruster cleanup.* author - Markus Armbruster, Colin Watson +compression.* author - Wilf., Colin Watson debug.* author - Colin Watson encodings.* author - Colin Watson glcontainers.* author - Colin Watson diff --git a/lib/appendstr.c b/lib/appendstr.c index 21cdae1f..3be8bff4 100644 --- a/lib/appendstr.c +++ b/lib/appendstr.c @@ -12,7 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; see the file COPYING.LIB. If not, write + along with this program; see the file docs/COPYING.LIB. If not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ diff --git a/lib/appendstr.h b/lib/appendstr.h index 30b18b81..9875faa1 100644 --- a/lib/appendstr.h +++ b/lib/appendstr.h @@ -14,7 +14,7 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING.LIB. If not, write + * along with this program; see the file docs/COPYING.LIB. If not, write * to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA * 02139, USA. */ diff --git a/lib/cleanup.c b/lib/cleanup.c index b122de82..42b603b0 100644 --- a/lib/cleanup.c +++ b/lib/cleanup.c @@ -14,7 +14,7 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. If not, + * License along with this library; see the file docs/COPYING.LIB. If not, * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth * Floor, Boston, MA 02110-1301 USA. */ @@ -23,6 +23,7 @@ # include "config.h" #endif /* HAVE_CONFIG_H */ +#include <stdbool.h> #include <stdlib.h> #include <stdio.h> /* SunOS's loosing assert.h needs it */ #include <assert.h> @@ -41,7 +42,9 @@ /* saved signal actions */ +#ifdef SIGHUP static struct sigaction saved_hup_action; +#endif /* SIGHUP */ static struct sigaction saved_int_action; static struct sigaction saved_term_action; @@ -53,7 +56,7 @@ sighandler (int signo) struct sigaction act; sigset_t set; - do_cleanups_sigsafe (1); + do_cleanups_sigsafe (true); /* set default signal action */ memset (&act, 0, sizeof act); @@ -107,9 +110,13 @@ trap_signal (int signo, struct sigaction *oldact) static int trap_abnormal_exits (void) { - if ( trap_signal (SIGHUP, &saved_hup_action) - || trap_signal (SIGINT, &saved_int_action) - || trap_signal (SIGTERM, &saved_term_action)) +#ifdef SIGHUP + if (trap_signal (SIGHUP, &saved_hup_action)) + return -1; +#endif /* SIGHUP */ + if (trap_signal (SIGINT, &saved_int_action)) + return -1; + if (trap_signal (SIGTERM, &saved_term_action)) return -1; return 0; } @@ -137,9 +144,13 @@ untrap_signal (int signo, struct sigaction *oldact) static int untrap_abnormal_exits (void) { - if ( untrap_signal (SIGHUP, &saved_hup_action) - | untrap_signal (SIGINT, &saved_int_action) - | untrap_signal (SIGTERM, &saved_term_action)) +#ifdef SIGHUP + if (untrap_signal (SIGHUP, &saved_hup_action)) + return -1; +#endif /* SIGHUP */ + if (untrap_signal (SIGINT, &saved_int_action)) + return -1; + if (untrap_signal (SIGTERM, &saved_term_action)) return -1; return 0; } @@ -164,7 +175,7 @@ static unsigned tos = 0; /* top of stack, 0 <= tos <= nslots */ * called. */ void -do_cleanups_sigsafe (int in_sighandler) +do_cleanups_sigsafe (bool in_sighandler) { unsigned i; @@ -180,7 +191,7 @@ do_cleanups_sigsafe (int in_sighandler) void do_cleanups (void) { - do_cleanups_sigsafe (0); + do_cleanups_sigsafe (false); tos = 0; nslots = 0; free (stack); @@ -197,14 +208,14 @@ do_cleanups (void) int push_cleanup (cleanup_fun fun, void *arg, int sigsafe) { - static int handler_installed = 0; + static bool handler_installed = false; assert (tos <= nslots); if (!handler_installed) { if (atexit (do_cleanups)) return -1; - handler_installed = 1; + handler_installed = true; } if (tos == nslots) { diff --git a/lib/cleanup.h b/lib/cleanup.h index 555900db..5415b7f1 100644 --- a/lib/cleanup.h +++ b/lib/cleanup.h @@ -14,7 +14,7 @@ * Library General Public License for more details. * * You should have received a copy of the GNU Library General Public - * License along with this library; see the file COPYING.LIB. If not, + * License along with this library; see the file docs/COPYING.LIB. If not, * write to the Free Software Foundation, Inc., 51 Franklin St, Fifth * Floor, Boston, MA 02110-1301 USA. */ @@ -22,9 +22,11 @@ #ifndef _CLEANUP_H #define _CLEANUP_H +#include <stdbool.h> + typedef void (*cleanup_fun) (void *); -extern void do_cleanups_sigsafe (int); +extern void do_cleanups_sigsafe (bool); extern void do_cleanups (void); extern int push_cleanup (cleanup_fun, void *, int); extern void pop_cleanup (cleanup_fun, void *); diff --git a/include/comp_src.h b/lib/compression.c index 2be2614b..fe4696c0 100644 --- a/include/comp_src.h +++ b/lib/compression.c @@ -1,8 +1,8 @@ /* - * comp_src.h: structure used by decompress.c + * compression.c: code to find decompressor / compression extension * - * Copyright (C) 1994 Graeme W. Wilford. (Wilf.) - * Copyright (C) 2003-2022 Colin Watson. + * Copyright (C) 1994, 1995 Graeme W. Wilford. (Wilf.) + * Copyright (C) 2001-2022 Colin Watson. * * This file is part of man-db. * @@ -20,9 +20,34 @@ * along with man-db; if not, write to the Free Software Foundation, * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * - * Sat Oct 29 13:09:31 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) + * Sat Aug 20 15:01:02 BST 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif /* HAVE_CONFIG_H */ + +#include <assert.h> +#include <stdbool.h> +#include <stdio.h> +#include <errno.h> +#include <signal.h> +#include <string.h> +#include <stdlib.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> + +#include "error.h" +#include "xstrndup.h" +#include "xvasprintf.h" + +#include "manconfig.h" + +#include "appendstr.h" +#include "compression.h" + /*--------------------------------------------------------------------------*/ /* This is where we define the decompressors used to decompress any nroff */ /* source that we find. All cat pages are compressed with either gzip (if */ @@ -39,9 +64,6 @@ /* {"/usr/bin/foobar -d", "fb", NULL}, */ /*--------------------------------------------------------------------------*/ -#ifndef MAN_COMP_SRC_H -#define MAN_COMP_SRC_H - struct compression comp_list[] = { /* If we have gzip, incorporate the following */ @@ -87,8 +109,6 @@ struct compression comp_list[] = { /* Add your decompressor(s) and extension(s) below here */ /*------------------------------------------------------*/ - - /*----------------*/ /* and above here */ /*----------------*/ @@ -97,4 +117,79 @@ struct compression comp_list[] = { {NULL, NULL, NULL} }; -#endif /* MAN_COMP_SRC_H */ +/* Take filename as arg, return structure containing decompressor + and extension, or NULL if no comp extension found. + If want_stem, set comp->stem to the filename without extension, which + the caller should free. + + eg. + filename = /usr/man/man1/foo.1.gz + + comp->prog = "/usr/bin/gzip -dc"; + comp->ext = "gz"; + comp->stem = "/usr/man/man1/foo.1"; + */ +struct compression *comp_info (const char *filename, bool want_stem) +{ + const char *ext; + static struct compression hpux_comp = + {PROG_GUNZIP " -S \"\"", "", NULL}; + + ext = strrchr (filename, '.'); + + if (ext) { + struct compression *comp; + for (comp = comp_list; comp->ext; comp++) { + if (strcmp (comp->ext, ext + 1) == 0) { + if (want_stem) + comp->stem = xstrndup (filename, + ext - filename); + else + comp->stem = NULL; + return comp; + } + } + } + + if (*PROG_GUNZIP) { + ext = strstr (filename, ".Z/"); + if (ext) { + if (want_stem) + hpux_comp.stem = xstrndup (filename, + ext - filename); + else + hpux_comp.stem = NULL; + return &hpux_comp; + } + } + + return NULL; +} + +/* take filename w/o comp ext. as arg, return comp->stem as a relative + compressed file or NULL if none found */ +struct compression *comp_file (const char *filename) +{ + size_t len; + char *compfile; + struct compression *comp; + + compfile = xasprintf ("%s.", filename); + assert (compfile); + len = strlen (compfile); + + for (comp = comp_list; comp->ext; comp++) { + struct stat buf; + + compfile = appendstr (compfile, comp->ext, (void *) 0); + + if (stat (compfile, &buf) == 0) { + comp->stem = compfile; + return comp; + } + + *(compfile + len) = '\0'; + } + free (compfile); + return NULL; +} diff --git a/src/compression.h b/lib/compression.h index 3ff0f895..52ede354 100644 --- a/src/compression.h +++ b/lib/compression.h @@ -21,5 +21,22 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -extern struct compression *comp_info (const char *filename, int want_stem); +#include <stdbool.h> + +struct compression { + /* The following are const because they should be pointers to parts + * of strings allocated elsewhere and should not be written through + * or freed themselves. + */ + const char *prog; + const char *ext; + /* The following should be freed when discarding an instance of this + * structure. + */ + char *stem; +}; + +extern struct compression comp_list[]; + +extern struct compression *comp_info (const char *filename, bool want_stem); extern struct compression *comp_file (const char *filename); diff --git a/lib/encodings.c b/lib/encodings.c index 1f8dae10..68c06c65 100644 --- a/lib/encodings.c +++ b/lib/encodings.c @@ -590,7 +590,8 @@ out: /* Can we take this input encoding and produce this output encoding, perhaps * with the help of some iconv pipes? */ -static bool compatible_encodings (const char *input, const char *output) +static bool ATTRIBUTE_PURE compatible_encodings (const char *input, + const char *output) { if (STREQ (input, output)) return true; diff --git a/src/filenames.c b/lib/filenames.c index cbeb49cc..5e592c39 100644 --- a/src/filenames.c +++ b/lib/filenames.c @@ -25,10 +25,12 @@ # include "config.h" #endif /* HAVE_CONFIG_H */ -#include <string.h> +#include <stdbool.h> #include <stdlib.h> +#include <string.h> #include <unistd.h> +#include "dirname.h" #include "error.h" #include "xalloc.h" #include "xvasprintf.h" @@ -39,18 +41,13 @@ #include "manconfig.h" #include "appendstr.h" -#include "debug.h" - -#include "db_storage.h" - #include "compression.h" +#include "debug.h" #include "filenames.h" static void gripe_bogus_manpage (const char *manpage) { - if (quiet < 2) - error (0, 0, _("warning: %s: ignoring bogus filename"), - manpage); + error (0, 0, _("warning: %s: ignoring bogus filename"), manpage); } char *make_filename (const char *path, const char *name, @@ -77,7 +74,7 @@ char *make_filename (const char *path, const char *name, /* Fill in a mandata structure with information about a file name. * file is the name to examine. info points to the structure to be filled - * in. req_name is the page name that was requested. + * in. * * Returns either a pointer to the buffer which the fields in info point * into, to be freed by the caller, or NULL on error. The buffer will @@ -86,70 +83,83 @@ char *make_filename (const char *path, const char *name, * optionally the compression extension. * * Only the fields name, ext, sec, and comp are filled in by this function. - * name is only set if it differs from req_name; otherwise it remains at - * NULL. */ -char *filename_info (const char *file, struct mandata *info, - const char *req_name) +struct mandata *filename_info (const char *file, bool warn_if_bogus) { - char *manpage = xstrdup (file); - char *slash = strrchr (manpage, '/'); - char *base_name; + struct mandata *info; + char *basename, *dirname; struct compression *comp; - memset (info, 0, sizeof (struct mandata)); + info = XZALLOC (struct mandata); - if (slash) { - *slash = '\0'; /* strip '/base_name' */ - base_name = slash + 1; - } else - base_name = manpage; + basename = base_name (file); /* Bogus files either have (i) no period, ie no extension, (ii) a compression extension, but no sectional extension, (iii) a missmatch between the section they are under and the sectional part of their extension. */ - comp = comp_info (base_name, 1); + comp = comp_info (basename, true); if (comp) { - info->comp = comp->ext; - *(base_name + strlen (comp->stem)) = '\0'; + info->comp = xstrdup (comp->ext); + *(basename + strlen (comp->stem)) = '\0'; free (comp->stem); } else info->comp = NULL; { - char *ext = strrchr (base_name, '.'); + char *ext = strrchr (basename, '.'); if (!ext) { /* no section extension */ - gripe_bogus_manpage (file); - free (manpage); + if (warn_if_bogus) + gripe_bogus_manpage (file); + free (basename); + free_mandata_struct (info); return NULL; } *ext++ = '\0'; /* set section ext */ - info->ext = ext; + info->ext = xstrdup (ext); if (!*info->ext) { /* zero-length section extension */ - gripe_bogus_manpage (file); - free (manpage); + if (warn_if_bogus) + gripe_bogus_manpage (file); + free (basename); + free_mandata_struct (info); return NULL; } } - info->sec = strrchr (manpage, '/') + 4; /* set section name */ + /* Set section name. */ + dirname = dir_name (file); + info->sec = xstrdup (strrchr (dirname, '/') + 4); + free (dirname); if (strlen (info->sec) >= 1 && strlen (info->ext) >= 1 && info->sec[0] != info->ext[0]) { /* mismatch in section */ - gripe_bogus_manpage (file); - free (manpage); + if (warn_if_bogus) + gripe_bogus_manpage (file); + free (basename); + free_mandata_struct (info); return NULL; } - if (req_name && !STREQ (base_name, req_name)) - info->name = xstrdup (base_name); - else - info->name = NULL; + info->name = xstrdup (basename); - return manpage; + return info; +} + +/* Free a mandata structure and its elements. */ +void free_mandata_struct (struct mandata *pinfo) +{ + if (pinfo) { + free (pinfo->name); + free (pinfo->ext); + free (pinfo->sec); + free (pinfo->pointer); + free (pinfo->comp); + free (pinfo->filter); + free (pinfo->whatis); + } + free (pinfo); } diff --git a/src/filenames.h b/lib/filenames.h index d7fd8a13..66bc48aa 100644 --- a/src/filenames.h +++ b/lib/filenames.h @@ -1,7 +1,7 @@ /* * filenames.h: Interface to composing and dissecting man page file names * - * Copyright (C) 2001, 2002 Colin Watson. + * Copyright (C) 2001-2022 Colin Watson. * * This file is part of man-db. * @@ -20,9 +20,37 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "db_storage.h" +#ifndef MAN_FILENAMES_H +#define MAN_FILENAMES_H + +#include <stdbool.h> + +#include "timespec.h" + +struct mandata { + /* Name of page, if not equal to the key. */ + char *name; + /* Filename extension without compression extension. */ + char *ext; + /* Section name/number. */ + char *sec; + /* ID (i.e. type) of this entry. */ + char id; + /* ID-related file pointer. */ + char *pointer; + /* Compression extension. */ + char *comp; + /* Filters needed for the page. */ + char *filter; + /* Whatis description for the page. */ + char *whatis; + /* Modification time for file. */ + struct timespec mtime; +}; extern char *make_filename (const char *path, const char *name, struct mandata *in, const char *type); -extern char *filename_info (const char *file, struct mandata *info, - const char *req_name); +extern struct mandata *filename_info (const char *file, bool warn_if_bogus); +extern void free_mandata_struct (struct mandata *pinfo); + +#endif /* MAN_FILENAMES_H */ diff --git a/lib/sandbox.c b/lib/sandbox.c index bfda5e30..f891e533 100644 --- a/lib/sandbox.c +++ b/lib/sandbox.c @@ -83,7 +83,7 @@ struct man_sandbox { }; #ifdef HAVE_LIBSECCOMP -static int seccomp_filter_unavailable = 0; +static bool seccomp_filter_unavailable = false; static void gripe_seccomp_filter_unavailable (void) { @@ -231,7 +231,7 @@ static bool can_load_seccomp (void) * files. Confining these further requires additional tools that can do * path-based filtering or similar, such as AppArmor. */ -static scmp_filter_ctx make_seccomp_filter (int permissive) +static scmp_filter_ctx make_seccomp_filter (bool permissive) { scmp_filter_ctx ctx; mode_t mode_mask = S_ISUID | S_ISGID | S_IXUSR | S_IXGRP | S_IXOTH; @@ -244,7 +244,8 @@ static scmp_filter_ctx make_seccomp_filter (int permissive) if (!can_load_seccomp ()) return NULL; - debug ("initialising seccomp filter (permissive: %d)\n", permissive); + debug ("initialising seccomp filter (permissive: %d)\n", + (int) permissive); ctx = seccomp_init (SCMP_ACT_ERRNO (ENOSYS)); if (!ctx) fatal (errno, "can't initialise seccomp filter"); @@ -583,8 +584,8 @@ man_sandbox *sandbox_init (void) man_sandbox *sandbox = XZALLOC (man_sandbox); #ifdef HAVE_LIBSECCOMP - sandbox->ctx = make_seccomp_filter (0); - sandbox->permissive_ctx = make_seccomp_filter (1); + sandbox->ctx = make_seccomp_filter (false); + sandbox->permissive_ctx = make_seccomp_filter (true); #else /* !HAVE_LIBSECCOMP */ sandbox->dummy = 0; #endif /* HAVE_LIBSECCOMP */ @@ -593,7 +594,7 @@ man_sandbox *sandbox_init (void) } #ifdef HAVE_LIBSECCOMP -static void _sandbox_load (man_sandbox *sandbox, int permissive) { +static void _sandbox_load (man_sandbox *sandbox, bool permissive) { if (can_load_seccomp ()) { scmp_filter_ctx ctx; @@ -604,7 +605,7 @@ static void _sandbox_load (man_sandbox *sandbox, int permissive) { if (!ctx) return; debug ("loading seccomp filter (permissive: %d)\n", - permissive); + (int) permissive); if (seccomp_load (ctx) < 0) { if (errno == EINVAL || errno == EFAULT) { /* The kernel doesn't give us particularly @@ -619,7 +620,7 @@ static void _sandbox_load (man_sandbox *sandbox, int permissive) { */ gripe_seccomp_filter_unavailable (); /* Don't try this again. */ - seccomp_filter_unavailable = 1; + seccomp_filter_unavailable = true; } else fatal (errno, "can't load seccomp filter"); } @@ -627,7 +628,7 @@ static void _sandbox_load (man_sandbox *sandbox, int permissive) { } #else /* !HAVE_LIBSECCOMP */ static void _sandbox_load (man_sandbox *sandbox MAYBE_UNUSED, - int permissive MAYBE_UNUSED) + bool permissive MAYBE_UNUSED) { } #endif /* HAVE_LIBSECCOMP */ @@ -637,7 +638,7 @@ void sandbox_load (void *data) { man_sandbox *sandbox = data; - _sandbox_load (sandbox, 0); + _sandbox_load (sandbox, false); } /* Enter a sandbox for processing untrusted data, allowing limited file @@ -647,7 +648,7 @@ void sandbox_load_permissive (void *data) { man_sandbox *sandbox = data; - _sandbox_load (sandbox, 1); + _sandbox_load (sandbox, true); } /* Free a sandbox for processing untrusted data. */ diff --git a/lib/security.c b/lib/security.c index ab17da91..92cccc39 100644 --- a/lib/security.c +++ b/lib/security.c @@ -140,7 +140,6 @@ void drop_effective_privs (void) } priv_drop_count++; - debug ("++priv_drop_count = %d\n", priv_drop_count); #endif /* MAN_OWNER */ } @@ -153,7 +152,6 @@ void regain_effective_privs (void) #ifdef MAN_OWNER if (priv_drop_count) { priv_drop_count--; - debug ("--priv_drop_count = %d\n", priv_drop_count); if (priv_drop_count) return; } diff --git a/lib/security.h b/lib/security.h index fdfadc4d..3edf50b4 100644 --- a/lib/security.h +++ b/lib/security.h @@ -23,7 +23,9 @@ */ #include <stdbool.h> -#include <pwd.h> +#ifdef MAN_OWNER +# include <pwd.h> +#endif /* MAN_OWNER */ /* security.c */ extern void drop_effective_privs (void); diff --git a/lib/tempfile.c b/lib/tempfile.c index f4a291c1..5d8847c6 100644 --- a/lib/tempfile.c +++ b/lib/tempfile.c @@ -25,21 +25,32 @@ #endif /* HAVE_CONFIG_H */ #include <assert.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> +#include "attribute.h" #include "xvasprintf.h" #include "manconfig.h" #include "tempfile.h" +static bool ATTRIBUTE_PURE running_setid (void) +{ +#ifdef HAVE_GETUID + return getuid () != geteuid () || getgid () != getegid (); +#else /* !HAVE_GETUID */ + return false; +#endif /* HAVE_GETUID */ +} + static const char *path_search (void) { const char *dir = NULL; - if (getuid () == geteuid () && getgid () == getegid ()) { + if (running_setid ()) { dir = getenv ("TMPDIR"); if (!dir || !CAN_ACCESS (dir, W_OK)) dir = NULL; @@ -36,6 +36,7 @@ #endif /* HAVE_CONFIG_H */ #include <assert.h> +#include <stdbool.h> #include <string.h> #include <stdlib.h> #include <stdio.h> @@ -154,7 +155,7 @@ char *escape_shell (const char *unesc) /* Remove a directory and all files in it. Only recurse beyond that if * RECURSE is set. */ -int remove_directory (const char *directory, int recurse) +int remove_directory (const char *directory, bool recurse) { DIR *handle = opendir (directory); struct dirent *entry; @@ -22,10 +22,12 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdbool.h> + extern int is_changed (const char *fa, const char *fb); extern int is_directory (const char *path); extern char *escape_shell (const char *unesc); -extern int remove_directory (const char *directory, int recurse); +extern int remove_directory (const char *directory, bool recurse); extern char *trim_spaces (const char *s); extern char *lang_dir (const char *filename); extern void init_locale (void); diff --git a/libdb/Makefile.in b/libdb/Makefile.in index 8e9bce5f..a2a344ef 100644 --- a/libdb/Makefile.in +++ b/libdb/Makefile.in @@ -213,6 +213,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -224,8 +225,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -233,7 +234,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -252,6 +253,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -443,6 +445,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -463,6 +466,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -754,6 +758,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -882,6 +887,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1059,6 +1065,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1214,6 +1221,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1249,6 +1257,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1285,6 +1294,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/libdb/README b/libdb/README index d3b007b8..b7735e25 100644 --- a/libdb/README +++ b/libdb/README @@ -2,5 +2,5 @@ This directory contains the database management routines required by the man-db package. * You may distribute under the terms of the GNU Library General Public -* License as specified in the file COPYING.LIB that comes with the man +* License as specified in the file docs/COPYING.LIB that comes with the man * distribution. diff --git a/libdb/db_delete.c b/libdb/db_delete.c index 6e1c137c..6d8870f1 100644 --- a/libdb/db_delete.c +++ b/libdb/db_delete.c @@ -41,6 +41,7 @@ #include "appendstr.h" #include "debug.h" +#include "filenames.h" #include "glcontainers.h" #include "mydbm.h" diff --git a/libdb/db_gdbm.c b/libdb/db_gdbm.c index 8179d8d4..99dbcfe9 100644 --- a/libdb/db_gdbm.c +++ b/libdb/db_gdbm.c @@ -52,7 +52,7 @@ * threads. */ static jmp_buf open_env; -static int opening; +static bool opening; /* Mimic _gdbm_fatal's error output, but handle errors during open more * gracefully than exiting. @@ -82,7 +82,7 @@ bool man_gdbm_open_wrapper (man_gdbm_wrapper wrap, int flags) { datum key, content; - opening = 1; + opening = true; if (setjmp (open_env)) return false; wrap->file = gdbm_open (wrap->name, BLK_SIZE, flags, DBMODE, @@ -101,7 +101,7 @@ bool man_gdbm_open_wrapper (man_gdbm_wrapper wrap, int flags) MYDBM_FREE_DPTR (content); } - opening = 0; + opening = false; return true; } diff --git a/libdb/db_lookup.c b/libdb/db_lookup.c index db062597..b43269a6 100644 --- a/libdb/db_lookup.c +++ b/libdb/db_lookup.c @@ -51,6 +51,7 @@ #include "debug.h" #include "fatal.h" +#include "filenames.h" #include "glcontainers.h" #include "wordfnmatch.h" #include "xregcomp.h" @@ -143,27 +144,6 @@ datum make_multi_key (const char *page, const char *ext) return key; } -/* Free allocated elements of a mandata structure, but not the structure - * itself. - */ -void free_mandata_elements (struct mandata *pinfo) -{ - if (pinfo->addr) - /* TODO: this memory appears to be properly owned by the - * caller; why do we free it here? - */ - free (pinfo->addr); /* free the 'content' */ - free (pinfo->name); /* free the real name */ -} - -/* Free a mandata structure and its elements. */ -void free_mandata_struct (struct mandata *pinfo) -{ - if (pinfo) - free_mandata_elements (pinfo); - free (pinfo); -} - /* Get the key that should be used for a given name. The caller is * responsible for freeing the return value. */ @@ -209,33 +189,43 @@ static char **split_data (MYDBM_FILE dbf, char *content, char *start[]) } /* Parse the db-returned data and put it into a mandata format */ -void split_content (MYDBM_FILE dbf, char *cont_ptr, struct mandata *pinfo) +struct mandata *split_content (MYDBM_FILE dbf, char *cont_ptr) { + struct mandata *info; char *start[FIELDS]; char **data; data = split_data (dbf, cont_ptr, start); - pinfo->name = copy_if_set (*(data++)); - pinfo->ext = *(data++); - pinfo->sec = *(data++); - pinfo->mtime.tv_sec = (time_t) atol (*(data++)); - pinfo->mtime.tv_nsec = atol (*(data++)); - pinfo->id = **(data++); /* single char id */ - pinfo->pointer = *(data++); - pinfo->filter = *(data++); - pinfo->comp = *(data++); - pinfo->whatis = *(data); - - pinfo->addr = cont_ptr; + info = XZALLOC (struct mandata); + info->name = copy_if_set (*(data++)); + info->ext = xstrdup (*(data++)); + info->sec = xstrdup (*(data++)); + info->mtime.tv_sec = (time_t) atol (*(data++)); + info->mtime.tv_nsec = atol (*(data++)); + info->id = **(data++); /* single char id */ + info->pointer = xstrdup (*(data++)); + info->filter = xstrdup (*(data++)); + info->comp = xstrdup (*(data++)); + info->whatis = xstrdup (*(data)); + return info; } -static bool name_ext_equals (const void *elt1, const void *elt2) +bool ATTRIBUTE_PURE name_ext_equals (const void *elt1, const void *elt2) { const struct name_ext *ref1 = elt1, *ref2 = elt2; return STREQ (ref1->name, ref2->name) && STREQ (ref1->ext, ref2->ext); } +int ATTRIBUTE_PURE name_ext_compare (const void *elt1, const void *elt2) +{ + const struct name_ext *ref1 = elt1, *ref2 = elt2; + int name_cmp = strcmp (ref1->name, ref2->name); + if (name_cmp) + return name_cmp; + return strcmp (ref1->ext, ref2->ext); +} + /* Extract all of the names/extensions associated with this key. Each case * variant of a name will be returned separately. * @@ -260,7 +250,7 @@ gl_list_t list_extensions (char *data) /* Don't copy these; they will point into the given string. */ name_ext->name = name; name_ext->ext = ext; - gl_list_add_last (list, name_ext); + gl_sortedlist_add (list, name_ext_compare, name_ext); } debug ("found %zu names/extensions\n", gl_list_size (list)); @@ -303,8 +293,7 @@ static gl_list_t dblookup (MYDBM_FILE dbf, const char *page, else if (*MYDBM_DPTR (cont) != '\t') { /* Just one entry */ bool matches = false; - info = infoalloc (); - split_content (dbf, MYDBM_DPTR (cont), info); + info = split_content (dbf, MYDBM_DPTR (cont)); if (!info->name) info->name = xstrdup (page); if (!(flags & MATCH_CASE) || STREQ (info->name, page)) { @@ -370,16 +359,15 @@ static gl_list_t dblookup (MYDBM_FILE dbf, const char *page, MYDBM_FREE_DPTR (key); /* Allocate info struct and add it to the list. */ - info = infoalloc (); - split_content (dbf, MYDBM_DPTR (multi_cont), info); + info = split_content (dbf, MYDBM_DPTR (multi_cont)); if (!info->name) info->name = xstrdup (ref->name); gl_list_add_last (infos, info); } gl_list_free (refs); - MYDBM_FREE_DPTR (cont); } + MYDBM_FREE_DPTR (cont); return infos; } @@ -412,7 +400,6 @@ gl_list_t dblookup_pattern (MYDBM_FILE dbf, const char *pattern, bool pattern_regex, bool try_descriptions) { gl_list_t infos; - struct mandata *tail = NULL; datum key, cont; regex_t preg; @@ -438,12 +425,10 @@ gl_list_t dblookup_pattern (MYDBM_FILE dbf, const char *pattern, end = man_btree_nextkeydata (dbf, &key, &cont); while (!end) { #endif /* !BTREE */ - struct mandata info; + struct mandata *info = NULL; char *tab; bool got_match; - memset (&info, 0, sizeof (info)); - if (!MYDBM_DPTR (cont)) { debug ("key was %s\n", MYDBM_DPTR (key)); @@ -466,45 +451,43 @@ gl_list_t dblookup_pattern (MYDBM_FILE dbf, const char *pattern, /* a real page */ - split_content (dbf, MYDBM_DPTR (cont), &info); + info = split_content (dbf, MYDBM_DPTR (cont)); /* If there's a section given, does it match either the * section or extension of this page? */ if (section && - (!STREQ (section, info.sec) && !STREQ (section, info.ext))) + (!STREQ (section, info->sec) && + !STREQ (section, info->ext))) goto nextpage; tab = strrchr (MYDBM_DPTR (key), '\t'); if (tab) *tab = '\0'; - if (!info.name) - info.name = xstrdup (MYDBM_DPTR (key)); + if (!info->name) + info->name = xstrdup (MYDBM_DPTR (key)); if (pattern_regex) - got_match = (regexec (&preg, info.name, + got_match = (regexec (&preg, info->name, 0, NULL, 0) == 0); else - got_match = fnmatch (pattern, info.name, + got_match = fnmatch (pattern, info->name, match_case ? 0 : FNM_CASEFOLD) == 0; - if (try_descriptions && !got_match && info.whatis) { + if (try_descriptions && !got_match && info->whatis) { if (pattern_regex) - got_match = (regexec (&preg, info.whatis, + got_match = (regexec (&preg, info->whatis, 0, NULL, 0) == 0); else got_match = word_fnmatch (pattern, - info.whatis); + info->whatis); } if (!got_match) goto nextpage_tab; - tail = infoalloc (); - memcpy (tail, &info, sizeof (info)); - info.name = NULL; /* steal memory */ - MYDBM_SET_DPTR (cont, NULL); /* == info.addr */ - gl_list_add_last (infos, tail); + gl_list_add_last (infos, info); + info = NULL; /* avoid freeing later */ nextpage_tab: if (tab) @@ -520,8 +503,7 @@ nextpage: MYDBM_FREE_DPTR (key); end = man_btree_nextkeydata (dbf, &key, &cont); #endif /* !BTREE */ - info.addr = NULL; - free_mandata_elements (&info); + free_mandata_struct (info); } if (pattern_regex) diff --git a/libdb/db_storage.h b/libdb/db_storage.h index be01cc37..21335d65 100644 --- a/libdb/db_storage.h +++ b/libdb/db_storage.h @@ -26,6 +26,8 @@ #ifndef DB_STORAGE_H #define DB_STORAGE_H +#include <stdbool.h> + #include "gl_list.h" /* These definitions give an inherent precedence to each particular type @@ -47,31 +49,10 @@ #define FIELDS 10 /* No of fields in each database page `content' */ -#include "timespec.h" - -#include "xalloc.h" +#include "filenames.h" #include "mydbm.h" -struct mandata { - char *addr; /* ptr to memory containing the fields */ - - char *name; /* Name of page, if != key */ - - /* The following are all const because they should be pointers to - * parts of strings allocated elsewhere (often the addr field above) - * and should not be written through or freed themselves. - */ - const char *ext; /* Filename ext w/o comp ext */ - const char *sec; /* Section name/number */ - char id; /* id for this entry */ - const char *pointer; /* id related file pointer */ - const char *comp; /* Compression extension */ - const char *filter; /* filters needed for the page */ - const char *whatis; /* whatis description for page */ - struct timespec mtime; /* mod time for file */ -}; - struct name_ext { const char *name; const char *ext; @@ -88,21 +69,17 @@ extern gl_list_t dblookup_pattern (MYDBM_FILE dbf, const char *page, extern int dbstore (MYDBM_FILE dbf, struct mandata *in, const char *base); extern int dbdelete (MYDBM_FILE dbf, const char *name, struct mandata *in); extern void dbprintf (const struct mandata *info); -extern void free_mandata_elements (struct mandata *pinfo); -extern void free_mandata_struct (struct mandata *pinfo); -extern void split_content (MYDBM_FILE dbf, char *cont_ptr, - struct mandata *pinfo); -extern int compare_ids (char a, char b, int promote_links); +extern struct mandata *split_content (MYDBM_FILE dbf, char *cont_ptr); +extern int compare_ids (char a, char b, bool promote_links); /* local to db routines */ extern void gripe_lock (const char *filename); extern void gripe_corrupt_data (MYDBM_FILE dbf); extern datum make_multi_key (const char *page, const char *ext); -/* allocate a mandata structure */ -#define infoalloc() XZALLOC (struct mandata) - extern char *name_to_key (const char *name); +bool name_ext_equals (const void *elt1, const void *elt2); +int name_ext_compare (const void *elt1, const void *elt2); /* Returns a list of struct name_ext. */ extern gl_list_t list_extensions (char *data); extern void gripe_replace_key (MYDBM_FILE dbf, const char *data); diff --git a/libdb/db_store.c b/libdb/db_store.c index 213ae63e..12b3b9f1 100644 --- a/libdb/db_store.c +++ b/libdb/db_store.c @@ -26,6 +26,7 @@ #endif /* HAVE_CONFIG_H */ #include <assert.h> +#include <stdbool.h> #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -33,6 +34,8 @@ #include "attribute.h" #include "error.h" +#include "gl_array_list.h" +#include "gl_xlist.h" #include "timespec.h" #include "xalloc.h" #include "xvasprintf.h" @@ -40,6 +43,8 @@ #include "manconfig.h" #include "debug.h" +#include "filenames.h" +#include "glcontainers.h" #include "mydbm.h" #include "db_storage.h" @@ -53,7 +58,7 @@ * If promote_links is true, consider SO_MAN equivalent to ULT_MAN. This is * appropriate when sorting candidate pages for display. */ -int ATTRIBUTE_CONST compare_ids (char a, char b, int promote_links) +int ATTRIBUTE_CONST compare_ids (char a, char b, bool promote_links) { #ifdef FAVOUR_STRAYCATS if (a == WHATIS_MAN && b == STRAY_CAT) @@ -76,6 +81,12 @@ int ATTRIBUTE_CONST compare_ids (char a, char b, int promote_links) return 0; } +enum replace_action { + REPLACE_YES = 0, + REPLACE_NO, + REPLACE_FAIL +}; + /* The do_we_replace logic. Decide, for some existing key, whether it should * be replaced with some new contents. Check that names and section * extensions match before calling this. @@ -85,40 +96,67 @@ static int replace_if_necessary (MYDBM_FILE dbf, struct mandata *olddata, datum newkey, datum newcont) { + enum replace_action action; + /* It's OK to replace ULT_MAN with SO_MAN if the mtime is newer. It * isn't OK to replace a real page (either ULT_MAN or SO_MAN) with a * whatis reference; if the real page really went away then * purge_missing will catch that in time, but a real page that still * exists should always take precedence. + * + * Tie-break whatis references by lexicographical sort of + * the pointed-to page names, which isn't great but at least + * gives us something reproducible. + * + * TODO: name fields should be collated with the requested name */ - if (compare_ids (newdata->id, olddata->id, 1) <= 0 && - timespec_cmp (newdata->mtime, olddata->mtime) > 0) { - debug ("replace_if_necessary(): newer mtime; replacing\n"); - if (MYDBM_REPLACE (dbf, newkey, newcont)) - gripe_replace_key (dbf, MYDBM_DPTR (newkey)); - return 0; - } - - if (compare_ids (newdata->id, olddata->id, 0) < 0) { - if (MYDBM_REPLACE (dbf, newkey, newcont)) - gripe_replace_key (dbf, MYDBM_DPTR (newkey)); - return 0; + if (compare_ids (newdata->id, olddata->id, false) < 0) { + debug ("replace_if_necessary: stronger ID; replacing\n"); + action = REPLACE_YES; + } else if (compare_ids (newdata->id, olddata->id, true) <= 0 && + timespec_cmp (newdata->mtime, olddata->mtime) > 0) { + debug ("replace_if_necessary: newer mtime; replacing\n"); + action = REPLACE_YES; + } else if (compare_ids (newdata->id, olddata->id, true) <= 0 && + timespec_cmp (newdata->mtime, olddata->mtime) < 0) { + debug ("replace_if_necessary: older mtime; not replacing\n"); + action = REPLACE_NO; + } else if (compare_ids (newdata->id, olddata->id, false) > 0) { + debug ("replace_if_necessary: weaker ID; not replacing\n"); + action = REPLACE_NO; + } else if (newdata->pointer && olddata->pointer && + strcmp (newdata->pointer, olddata->pointer) < 0) { + debug ("replace_if_necessary: pointer '%s' < '%s'; " + "replacing\n", newdata->pointer, olddata->pointer); + action = REPLACE_YES; + } else if (newdata->pointer && olddata->pointer && + strcmp (newdata->pointer, olddata->pointer) > 0) { + debug ("replace_if_necessary: pointer '%s' > '%s'; " + "not replacing\n", newdata->pointer, olddata->pointer); + action = REPLACE_NO; + } else if (!STREQ (dash_if_unset (newdata->comp), + olddata->comp)) { + debug ("replace_if_necessary: differing compression " + "extensions (%s != %s); failing\n", + dash_if_unset (newdata->comp), olddata->comp); + action = REPLACE_FAIL; + } else { + debug ("replace_if_necessary: match; not replacing\n"); + action = REPLACE_NO; } - /* TODO: name fields should be collated with the requested name */ - - if (newdata->id == olddata->id) { - if (STREQ (dash_if_unset (newdata->comp), olddata->comp)) - return 0; /* same file */ - else { - debug ("ignoring differing compression " - "extensions: %s\n", MYDBM_DPTR (newkey)); - return 1; /* differing exts */ - } + switch (action) { + case REPLACE_YES: + if (MYDBM_REPLACE (dbf, newkey, newcont)) + gripe_replace_key (dbf, MYDBM_DPTR (newkey)); + return 0; + case REPLACE_NO: + /* Insert if missing, but ignore failures. */ + MYDBM_INSERT (dbf, newkey, newcont); + return 0; + default: + return 1; } - - debug ("ignoring differing ids: %s\n", MYDBM_DPTR (newkey)); - return 0; } /* The complement of split_content */ @@ -131,13 +169,13 @@ static datum make_content (struct mandata *in) memset (&cont, 0, sizeof cont); if (!in->pointer) - in->pointer = dash; - if (!in->filter) - in->filter = dash; + in->pointer = xstrdup (dash); if (!in->comp) - in->comp = dash; + in->comp = xstrdup (dash); + if (!in->filter) + in->filter = xstrdup (dash); if (!in->whatis) - in->whatis = dash + 1; + in->whatis = xstrdup (dash + 1); value = xasprintf ( "%s\t%s\t%s\t%ld\t%ld\t%c\t%s\t%s\t%s\t%s", @@ -164,6 +202,27 @@ static datum make_content (struct mandata *in) return cont; } +/* The complement of list_extensions. */ +static char *make_extensions_reference (gl_list_t refs) +{ + struct name_ext *ref; + size_t len = 0; + char *data, *cur; + + GL_LIST_FOREACH (refs, ref) + len += strlen (ref->name) + strlen (ref->ext) + 2; + + cur = data = xmalloc (len + 1); + GL_LIST_FOREACH (refs, ref) { + *cur++ = '\t'; + cur = stpcpy (cur, ref->name); + *cur++ = '\t'; + cur = stpcpy (cur, ref->ext); + } + + return data; +} + /* Any one of three situations can occur when storing some data. @@ -197,7 +256,10 @@ static datum make_content (struct mandata *in) int dbstore (MYDBM_FILE dbf, struct mandata *in, const char *base) { datum oldkey, oldcont; + gl_list_t refs; + struct name_ext *ref; char *value; + int ret = 0; memset (&oldkey, 0, sizeof oldkey); memset (&oldcont, 0, sizeof oldcont); @@ -243,16 +305,15 @@ int dbstore (MYDBM_FILE dbf, struct mandata *in, const char *base) if (MYDBM_INSERT (dbf, newkey, newcont)) { datum cont; - struct mandata info; - int ret; + struct mandata *info; MYDBM_FREE_DPTR (oldcont); cont = MYDBM_FETCH (dbf, newkey); - split_content (dbf, MYDBM_DPTR (cont), &info); - ret = replace_if_necessary (dbf, in, &info, + info = split_content (dbf, MYDBM_DPTR (cont)); + ret = replace_if_necessary (dbf, in, info, newkey, newcont); - /* MYDBM_FREE_DPTR (cont); */ - free_mandata_elements (&info); + MYDBM_FREE_DPTR (cont); + free_mandata_struct (info); MYDBM_FREE_DPTR (newkey); MYDBM_FREE_DPTR (newcont); MYDBM_FREE_DPTR (oldkey); @@ -268,9 +329,15 @@ int dbstore (MYDBM_FILE dbf, struct mandata *in, const char *base) MYDBM_FREE_DPTR (newkey); MYDBM_FREE_DPTR (newcont); - value = xasprintf ( - "%s\t%s\t%s", MYDBM_DPTR (oldcont), base, in->ext); - assert (value); + refs = list_extensions (MYDBM_DPTR (oldcont) + 1); + ref = XMALLOC (struct name_ext); + /* Not copied. */ + ref->name = base; + ref->ext = in->ext; + gl_sortedlist_add (refs, name_ext_compare, ref); + value = make_extensions_reference (refs); + gl_list_free (refs); + MYDBM_SET (newcont, value); MYDBM_FREE_DPTR (oldcont); @@ -282,7 +349,7 @@ int dbstore (MYDBM_FILE dbf, struct mandata *in, const char *base) MYDBM_FREE_DPTR (newcont); } else { /* situation (3) */ datum newkey, newcont, lastkey, lastcont; - struct mandata old; + struct mandata *old; char *old_name; memset (&newkey, 0, sizeof newkey); @@ -292,31 +359,29 @@ int dbstore (MYDBM_FILE dbf, struct mandata *in, const char *base) /* Extract the old singular reference */ - split_content (dbf, MYDBM_DPTR (oldcont), &old); + old = split_content (dbf, MYDBM_DPTR (oldcont)); /* Create multi keys for both old and new items, create new content */ - if (old.name) - old_name = xstrdup (old.name); + if (old->name) + old_name = xstrdup (old->name); else old_name = xstrdup (MYDBM_DPTR (oldkey)); - lastkey = make_multi_key (old_name, old.ext); + lastkey = make_multi_key (old_name, old->ext); /* Check against identical multi keys before inserting into db */ - if (STREQ (old_name, base) && STREQ (old.ext, in->ext)) { - int ret; - + if (STREQ (old_name, base) && STREQ (old->ext, in->ext)) { if (!STREQ (base, MYDBM_DPTR (oldkey))) in->name = xstrdup (base); newcont = make_content (in); - ret = replace_if_necessary (dbf, in, &old, + ret = replace_if_necessary (dbf, in, old, oldkey, newcont); - /* MYDBM_FREE_DPTR (oldcont); */ - free_mandata_elements (&old); + MYDBM_FREE_DPTR (oldcont); + free_mandata_struct (old); MYDBM_FREE_DPTR (newcont); MYDBM_FREE_DPTR (lastkey); MYDBM_FREE_DPTR (oldkey); @@ -330,12 +395,12 @@ int dbstore (MYDBM_FILE dbf, struct mandata *in, const char *base) /* Multi keys use the proper case, and so don't need a name * field. */ - if (old.name) { - free (old.name); - old.name = NULL; + if (old->name) { + free (old->name); + old->name = NULL; } - lastcont = make_content (&old); + lastcont = make_content (old); /* We always replace here; if the multi key already exists * in the database, then that indicates some kind of @@ -351,28 +416,39 @@ int dbstore (MYDBM_FILE dbf, struct mandata *in, const char *base) newkey = make_multi_key (base, in->ext); newcont = make_content (in); - if (MYDBM_REPLACE (dbf, newkey, newcont)) - gripe_replace_key (dbf, MYDBM_DPTR (newkey)); + ret = replace_if_necessary (dbf, in, old, newkey, newcont); MYDBM_FREE_DPTR (newkey); MYDBM_FREE_DPTR (newcont); /* Now build a simple reference to the above two items */ - value = xasprintf ( - "\t%s\t%s\t%s\t%s", old_name, old.ext, base, in->ext); - assert (value); + refs = gl_list_create_empty (GL_ARRAY_LIST, name_ext_equals, + NULL, plain_free, true); + ref = XMALLOC (struct name_ext); + /* Not copied. */ + ref->name = old_name; + ref->ext = old->ext; + gl_sortedlist_add (refs, name_ext_compare, ref); + ref = XMALLOC (struct name_ext); + /* Not copied. */ + ref->name = base; + ref->ext = in->ext; + gl_sortedlist_add (refs, name_ext_compare, ref); + value = make_extensions_reference (refs); + gl_list_free (refs); + MYDBM_SET (newcont, value); if (MYDBM_REPLACE (dbf, oldkey, newcont)) gripe_replace_key (dbf, MYDBM_DPTR (oldkey)); - /* MYDBM_FREE_DPTR (oldcont); */ - free_mandata_elements (&old); + MYDBM_FREE_DPTR (oldcont); + free_mandata_struct (old); MYDBM_FREE_DPTR (newcont); free (old_name); } MYDBM_FREE_DPTR (oldkey); - return 0; + return ret; } diff --git a/libdb/db_xdbm.c b/libdb/db_xdbm.c index 14a70e2c..ed6c027a 100644 --- a/libdb/db_xdbm.c +++ b/libdb/db_xdbm.c @@ -119,7 +119,7 @@ datum man_xdbm_firstkey (MYDBM_FILE dbf, if (!parent_keys) { parent_keys = new_string_map (GL_HASH_MAP, - (gl_listelement_dispose_fn) + (gl_mapvalue_dispose_fn) gl_list_free); push_cleanup ((cleanup_fun) gl_map_free, parent_keys, 0); } diff --git a/libdb/mydbm.h b/libdb/mydbm.h index 068ea674..370a91a4 100644 --- a/libdb/mydbm.h +++ b/libdb/mydbm.h @@ -88,7 +88,6 @@ void man_gdbm_free (man_gdbm_wrapper wrap); # define MYDBM_FIRSTKEY(db) man_gdbm_firstkey(db) # define MYDBM_NEXTKEY(db, key) man_gdbm_nextkey(db, key) # define MYDBM_GET_TIME(db) man_gdbm_get_time(db) -# define MYDBM_REORG(db) gdbm_reorganize((db)->file) # elif defined(NDBM) && !defined(GDBM) && !defined(BTREE) @@ -131,7 +130,6 @@ extern void man_ndbm_free (man_ndbm_wrapper wrap); # define MYDBM_FIRSTKEY(db) man_ndbm_firstkey(db) # define MYDBM_NEXTKEY(db, key) man_ndbm_nextkey(db, key) # define MYDBM_GET_TIME(db) man_ndbm_get_time(db) -# define MYDBM_REORG(db) do {} while (0) /* not implemented */ # elif defined(BTREE) && !defined(NDBM) && !defined(GDBM) @@ -180,7 +178,6 @@ extern struct timespec man_btree_get_time (man_btree_wrapper wrap); # define MYDBM_FIRSTKEY(db) man_btree_firstkey(db) # define MYDBM_NEXTKEY(db, key) man_btree_nextkey(db) # define MYDBM_GET_TIME(db) man_btree_get_time(db) -# define MYDBM_REORG(db) do {} while (0) /* not implemented */ # else /* not GDBM or NDBM or BTREE */ # error Define either GDBM, NDBM or BTREE before including mydbm.h diff --git a/m4/man-arg-cache-owner.m4 b/m4/man-arg-cache-owner.m4 index e267fef2..29970166 100644 --- a/m4/man-arg-cache-owner.m4 +++ b/m4/man-arg-cache-owner.m4 @@ -1,9 +1,10 @@ -# man-arg-cache-owner.m4 serial 2 +# man-arg-cache-owner.m4 serial 3 dnl MAN_ARG_CACHE_OWNER dnl Add an --enable-cache-owner option. AC_DEFUN([MAN_ARG_CACHE_OWNER], [ +AC_REQUIRE([gl_IDPRIV]) AC_ARG_ENABLE([cache-owner], [AS_HELP_STRING([--enable-cache-owner[=ARG]], [make system-wide cache files be owned by user ARG [arg=man]]) AS_HELP_STRING([--disable-cache-owner], [don't constrain ownership of system-wide cache files])], @@ -14,18 +15,30 @@ AS_HELP_STRING([--disable-cache-owner], [don't constrain ownership of system-wid if test "$enableval" = "no" then man_owner= - cache_top_owner=root - AC_MSG_NOTICE([System-wide cache files will have unconstrained ownership]) else man_owner=$enableval - cache_top_owner=$enableval - AC_MSG_NOTICE([System-wide cache files will be owned by $enableval]) - AC_DEFINE_UNQUOTED([MAN_OWNER], ["$man_owner"], - [Define as the owner of system-wide cache files.]) fi], - [man_owner=man - cache_top_owner=man - AC_DEFINE_UNQUOTED([MAN_OWNER], ["$man_owner"])]) + [if test "$ac_cv_func_getuid" = yes + then + man_owner=man + else + man_owner= + fi]) +if test "$man_owner" && test "$ac_cv_func_getuid" != yes +then + AC_MSG_WARN([--enable-cache-owner is not implemented on this platform]) + man_owner= +fi +if test "$man_owner" +then + cache_top_owner="$man_owner" + AC_MSG_NOTICE([System-wide cache files will be owned by $man_owner]) + AC_DEFINE_UNQUOTED([MAN_OWNER], ["$man_owner"], + [Define as the owner of system-wide cache files.]) +else + cache_top_owner=root + AC_MSG_NOTICE([System-wide cache files will have unconstrained ownership]) +fi AC_SUBST([man_owner]) AC_SUBST([cache_top_owner]) ]) diff --git a/man/Makefile.in b/man/Makefile.in index dc434a95..0ed70a4d 100644 --- a/man/Makefile.in +++ b/man/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -618,6 +620,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -638,6 +641,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -929,6 +933,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1057,6 +1062,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1234,6 +1240,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1389,6 +1396,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1424,6 +1432,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1460,6 +1469,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ @@ -32,6 +32,7 @@ Yuri Kozlov <kozlov.y@gmail.com> man/ru, ru.po Sebastian Rasmussen <sebras@gmail.com> man/sv, sv.po Volkan Gezer <volkangezer@gmail.com> man/tr, tr.po Mesutcan Kurt <mesutcank@gmail.com> man/tr +Emir SARI <emir_sari@icloud.com> man/tr, tr.po Wylmer Wang <wantinghard@gmail.com> man/zh_CN Tianze Wang <zwpwjwtz@126.com> man/zh_CN Boyuan Yang <073plan@gmail.com> man/zh_CN, zh_CN.po @@ -52,6 +53,7 @@ David MartÃnez <ender@debian.org> es.po Lauri Nurmi <lanurmi@iki.fi> fi.po Laurent Pelecq <laurent.pelecq@soleil.org> fr.po Nicolas Velin <nsv@fr.st> fr.po +Andika Triwidada <andika@gmail.com> id.po UCHIDA Norihiro <KY4N-UCD@asahi-net.or.jp> ja.po Takeshi Hamasaki <hmatrjp@users.sourceforge.jp> ja.po Benno Schulenberg <benno@vertaalt.nl> nl.po diff --git a/man/da/Makefile.in b/man/da/Makefile.in index 36c45d4e..fc68e877 100644 --- a/man/da/Makefile.in +++ b/man/da/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/de/Makefile.in b/man/de/Makefile.in index d9d2a118..4c1df8eb 100644 --- a/man/de/Makefile.in +++ b/man/de/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/es/Makefile.in b/man/es/Makefile.in index f9a622ca..56d0c582 100644 --- a/man/es/Makefile.in +++ b/man/es/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/fr/Makefile.in b/man/fr/Makefile.in index 94964189..4efb689b 100644 --- a/man/fr/Makefile.in +++ b/man/fr/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/id/Makefile.in b/man/id/Makefile.in index 4165866d..157c089d 100644 --- a/man/id/Makefile.in +++ b/man/id/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/it/Makefile.in b/man/it/Makefile.in index 202738c9..780190cb 100644 --- a/man/it/Makefile.in +++ b/man/it/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/it/man1/apropos.man1 b/man/it/man1/apropos.man1 index b40f1879..2560a67f 100644 --- a/man/it/man1/apropos.man1 +++ b/man/it/man1/apropos.man1 @@ -11,7 +11,7 @@ .\" 4^ Revisione e aggiornamento Aprile 2003 .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Oct 29 13:09:31 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/it/man1/man.man1 b/man/it/man1/man.man1 index ba797f63..5c203f9a 100644 --- a/man/it/man1/man.man1 +++ b/man/it/man1/man.man1 @@ -13,7 +13,7 @@ .\" 4^ revisione e aggirnamento Febbraio 2007 .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Oct 29 13:09:31 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/it/man1/manpath.man1 b/man/it/man1/manpath.man1 index 22aa0f7b..5de92810 100644 --- a/man/it/man1/manpath.man1 +++ b/man/it/man1/manpath.man1 @@ -9,7 +9,7 @@ .\" 3^ Revisione e aggionamento Settembre 1999 .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the COPYING file that comes with the +.\" License as specified in the docs/COPYING.GPLv2 file that comes with the .\" man-db distribution. .\" .\" Sun Jan 22 22:15:17 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/it/man1/whatis.man1 b/man/it/man1/whatis.man1 index acf90b9a..de2d691c 100644 --- a/man/it/man1/whatis.man1 +++ b/man/it/man1/whatis.man1 @@ -9,7 +9,7 @@ .\" 3^ Revisione e aggionamento Settembre 1999 .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Oct 29 13:09:31 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/it/man1/zsoelim.man1 b/man/it/man1/zsoelim.man1 index 0309d72d..587f8411 100644 --- a/man/it/man1/zsoelim.man1 +++ b/man/it/man1/zsoelim.man1 @@ -9,7 +9,7 @@ .\" 3^ Revisione e aggionamento Settembre 1999 .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Dec 10 19:33:32 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/it/man5/manpath.man5 b/man/it/man5/manpath.man5 index 88bf3ab7..ff01811d 100644 --- a/man/it/man5/manpath.man5 +++ b/man/it/man5/manpath.man5 @@ -8,7 +8,7 @@ .\" 2° Revisione Agosto 1999 .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Oct 29 13:09:31 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/it/man8/accessdb.man8 b/man/it/man8/accessdb.man8 index ff5d5c30..ad750b56 100644 --- a/man/it/man8/accessdb.man8 +++ b/man/it/man8/accessdb.man8 @@ -6,7 +6,7 @@ .\" Agosto 1999 .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Tue, 24 Feb 1998 18:18:36 +0200 diff --git a/man/it/man8/catman.man8 b/man/it/man8/catman.man8 index 35fb8a4b..c23dcd53 100644 --- a/man/it/man8/catman.man8 +++ b/man/it/man8/catman.man8 @@ -9,7 +9,7 @@ .\" 3^ Revisione e aggionamento Settembre 1999 .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Dec 10 14:17:29 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/it/man8/mandb.man8 b/man/it/man8/mandb.man8 index 2322f213..50aca1bf 100644 --- a/man/it/man8/mandb.man8 +++ b/man/it/man8/mandb.man8 @@ -10,7 +10,7 @@ .\" 3^ Revisione e aggionamento Settembre 1999 .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Tue Apr 26 12:56:44 BST 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/ja/Makefile.in b/man/ja/Makefile.in index 18416aab..47930e93 100644 --- a/man/ja/Makefile.in +++ b/man/ja/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/man1/apropos.man1 b/man/man1/apropos.man1 index c8dce1d6..195472e4 100644 --- a/man/man1/apropos.man1 +++ b/man/man1/apropos.man1 @@ -3,7 +3,7 @@ .\" Copyright (C), 1994, 1995, Graeme W. Wilford. (Wilf.) .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Oct 29 13:09:31 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/man1/lexgrog.man1 b/man/man1/lexgrog.man1 index 392a8018..7b194dcd 100644 --- a/man/man1/lexgrog.man1 +++ b/man/man1/lexgrog.man1 @@ -3,7 +3,7 @@ .\" Copyright (c) 2001 Colin Watson <cjwatson@debian.org> .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .pc .TH LEXGROG 1 "%date%" "%version%" "Manual pager utils" diff --git a/man/man1/man-recode.man1 b/man/man1/man-recode.man1 index 944ddb5d..bc1ed6d9 100644 --- a/man/man1/man-recode.man1 +++ b/man/man1/man-recode.man1 @@ -3,7 +3,7 @@ .\" Copyright (C) 2019 Colin Watson <cjwatson@debian.org> .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .pc .TH %thman_recode% 1 "%date%" "%version%" "Manual pager utils" diff --git a/man/man1/man.man1 b/man/man1/man.man1 index 46070a33..8c9d2b63 100644 --- a/man/man1/man.man1 +++ b/man/man1/man.man1 @@ -6,7 +6,7 @@ .\" Copyright (C) 2001-2019 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Oct 29 13:09:31 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/man1/manconv.man1 b/man/man1/manconv.man1 index af1e3b30..df9da744 100644 --- a/man/man1/manconv.man1 +++ b/man/man1/manconv.man1 @@ -3,7 +3,7 @@ .\" Copyright (c) 2007, 2008 Colin Watson <cjwatson@debian.org> .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .pc .TH %thmanconv% 1 "%date%" "%version%" "Manual pager utils" diff --git a/man/man1/manpath.man1 b/man/man1/manpath.man1 index 54f8425b..6652ec1b 100644 --- a/man/man1/manpath.man1 +++ b/man/man1/manpath.man1 @@ -4,7 +4,7 @@ .\" Copyright (C) 2001-2019 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the COPYING file that comes with the +.\" License as specified in the docs/COPYING.GPLv2 file that comes with the .\" man-db distribution. .\" .\" Sun Jan 22 22:15:17 GMT 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/man1/whatis.man1 b/man/man1/whatis.man1 index ce6aa5dd..56375985 100644 --- a/man/man1/whatis.man1 +++ b/man/man1/whatis.man1 @@ -3,7 +3,7 @@ .\" Copyright (C), 1994, 1995, Graeme W. Wilford. (Wilf.) .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Oct 29 13:09:31 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/man1/zsoelim.man1 b/man/man1/zsoelim.man1 index 50d1dd0a..6442adb6 100644 --- a/man/man1/zsoelim.man1 +++ b/man/man1/zsoelim.man1 @@ -3,7 +3,7 @@ .\" Copyright (C), 1994, 1995, Graeme W. Wilford. (Wilf.) .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Dec 10 19:33:32 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/man5/manpath.man5 b/man/man5/manpath.man5 index 14bfa568..0ea293f9 100644 --- a/man/man5/manpath.man5 +++ b/man/man5/manpath.man5 @@ -4,7 +4,7 @@ .\" Copyright (C) 2001-2019 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Oct 29 13:09:31 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) @@ -228,7 +228,7 @@ If .I width is non-zero, cat pages will always be formatted for a terminal of the given width, regardless of the width of the terminal actually being used. -This should generally be within the range set by +This overrides .B MINCATWIDTH and .BR MAXCATWIDTH . diff --git a/man/man8/accessdb.man8 b/man/man8/accessdb.man8 index 0f9e61d2..91a30094 100644 --- a/man/man8/accessdb.man8 +++ b/man/man8/accessdb.man8 @@ -3,7 +3,7 @@ .\" Copyright (c) 1998 Fabrizio Polacco <fpolacco@debian.org .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Tue, 24 Feb 1998 18:18:36 +0200 diff --git a/man/man8/catman.man8 b/man/man8/catman.man8 index 4f837331..63e223c7 100644 --- a/man/man8/catman.man8 +++ b/man/man8/catman.man8 @@ -3,7 +3,7 @@ .\" Copyright (C), 1994, 1995, Graeme W. Wilford. (Wilf.) .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Sat Dec 10 14:17:29 GMT 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/man8/mandb.man8 b/man/man8/mandb.man8 index a265c318..5176b4f4 100644 --- a/man/man8/mandb.man8 +++ b/man/man8/mandb.man8 @@ -5,7 +5,7 @@ .\" Copyright (C) 2001-2019 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Tue Apr 26 12:56:44 BST 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/man/nl/Makefile.in b/man/nl/Makefile.in index ac3c77c9..8a54a165 100644 --- a/man/nl/Makefile.in +++ b/man/nl/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/pl/Makefile.in b/man/pl/Makefile.in index e1b62de2..2fedddec 100644 --- a/man/pl/Makefile.in +++ b/man/pl/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/po4a/Makefile.in b/man/po4a/Makefile.in index 3e47c441..7093791c 100644 --- a/man/po4a/Makefile.in +++ b/man/po4a/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -348,6 +350,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -368,6 +371,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -659,6 +663,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -787,6 +792,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -964,6 +970,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1119,6 +1126,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1154,6 +1162,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1190,6 +1199,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/po4a/po/da.po b/man/po4a/po/da.po index 45a2934c..c9ae2282 100644 --- a/man/po4a/po/da.po +++ b/man/po4a/po/da.po @@ -22,7 +22,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-manpages 2.8.0-pre2\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: 2018-01-26 07:50+0200\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" @@ -75,12 +75,14 @@ msgstr "SYNOPSIS" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<liste>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<sti>" -"\\|] [\\|B<-L> I<sprog>\\|] [\\|B<-C> I<fil>\\|] I<nøgleord> \\&.\\|.\\|." +"s> I<liste>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<sti>\\|] [\\|B<-L> I<sprog>\\|] [\\|B<-C> I<fil>\\|] I<nøgleord> \\&.\\|." +"\\|." #. type: SH #: ../../man/man1/apropos.man1:32 ../../man/man1/lexgrog.man1:20 @@ -461,9 +463,9 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" "Hvis $B<POSIXLY_CORRECT> er angivet, selv som en nul-værdi, vil " "standardsøgningen B<%apropos%> være som et udvidet regulært udtryk (B<-r>). " @@ -533,11 +535,11 @@ msgstr "lexgrog - fortolk hovedfilsinformation i manualsider" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<kodning>" -"\\|] I<fil> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<kodning>\\|] I<fil> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/lexgrog.man1:36 @@ -559,17 +561,18 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" -"Hvis inddata er dÃ¥rligt formateret vil B<lexgrog> vise \\(lqparse failed" -"\\(rq; dette kan være nyttigt for eksterne programmer, som skal kontrollere " -"manualsider for korrekthed. Hvis en af B<lexgrog>'s inddatafiler er \\(lq-" -"\\(rq, sÃ¥ vil det læse fra standardinddata; hvis nogle af inddatafilerne er " -"komprimeret, sÃ¥ vil en udpakket version blive læst automatisk." +"Hvis inddata er dÃ¥rligt formateret vil B<lexgrog> vise \\(lqparse " +"failed\\(rq; dette kan være nyttigt for eksterne programmer, som skal " +"kontrollere manualsider for korrekthed. Hvis en af B<lexgrog>'s inddatafiler " +"er \\(lq-\\(rq, sÃ¥ vil det læse fra standardinddata; hvis nogle af " +"inddatafilerne er komprimeret, sÃ¥ vil en udpakket version blive læst " +"automatisk." #. type: Plain text #: ../../man/man1/lexgrog.man1:57 @@ -711,13 +714,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" -"Nogle manualsøgere kræver at \\(oq\\e-\\(cq to er præcis som vist; B<%mandb" -"%> er mere tolerant, men af kompatibilitetsÃ¥rsager er det alligevel en god " -"ide at bevare skrÃ¥stregen." +"Nogle manualsøgere kræver at \\(oq\\e-\\(cq to er præcis som vist; " +"B<%mandb%> er mere tolerant, men af kompatibilitetsÃ¥rsager er det alligevel " +"en god ide at bevare skrÃ¥stregen." #. type: Plain text #: ../../man/man1/lexgrog.man1:158 @@ -784,18 +787,19 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "Der er flere gængse Ã¥rsager til at whatis-fortolkning mislykkes. Nogle gange " -"erstatter forfattere af manualsider \\(oq.SH NAME\\(cq med \\(oq.SH MYPROGRAM" -"\\(cq, og sÃ¥ kan B<%mandb%> ikke finde afsnittet hvorfra informationen, den " -"har brug for, skal udtrækkes. Undertiden inkluderer forfatteren et NAVNE-" -"afsnit, men placerer fri-form tekst der frem for \\(oqname \\e- beskrivelse" -"\\(cq. Dog bør enhver syntaks der ligner ovenstÃ¥ende blive accepteret." +"erstatter forfattere af manualsider \\(oq.SH NAME\\(cq med \\(oq.SH " +"MYPROGRAM\\(cq, og sÃ¥ kan B<%mandb%> ikke finde afsnittet hvorfra " +"informationen, den har brug for, skal udtrækkes. Undertiden inkluderer " +"forfatteren et NAVNE-afsnit, men placerer fri-form tekst der frem for " +"\\(oqname \\e- beskrivelse\\(cq. Dog bør enhver syntaks der ligner " +"ovenstÃ¥ende blive accepteret." #. type: SH #: ../../man/man1/lexgrog.man1:202 @@ -891,23 +895,23 @@ msgstr "B<%man%> B<-k> [\\|I<apropos> I<tilvalg>\\|] I<regexp> \\&.\\|.\\|.\\&" #: ../../man/man1/man.man1:88 #, fuzzy #| msgid "" -#| "B<%man%> is the system's manual pager. Each I<page> argument given to B<" -#| "%man%> is normally the name of a program, utility or function. The " +#| "B<%man%> is the system's manual pager. Each I<page> argument given to " +#| "B<%man%> is normally the name of a program, utility or function. The " #| "I<manual page> associated with each of these arguments is then found and " #| "displayed. A I<section>, if provided, will direct B<%man%> to look only " #| "in that I<section> of the manual. The default action is to search in all " #| "of the available I<sections> following a pre-defined order (\"%sections%" -#| "\" by default, unless overridden by the B<SECTION> directive in I<" -#| "%manpath_config_file%>), and to show only the first I<page> found, even " +#| "\" by default, unless overridden by the B<SECTION> directive in " +#| "I<%manpath_config_file%>), and to show only the first I<page> found, even " #| "if I<page> exists in several I<sections>." msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "B<%man%> er systemets manuelle tekstviser. Hver I<side>-parameter sendt til " @@ -916,9 +920,9 @@ msgstr "" "I<afsnit>, hvis angivet, vil dirigere B<%man> til kun at kigge i det " "I<afsnit> af manualen. Standardhandlingen er at søge i alle de tilgængelige " "I<afsnit>, der efterfølger den prædefinerede rækkefølge (\"%sections%\" som " -"standard, med mindre overskrevet af direktivet B<SECTION> i I<" -"%manpath_config_file%>), og at vise kun den første I<side> fundet, selv hvis " -"I<side> findes i flere I<afsnit>." +"standard, med mindre overskrevet af direktivet B<SECTION> i " +"I<%manpath_config_file%>), og at vise kun den første I<side> fundet, selv " +"hvis I<side> findes i flere I<afsnit>." #. type: Plain text #: ../../man/man1/man.man1:92 @@ -1212,12 +1216,12 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "Søg i de korte beskrivelser og navnene pÃ¥ manualsiderne for nøgleordet " -"I<printf> som regulært udtryk. Udskriv resultaterne. Svarer til B<%apropos" -"%>I<\\ printf>B<.>" +"I<printf> som regulært udtryk. Udskriv resultaterne. Svarer til " +"B<%apropos%>I<\\ printf>B<.>" #. type: TP #: ../../man/man1/man.man1:261 @@ -1379,8 +1383,8 @@ msgstr "STANDARDER" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" #. type: Plain text @@ -1466,14 +1470,14 @@ msgstr "Generelle tilvalg" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" -"Dette tilvalg udstedes normalt som det første tilvalg og nulstiller B<%man" -"%'s> opførsel til standarden. Dets brug er at nulstille disse tilvalg, som " -"mÃ¥ske er angivet i $B<MANOPT>. Ethvert tilvalg som følger B<-D> vil have " +"Dette tilvalg udstedes normalt som det første tilvalg og nulstiller " +"B<%man%'s> opførsel til standarden. Dets brug er at nulstille disse tilvalg, " +"som mÃ¥ske er angivet i $B<MANOPT>. Ethvert tilvalg som følger B<-D> vil have " "deres normale effekt." #. type: TP @@ -1600,11 +1604,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" -"Dette tilvalg er ikke for generel brug og bør kun bruges af programmet B<" -"%catman%>." +"Dette tilvalg er ikke for generel brug og bør kun bruges af programmet " +"B<%catman%>." #. type: TP #: ../../man/man1/man.man1:527 @@ -1721,9 +1725,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" #. type: Plain text @@ -2028,8 +2032,8 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" @@ -2179,8 +2183,8 @@ msgstr "" msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" #. type: Plain text @@ -2190,8 +2194,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" #. type: Plain text @@ -2200,8 +2204,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" #. type: Plain text @@ -2264,8 +2268,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" @@ -2273,8 +2277,8 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "Afhængig af system og implementering, vil enten en af eller begge $B<LANG> " @@ -2389,16 +2393,17 @@ msgstr "" #, fuzzy #| msgid "" #| "If an encoding declaration is found on the first line of the manual page, " -#| "that declaration overrides any input encodings specified on B<%manconv" -#| "%>'s command line. Encoding declarations have the following form:" +#| "that declaration overrides any input encodings specified on " +#| "B<%manconv%>'s command line. Encoding declarations have the following " +#| "form:" msgid "" "If an encoding declaration is found on the first line of a manual page, then " "that declaration is used as the input encoding for that page. Failing that, " "the input encoding is guessed based on the file name." msgstr "" "Hvis en kodningsdeklaraton findes pÃ¥ den første linje af manualsiden, sÃ¥ " -"overstyrer den deklaration alle inddatakodninger specificeret pÃ¥ B<%manconv" -"%>'s kommandolinje. Kodningsdeklarationer har den følgende form:" +"overstyrer den deklaration alle inddatakodninger specificeret pÃ¥ " +"B<%manconv%>'s kommandolinje. Kodningsdeklarationer har den følgende form:" #. type: Plain text #: ../../man/man1/man-recode.man1:38 @@ -2479,8 +2484,8 @@ msgid "" "command line. Encoding declarations have the following form:" msgstr "" "Hvis en kodningsdeklaraton findes pÃ¥ den første linje af manualsiden, sÃ¥ " -"overstyrer den deklaration alle inddatakodninger specificeret pÃ¥ B<%manconv" -"%>'s kommandolinje. Kodningsdeklarationer har den følgende form:" +"overstyrer den deklaration alle inddatakodninger specificeret pÃ¥ " +"B<%manconv%>'s kommandolinje. Kodningsdeklarationer har den følgende form:" #. type: TP #: ../../man/man1/manconv.man1:51 @@ -2614,13 +2619,14 @@ msgstr "%whatis% - vis beskrivelser pÃ¥ en linje for manualsider" #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<liste>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<sti>\\|] [\\|" -"B<-L> I<sted>\\|] [\\|B<-C> I<fil>\\|] I<navn> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<liste>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<sti>\\|] [\\|B<-L> I<sted>\\|] [\\|B<-C> I<fil>\\|] I<navn> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -2648,8 +2654,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" @@ -2674,8 +2680,8 @@ msgid "" "to be somewhat slower due to the nature of database searches." msgstr "" "Fortolk hvert I<navn> som et regulært udtryk. Hvis et I<navn> matcher en del " -"af et sidenavn, sÃ¥ vil et match bliver udført. Dette tilvalg gør at B<%whatis" -"%> er lidt langsommere pÃ¥ grund af naturen i databasesøgninger." +"af et sidenavn, sÃ¥ vil et match bliver udført. Dette tilvalg gør at " +"B<%whatis%> er lidt langsommere pÃ¥ grund af naturen i databasesøgninger." #. type: Plain text #: ../../man/man1/whatis.man1:100 @@ -3052,11 +3058,16 @@ msgstr "B<CATWIDTH>I<\\ bredde>" #. type: Plain text #: ../../man/man5/manpath.man5:235 +#, fuzzy +#| msgid "" +#| "If I<width> is non-zero, cat pages will always be formatted for a " +#| "terminal of the given width, regardless of the width of the terminal " +#| "actually being used. This should generally be within the range set by " +#| "B<MINCATWIDTH> and B<MAXCATWIDTH>." msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "Hvis I<width> er forskellig fra nul, sÃ¥ vil cat-sider altid blive formateret " "for en terminal med en fast bredde, uanset bredden for den terminal der " @@ -3334,10 +3345,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" #. type: Plain text @@ -3506,57 +3517,58 @@ msgstr "" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<advarsler>\\|]\\|] [\\|B<-R> I<kodning>\\|] [\\|B<-L> " -#~ "I<sprog>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<sti>" -#~ "\\|] [\\|B<-S> I<vis>\\|] [\\|B<-e> I<udvidelse>\\|] [\\|B<-i>\\||\\|B<-I>" -#~ "\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>\\|] [\\|" -#~ "B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> I<tekstviser>" -#~ "\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<kodning>\\|] [\\|" -#~ "B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> I<streng>" -#~ "\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<enhed>\\|]\\|] [\\|B<-H>\\|[\\|" -#~ "I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|" -#~ "I<afsnit>\\|] I<side>[.\\|I<afsnit>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" +#~ "I<sprog>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +#~ "I<sti>\\|] [\\|B<-S> I<vis>\\|] [\\|B<-e> I<udvidelse>\\|] [\\|B<-i>\\||" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<tekstviser>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<kodning>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<streng>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<enhed>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<afsnit>\\|] I<side>[.\\|I<afsnit>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<vis>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<afsnit>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<vis>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<afsnit>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgid "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-l> [\\|B<-C> I<fil>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<advarsler>\\|]\\|] [\\|B<-R> I<kodning>\\|] [\\|B<-L> " -#~ "I<sprog>\\|] [\\|B<-P> I<tekstviser>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<kodning>\\|] [\\|B<-p> I<streng>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<enhed>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<fil> \\&.\\|.\\|.\\&" +#~ "I<sprog>\\|] [\\|B<-P> I<tekstviser>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<kodning>\\|] [\\|B<-p> I<streng>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<enhed>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<fil> \\&.\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<fil>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<side> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<fil>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<side> \\&.\\|.\\|.\\&" #~ msgid "" #~ "B<%man%> B<-c> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I<page> " diff --git a/man/po4a/po/de.po b/man/po4a/po/de.po index 086df324..f68935c5 100644 --- a/man/po4a/po/de.po +++ b/man/po4a/po/de.po @@ -3,7 +3,7 @@ # Copyright (C) 2001, 2002, 2003, 2006, 2007, 2008, 2011 Colin Watson. # This file is distributed under the same license as the man-db package. # Copyright (C) 1994, 1995 Graeme W. Wilford. (Wilf.) -# Copyright (C) 1998 Fabrizio Polacco <fpolacco@debian.org +# Copyright (C) 1998 Fabrizio Polacco <fpolacco@debian.org> # Anke Steuernagel <a_steuer@informatik.uni-kl.de> # Nils Magnus <magnus@informatik.uni-kl.de> # @@ -13,10 +13,10 @@ # Mario Blättermann <mario.blaettermann@gmail.com>, 2014, 2016, 2018-2022. msgid "" msgstr "" -"Project-Id-Version: man-db-manpages 2.10.0-pre1\n" +"Project-Id-Version: man-db-manpages 2.11.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" -"PO-Revision-Date: 2022-01-24 19:56+0100\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" +"PO-Revision-Date: 2022-10-03 12:01+0200\n" "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" "Language: de\n" @@ -25,7 +25,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 21.12.1\n" +"X-Generator: Lokalize 22.08.1\n" # #-#-#-#-# apropos.1.po (man-db 2.5.7) #-#-#-#-# # Alle Programme aus dem Paket man-db haben diese Beschreibung, die in der @@ -83,8 +83,9 @@ msgstr "ÃœBERSICHT" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<Liste>\\|] [\\|B<-m> I<System>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " @@ -377,8 +378,8 @@ msgstr "" "B<%program%> wird in der Regel Ihre aktuelle Locale durch einen Aufruf der C-" "Funktion B<setlocale>(3) bestimmen, welche verschiedene Umgebungsvariablen " "auswertet (darunter sind eventuell auch $B<LC_MESSAGES> und $B<LANG>). Um " -"den ermittelten Wert vorübergehend außer Kraft zu setzen, können Sie B<" -"%program%> mit dieser Option eine I<Locale> vorgeben. Beachten Sie, dass " +"den ermittelten Wert vorübergehend außer Kraft zu setzen, können Sie " +"B<%program%> mit dieser Option eine I<Locale> vorgeben. Beachten Sie, dass " "dieser Wert erst wirksam wird, wenn die Suche tatsächlich beginnt. Programm-" "Meldungen wie Hilfe-Nachrichten werden immer in der zu Anfang ermittelten " "Locale angezeigt werden." @@ -533,9 +534,9 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" "Wenn $B<POSIXLY_CORRECT> gesetzt ist, wobei sogar NULL erlaubt ist, wird die " "Standardsuche von B<%program%> mit erweiterten regulären Ausdrücken (B<-r>) " @@ -613,11 +614,11 @@ msgstr "lexgrog - wertet die Kopfzeilen-Information von Handbuchseiten aus" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<Kodierung>" -"\\|] I<Datei> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<Kodierung>\\|] I<Datei> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/lexgrog.man1:36 @@ -640,11 +641,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" "Wenn seine Eingabe schlecht formatiert ist, wird B<lexgrog> »parse failed« " "ausgeben. Das können externe Programme nutzen, die Handbuchseiten auf " @@ -760,12 +761,12 @@ msgid "" "has to cope with a number of different forms that have historically been " "used, it may sometimes fail to extract the required information." msgstr "" -"Die Programme B<%mandb%> und B<lexgrog> verwenden den gleichen Code. B<%mandb" -"%> durchsucht den Abschnitt B<BEZEICHNUNG> am Anfang jeder Handbuchseite " -"nach den Namen und den jeweils beschriebenen Funktionen. Obwohl der Parser " -"(das Auswerteprogramm) ziemlich tolerant ist, weil er sich mit etlichen " -"verschiedenen, früher genutzten Formaten befassen muss, kann er ab und zu " -"die gewünschte Information nicht entnehmen." +"Die Programme B<%mandb%> und B<lexgrog> verwenden den gleichen Code. " +"B<%mandb%> durchsucht den Abschnitt B<BEZEICHNUNG> am Anfang jeder " +"Handbuchseite nach den Namen und den jeweils beschriebenen Funktionen. " +"Obwohl der Parser (das Auswerteprogramm) ziemlich tolerant ist, weil er sich " +"mit etlichen verschiedenen, früher genutzten Formaten befassen muss, kann er " +"ab und zu die gewünschte Information nicht entnehmen." #. type: Plain text #: ../../man/man1/lexgrog.man1:134 @@ -789,8 +790,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" "Einige Handbuchanzeigeprogramme erfordern das \\(oq\\e-\\cq genau in dieser " @@ -864,11 +865,11 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "Es gibt mehrere häufige Gründe dafür, dass die von Whatis durchgeführte " "Auswertung fehlschlägt. Manchmal ersetzen Autoren von Handbuchseiten \\(oq." @@ -968,17 +969,17 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:88 msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" -"B<%man%> ist das System-Anzeigeprogramm für die Handbuchseiten. Jedes an B<" -"%man%> übergebene Argument I<Seite> ist normalerweise der Name eines " +"B<%man%> ist das System-Anzeigeprogramm für die Handbuchseiten. Jedes an " +"B<%man%> übergebene Argument I<Seite> ist normalerweise der Name eines " "Programms oder einer Funktion. Gefunden und angezeigt wird die " "I<Handbuchseite>, die auf jedes der Argumente passt. Wenn ein I<Abschnitt> " "angegeben wird, sucht B<%man%> nur in diesem I<Abschnitt> der " @@ -1301,8 +1302,8 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "Sucht in den Kurzbeschreibungen und Namen der Handbuchseiten nach dem als " "regulären Ausdruck angesehenen Schlüsselwort I<printf> und gibt alle " @@ -1321,8 +1322,8 @@ msgid "" "descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" "Sucht die durch I<smail> angegebenen Handbuchseiten und gibt alle " -"Kurzbeschreibungen der gefundenen Seiten aus. Diese Option entspricht B<" -"%apropos%> I<\\ smail>B<.>" +"Kurzbeschreibungen der gefundenen Seiten aus. Diese Option entspricht " +"B<%apropos%> I<\\ smail>B<.>" #. type: SH #: ../../man/man1/man.man1:268 @@ -1366,8 +1367,8 @@ msgstr "" "diese Variable vor der eigenen Befehlszeile aus. Die Optionen, die ein " "Argument benötigen, werden durch die gleichen Optionen in der Befehlszeile " "überschrieben. Um alle in $B<MANOPT> gesetzten Optionen zurückzusetzen, kann " -"als erste Befehlszeilen-Option B<-D> angegeben werden. Dies ermöglicht B<%man" -"%>, alle in $B<MANOPT> gesetzten Optionen zu »vergessen«, obwohl diese " +"als erste Befehlszeilen-Option B<-D> angegeben werden. Dies ermöglicht " +"B<%man%>, alle in $B<MANOPT> gesetzten Optionen zu »vergessen«, obwohl diese " "weiterhin gültig gewesen sein mussten. " #. type: Plain text @@ -1467,13 +1468,13 @@ msgstr "VOREINSTELLUNGEN" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" "Die Reihenfolge der zu durchsuchenden Abschnitte kann durch die " -"Umgebungsvariable $B<MANSECT> oder durch die B<SECTION>-Anweisung in I<" -"%manpath_config_file%> außer Kraft gesetzt werden. Folgende Reihenfolge ist " -"voreingestelllt:" +"Umgebungsvariable $B<MANSECT> oder durch die B<SECTION>-Anweisung in " +"I<%manpath_config_file%> außer Kraft gesetzt werden. Folgende Reihenfolge " +"ist voreingestelllt:" #. type: Plain text #: ../../man/man1/man.man1:361 @@ -1567,10 +1568,10 @@ msgstr "Allgemeine Optionen" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "Diese Option wird normalerweise nur als die allererste angegeben und setzt " "das Verhalten von B<%man%> auf die Vorgabewerte zurück. Der Zweck dieser " @@ -1721,8 +1722,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" "Diese Option ist nicht für den allgemeinen Gebrauch bestimmt und sollte nur " "von dem Programm B<%catman%> verwendet werden." @@ -1801,8 +1802,8 @@ msgid "" "derived code to determine the path to search. This option overrides the " "$B<MANPATH> environment variable and causes option B<-m> to be ignored." msgstr "" -"Gibt die Verwendung eines alternativen Pfades vor. Standardmäßig verwendet B<" -"%man%> von B<%manpath%> abgeleiteten Code, um den Suchpfad zu ermitteln. " +"Gibt die Verwendung eines alternativen Pfades vor. Standardmäßig verwendet " +"B<%man%> von B<%manpath%> abgeleiteten Code, um den Suchpfad zu ermitteln. " "Diese Option überschreibt die Umgebungsvariable $B<MANPATH> und sorgt dafür, " "das B<-m> ignoriert wird." @@ -1858,9 +1859,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" "Einige Systeme integrieren umfangreiche Handbuchseiten-Pakete, wie z. B. " "Zubehör für das B<Tcl>-Paket, in die normalen Abschnitte. Für die Lösung des " @@ -1950,8 +1951,8 @@ msgid "" msgstr "" "Diese Option veranlasst B<%man%>, seine Zwischenspeicher-Datenbank der " "installierten Handbuchseiten zu aktualisieren. Dies ist nur in seltenen " -"Fällen notwendig. Es ist normalerweise besser, stattdessen den Befehl B<" -"%mandb%>(8) auszuführen." +"Fällen notwendig. Es ist normalerweise besser, stattdessen den Befehl " +"B<%mandb%>(8) auszuführen." #. type: Plain text #: ../../man/man1/man.man1:719 @@ -1998,8 +1999,8 @@ msgid "" "with B<-f> or B<-k>." msgstr "" "Gibt an, welches Anzeigeprogramm verwendet werden soll. Standardmäßig " -"verwendet B<%man%> B<%pager%>, wobei auf B<%cat%> ausgewichen wird, falls B<" -"%pager%> nicht gefunden wurde oder nicht ausführbar ist. Diese Option " +"verwendet B<%man%> B<%pager%>, wobei auf B<%cat%> ausgewichen wird, falls " +"B<%pager%> nicht gefunden wurde oder nicht ausführbar ist. Diese Option " "überschreibt die Umgebungsvariable $B<MANPAGER>, welche wiederum die " "Umgebungsvariable $B<PAGER> überschreibt. Die Option wird nicht zusammen mit " "B<-f> oder B<-k> verwendet." @@ -2273,8 +2274,8 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "Wenn Sie eine Handbuchseite schreiben und Sie wollen einfach nur B<Nroff> " @@ -2392,9 +2393,9 @@ msgid "" "processor. It implies B<-t>." msgstr "" "B<Groff> ruft B<Troff> und anschließend den passenden Postprozessor auf, um " -"eine für das gewählte »Gerät« verwendbare Ausgabe zu erzeugen. Wenn I<%troff" -"%> B<Groff> ist, wird diese Option an B<Groff> weitergereicht und verhindert " -"den Gebrauch eines Postprozessors. Diese Option impliziert B<-t>." +"eine für das gewählte »Gerät« verwendbare Ausgabe zu erzeugen. Wenn " +"I<%troff%> B<Groff> ist, wird diese Option an B<Groff> weitergereicht und " +"verhindert den Gebrauch eines Postprozessors. Diese Option impliziert B<-t>." #. type: SS #: ../../man/man1/man.man1:1038 @@ -2457,16 +2458,16 @@ msgstr "" "Wenn $B<MANSECT> gesetzt ist, wird ihr Wert als eine durch Doppelpunkte " "gegliederte Liste von Abschnitten interpretiert und dazu benutzt, die zu " "durchsuchenden Abschnitte und deren Reihenfolge zu bestimmen. Die Vorgabe " -"ist »%sections%«, es sei denn, dies wird durch die B<SECTION>-Anweisung in I<" -"%manpath_config_file%> außer Kraft gesetzt." +"ist »%sections%«, es sei denn, dies wird durch die B<SECTION>-Anweisung in " +"I<%manpath_config_file%> außer Kraft gesetzt." #. type: Plain text #: ../../man/man1/man.man1:1126 msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "Wenn $B<MANPAGER> oder $B<PAGER> gesetzt ist ($B<MANPAGER> wird bevorzugt " "verwendet), legt dieser Wert das Anzeigeprogramm für die Handbuchseite fest. " @@ -2480,8 +2481,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "Wenn $B<MANLESS> gesetzt ist, wird deren Wert als Zeichenkette für die " "Festlegung einer Eingabeaufforderung für das Anzeigeprogramm B<less> " @@ -2498,8 +2499,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "Wenn $B<BROWSER> gesetzt ist, ist Wert eine durch Doppelpunkte getrennte " "Liste von Befehlen. Mit allen diesen Befehlen wird versucht, einen Web-" @@ -2559,8 +2560,8 @@ msgstr "" "eine Pipeline) geschickt wird, werden Formatierungszeichen verworfen, um das " "Ergebnis ohne Spezialwerkzeuge lesen zu können. Ist aber " "$B<MAN_KEEP_FORMATTING> auf einen nicht leeren Wert gesetzt, werden diese " -"Formatierungszeichen beibehalten. Dies kann nützlich sein für Adapter, die B<" -"%man%> interpretieren und Formatierungszeichen verarbeiten können." +"Formatierungszeichen beibehalten. Dies kann nützlich sein für Adapter, die " +"B<%man%> interpretieren und Formatierungszeichen verarbeiten können." #. type: Plain text #: ../../man/man1/man.man1:1228 @@ -2604,8 +2605,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" "Falls die Umgebungsvariable $B<PIPELINE_DEBUG> auf »1« gesetzt ist, dann " @@ -2616,8 +2617,8 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "Abhängig von System und Implementierung werden entweder $B<LANG> oder " @@ -2937,8 +2938,8 @@ msgid "" "include NewOS's manual page hierarchies use the option B<-m> B<NewOS>." msgstr "" "Wenn das System auch auf Handbuchseiten eines anderen Betriebssystems " -"zugreifen kann, können diese Seiten mit dieser Option in die Ausgabe von B<" -"%manpath%> integriert werden. Um die Handbuch-Hierarchien von NewOS " +"zugreifen kann, können diese Seiten mit dieser Option in die Ausgabe von " +"B<%manpath%> integriert werden. Um die Handbuch-Hierarchien von NewOS " "einzubetten, verwenden Sie die Option B<-m> B<NewOS>." #. type: Plain text @@ -2971,13 +2972,15 @@ msgstr "%whatis% - durchsucht die Indexdatenbank nach Kurzbeschreibungen" #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<Liste>" -"\\|] [\\|B<-m> I<System>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<Pfad>\\|] [\\|" -"B<-L> I<Locale>\\|] [\\|B<-C> I<Datei>\\|] I<Name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<Liste>\\|] [\\|B<-m> I<System>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<Pfad>\\|] [\\|B<-L> I<Locale>\\|] [\\|B<-C> I<Datei>\\|] I<Name> \\&.\\|." +"\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -2986,9 +2989,9 @@ msgid "" "searches the manual page names and displays the manual page descriptions of " "any I<name> matched." msgstr "" -"Innerhalb jeder Handbuchseite ist eine Kurzbeschreibung vorhanden. B<%whatis" -"%> durchsucht die Namen der Handbuchseiten und zeigt die Beschreibungen der " -"gefundenen Seiten mit passendem I<Namen> an." +"Innerhalb jeder Handbuchseite ist eine Kurzbeschreibung vorhanden. " +"B<%whatis%> durchsucht die Namen der Handbuchseiten und zeigt die " +"Beschreibungen der gefundenen Seiten mit passendem I<Namen> an." #. type: Plain text #: ../../man/man1/whatis.man1:49 @@ -3007,8 +3010,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" @@ -3522,13 +3525,12 @@ msgstr "B<CATWIDTH>I<\\ Breite>" msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "Wenn I<Breite> von Null verschieden ist, werden die Cat-Seiten für ein " "Terminal der vorgegebenen Breite formatiert, ungeachtet der Breite des " -"aktuell verwendeten Terminals. Im Allgemeinen sollte ein Wert aus dem von " -"I<MINCATWIDTH> und I<MAXCATWIDTH> festgelegten Bereich gewählt werden." +"aktuell verwendeten Terminals. Dies setzt I<MINCATWIDTH> und I<MAXCATWIDTH> " +"außer Kraft." #. type: Plain text #: ../../man/man5/manpath.man5:240 @@ -3820,8 +3822,8 @@ msgstr "" "Diejenigen Datenbanktypen, die asynchrone Aktualisierungen unterstützen, " "ermöglichen eine höhere Geschwindigkeit. Der höheren Geschwindigkeit " "gegenüber steht das Risiko, dass die Datenbank bei einer unüblichen " -"Beendigung des Programms beschädigt wird. Dann kann es erforderlich sein, B<" -"%mandb%> mit der Option B<-c> zu starten, um die Datenbanken von Grund auf " +"Beendigung des Programms beschädigt wird. Dann kann es erforderlich sein, " +"B<%mandb%> mit der Option B<-c> zu starten, um die Datenbanken von Grund auf " "neu zu erstellen." #. type: Plain text @@ -3852,10 +3854,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" "Standardmäßig versucht B<%mandb%> zunächst, eine bestehende Datenbank zu " "aktualisieren. Ist keine Datenbank vorhanden, wird sie erstellt. Diese " @@ -4035,238 +4037,3 @@ msgid "" msgstr "" "Der frühere Abschnitt B<WAS BEDEUTET PARSEN> ist jetzt Teil von " "B<lexgrog>(1)." - -#~ msgid "Type" -#~ msgstr "Typ" - -#~ msgid "Binary tree" -#~ msgstr "Binärbaum" - -#~ msgid "Hashed" -#~ msgstr "Hash-Tabelle" - -#~ msgid "" -#~ "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" -#~ msgstr "" -#~ "B<%man%> [\\|B<-C> I<Datei>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#~ "warnings>\\|[\\|=I<Warnungen>\\|]\\|] [\\|B<-R> I<Kodierung>\\|] [\\|B<-" -#~ "L> I<Locale>\\|] [\\|B<-m> I<System>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#~ "I<Pfad>\\|] [\\|B<-S> I<Liste>\\|] [\\|B<-e> I<Erweiterung>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" -#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<Anzeigeprogramm>\\|] [\\|B<-r> I<Eingabeaufforderung>\\|] [\\|B<-7>\\|] " -#~ "[\\|B<-E> I<Kodierung>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-" -#~ "justification>\\|] [\\|B<-p> I<Zeichenkette>\\|] [\\|B<-t>\\|] [\\|B<-T>" -#~ "\\|[\\|I<Gerät>\\|]\\|] [\\|B<-H>\\|[\\|I<Browser>\\|]\\|] [\\|B<-X>\\|" -#~ "[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<Abschnitt>\\|] I<Seite>[.\\|" -#~ "I<Abschnitt>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" - -#~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" -#~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<Liste>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<Abschnitt>\\|] I<Terminal>\\ ." -#~ "\\|.\\|.\\&" - -#~ msgid "" -#~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" -#~ msgstr "" -#~ "B<%man%> B<-l> [\\|B<-C> I<Datei>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#~ "warnings>\\|[\\|=I<Warnungen>\\|]\\|] [\\|B<-R> I<Kodierung>\\|] [\\|B<-" -#~ "L> I<Locale>\\|] [\\|B<-P> I<Anzeigeprogramm>\\|] [\\|B<-r> " -#~ "I<Eingabeaufforderung>\\|] [\\|B<-7>\\|] [\\|B<-E> I<Kodierung>\\|] [\\|" -#~ "B<-p> I<Zeichenkette>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<Gerät>\\|]\\|] " -#~ "[\\|B<-H>\\|[\\|I<Browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" -#~ "Z>\\|] I<Datei> \\&.\\|.\\|.\\&" - -#~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" -#~ msgstr "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<Datei>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<Seite> \\&.\\|.\\|.\\&" - -#~ msgid "" -#~ "B<%man%> B<-c> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I<page> " -#~ "\\&.\\|.\\|.\\&" -#~ msgstr "" -#~ "B<%man%> B<-c> [\\|B<-C> I<Datei>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] " -#~ "I<Seite> \\&.\\|.\\|.\\&" - -#~ msgid "B<%man%> [\\|B<-?V>\\|]" -#~ msgstr "B<%man%> [\\|B<-?V>\\|]" - -#~ msgid "" -#~ "The manual pager utilities packaged as B<man-db> make extensive use of " -#~ "B<index> database caches. These caches contain information such as where " -#~ "each manual page can be found on the filesystem and what its I<whatis> " -#~ "(short one line description of the man page) contains, and allow B<%man%> " -#~ "to run faster than if it had to search the filesystem each time to find " -#~ "the appropriate manual page. If requested using the B<-u> option, B<man> " -#~ "will ensure that the caches remain consistent, which can obviate the need " -#~ "to manually run software to update traditional I<whatis> text databases." -#~ msgstr "" -#~ "Die im Paket B<man_db> zusammengefassten Hilfsprogramme machen " -#~ "umfassenden Gebrauch von B<Index>-Datenbankzwischenspeichern. Diese " -#~ "Zwischenspeicher enthalten Informationen über den Speicherort und die " -#~ "zugehörige I<whatis>-Information (einzeilige Kurzbeschreibung der " -#~ "Handbuchseite). Mit den Zwischenspeichern kann B<%man%> schneller " -#~ "arbeiten, weil es nicht jedes Mal eine Handbuchseite im Dateisystem " -#~ "suchen muss. Mit der Option B<-u> sorgt B<%man%> für die Konsistenz der " -#~ "Zwischenspeicher und kann damit den manuellen Aufruf von Software für die " -#~ "Aktualisierung der traditionellen I<whatis>-Textdatenbanken vermeiden." - -#~ msgid "" -#~ "If B<%man%> cannot find a B<%mandb%> initiated B<index> database for a " -#~ "particular manual page hierarchy, it will still search for the requested " -#~ "manual pages, although file globbing will be necessary to search within " -#~ "that hierarchy. If B<%whatis%> or B<%apropos%> fails to find an B<index> " -#~ "it will try to extract information from a traditional I<whatis> database " -#~ "instead." -#~ msgstr "" -#~ "Wenn B<%man%> keine von B<%mandb%> erstellte B<Index>-Datenbank zu einer " -#~ "speziellen Handbuchhierarchie finden kann, wird es dennoch nach der " -#~ "gewünschten Handbuchseite suchen. In diesem Fall ist es jedoch wieder " -#~ "nötig, alle in Frage kommenden Verzeichnisse nach passenden Mustern zu " -#~ "durchsuchen (sog. globbing). Wenn B<%whatis%> oder B<%apropos%> keinen " -#~ "B<Index> finden, versuchen sie, die Information stattdessen aus einer " -#~ "traditionellen I<whatis->-Datenbank zu beziehen." - -# glob, globfree - find pathnames matching a pattern, free memory from -# glob() -#~ msgid "" -#~ "These utilities support compressed source nroff files having, by default, " -#~ "the extensions of B<.Z>, B<.z> and B<.gz>. It is possible to deal with " -#~ "any compression extension, but this information must be known at compile " -#~ "time. Also, by default, any cat pages produced are compressed using " -#~ "B<gzip>. Each `global' manual page hierarchy such as I</usr/share/man> " -#~ "or I</usr/X11R6/man> may have any directory as its cat page hierarchy. " -#~ "Traditionally the cat pages are stored under the same hierarchy as the " -#~ "man pages, but for reasons such as those specified in the B<File " -#~ "Hierarchy Standard (FHS)>, it may be better to store them elsewhere. For " -#~ "details on how to do this, please read B<manpath>(5). For details on why " -#~ "to do this, read the standard." -#~ msgstr "" -#~ "Diese Hilfsprogramme unterstützen komprimierte Nroff-Quelldateien, die " -#~ "normalerweise die Erweiterungen B<.Z>, B<.z> oder B<.gz> besitzen. " -#~ "Abhängig von den Optionen beim Bau des Programms können andere Typen " -#~ "unterstützt werden. Auch werden standardmäßig alle erstellten Cat-Seiten " -#~ "mit B<gzip> komprimiert. Jeder »globalen« Handbuchhierarchie wie I</usr/" -#~ "man> oder I</usr/X11R6/man> kann ein beliebiges Verzeichnis als Cat-" -#~ "Seiten-Hierarchie zugeordnet sein. Ãœblicherweise werden Cat-Seiten unter " -#~ "der gleichen Hierarchie wie die Handbuchseiten gespeichert. Allerdings " -#~ "kann es aus den im B<File Hierarchy Standard (FHS)> angeführten Gründen " -#~ "besser sein, sie an anderer Stelle zu speichern. In B<manpath>(5) finden " -#~ "Sie Details, wie das getan wird. Wenn Sie wissen wollen, warum die " -#~ "getrennte Speicherung empfohlen wird, lesen sie den Standard." - -#~ msgid "" -#~ "B<%man%> will search for the desired manual pages within the I<index> " -#~ "database caches. If the B<-u> option is given, a cache consistency check " -#~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " -#~ "corrupt. However, the cache consistency check can be slow on systems " -#~ "with many manual pages installed, so it is not performed by default, and " -#~ "system administrators may wish to run B<%mandb%> every week or so to keep " -#~ "the database caches fresh. To forestall problems caused by outdated " -#~ "caches, B<%man%> will fall back to file globbing if a cache lookup fails, " -#~ "just as it would if no cache was present." -#~ msgstr "" -#~ "Bei der Suche nach den gewünschten Handbuchseiten wertet B<%man%> " -#~ "zunächst die I<Index>-Datenbankzwischenspeicher aus. Wenn die Option B<-" -#~ "u> gewählt wird, wird eine Zwischenspeicherkonsistenzprüfung " -#~ "durchgeführt, um sicherzustellen, dass die Datenbanken das Dateisystem " -#~ "genau wiedergeben. Wenn diese Option immer angegeben wird, ist es im " -#~ "Allgemeinen nicht erforderlich, B<%mandb%> nach der anfänglichen " -#~ "Erstellung der Zwischenspeicher auszuführen, sofern nicht ein " -#~ "Zwischenspeicher beschädigt wird. Die Zwischenspeicherkonsistenzprüfung " -#~ "kann auf Systemen mit vielen installierten Handbuchseiten zu " -#~ "Verzögerungen führen und wird darum standardmäßig nicht durchgeführt. " -#~ "Daher werden Systemadministratoren vielleicht einmal wöchentlich B<%mandb" -#~ "%> laufen lassen wollen, um die Datenbankzwischenspeicher aktuell zu " -#~ "halten. Um durch veraltete Zwischenspeicher verursachte Probleme zu " -#~ "verhindern, durchsucht B<%man%> nach einer fehlgeschlagenen Suche in den " -#~ "Zwischenspeichern das Dateisystem, wie es ohne Zwischenspeicher der Fall " -#~ "gewesen wäre." - -# Ich habe hier jetzt nicht wortreich "globben" umschrieben, weil ich es -# für das Verständnis nicht erforderlich halte. Und ich bin oben darauf -# eingegangen. -# FIXME: will fall back to a default is, dritter Satz -#~ msgid "" -#~ "Once a manual page has been located, a check is performed to find out if " -#~ "a relative preformatted `cat' file already exists and is newer than the " -#~ "nroff file. If it does and is, this preformatted file is (usually) " -#~ "decompressed and then displayed, via use of a pager. The pager can be " -#~ "specified in a number of ways, or else will fall back to a default is " -#~ "used (see option B<-P> for details). If no cat is found or is older than " -#~ "the nroff file, the nroff is filtered through various programs and is " -#~ "shown immediately." -#~ msgstr "" -#~ "Wenn eine Handbuchseite gefunden wurde, wird die zugehörige " -#~ "vorformatierte Cat-Seite gesucht und geprüft, ob diese jünger ist als die " -#~ "Nroff-Datei. In diesem Fall wird normalerweise die vorformatierte Datei " -#~ "dekomprimiert und mit einem Anzeigeprogramm angezeigt. Die Auswahl des " -#~ "Anzeigeprogramms kann auf unterschiedliche Weise erfolgen (für Details " -#~ "siehe die Option B<-P>). Wird das gewählte Anzeigeprogramm nicht " -#~ "gefunden, wird ein Standard-Anzeigeprogramm verwendet. Wenn keine Cat-" -#~ "Seite gefunden wird oder wenn sie älter als die Nroff-Datei ist, wird die " -#~ "Nroff-Datei durch diverse Programme gefiltert und unverzüglich angezeigt." - -#~ msgid "" -#~ "If a cat file can be produced (a relative cat directory exists and has " -#~ "appropriate permissions), B<%man%> will compress and store the cat file " -#~ "in the background." -#~ msgstr "" -#~ "Wenn eine Cat-Datei erzeugt werden kann (es existiert ein relatives, mit " -#~ "passenden Rechten versehenes Cat-Verzeichnis), wird B<%man%> die Cat-" -#~ "Datei im Hintergrund erzeugen und abspeichern." - -#~ msgid "" -#~ "Don't actually display the manual pages, but do print the location(s) of " -#~ "the source nroff files that would be formatted." -#~ msgstr "" -#~ "Bei dieser Option werden keine Handbuchseiten angezeigt, sondern die " -#~ "Speicherorte der zu formatierenden Nroff-Quelltexte ausgegeben." - -#~ msgid "" -#~ "This option causes B<%man%> to perform an `inode level' consistency check " -#~ "on its database caches to ensure that they are an accurate representation " -#~ "of the filesystem. It will only have a useful effect if B<%man%> is " -#~ "installed with the setuid bit set." -#~ msgstr "" -#~ "Diese Option veranlasst B<%man%> zu einer Prüfung, ob seine " -#~ "Datenbankzwischenspeicher das Dateisystem genau wiedergeben. Dazu führt " -#~ "das Programm eine Konsistenzprüfung der Zwischenspeicher auf der »Inode-" -#~ "Ebene« durch. Diese Option ist wirkungslos, wenn bei der Installation von " -#~ "B<%man%> das Setuid-Bit nicht gesetzt wurde." - -#~ msgid "" -#~ "The contents of $B<MANROFFOPT> are added to the command line every time " -#~ "B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>)." -#~ msgstr "" -#~ "Der Inhalt von $B<MANROFFOPT> wird jedes Mal, wenn B<Man> das " -#~ "Formatierprogramm (B<Nroff>, B<Troff> oder B<Groff>) aufruft, an die " -#~ "Befehlszeile angehängt." - -#~ msgid "the man-db package manual, B<FSSTND>" -#~ msgstr "das Handbuch zum Paket man-db, B<FSSTND>" diff --git a/man/po4a/po/es.po b/man/po4a/po/es.po index f5422e1e..eeb7ca2d 100644 --- a/man/po4a/po/es.po +++ b/man/po4a/po/es.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-manpages 2.10.0-pre1\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: 2022-01-28 12:36-0600\n" "Last-Translator: Alejandro Cendejas Tena <alex.cendejas@gmail.com>\n" "Language-Team: Spanish <es@tp.org.es>\n" @@ -68,8 +68,9 @@ msgstr "SINOPSIS" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<listado>\\|] [\\|B<-m> I<sistema>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " @@ -456,9 +457,9 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" "Si $B<POSIXLY_CORRECT> está establecida, incluso a un valor nulo, la " "búsqueda predeterminada B<%apropos%> será como una expreg extendida (B<-" @@ -529,8 +530,8 @@ msgstr "lexgrog - analiza la información de cabecera en páginas man" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" "B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " "I<codificación>\\|] I<archivo> \\&.\\|.\\|." @@ -545,21 +546,21 @@ msgid "" "preprocessing filters required by the man page before it is passed to " "B<nroff> or B<troff>, or both." msgstr "" -"B<lexgrog> es una implementación de la tradicional utilidad \\(lqgroff guess" -"\\(rq en B<lex>. Lee la lista de archivos en su lÃnea de órdenes bien como " -"archivos fuente de página man, bien como páginas preformateadas \\(lqcat" -"\\(rq, y muestra su nombre y descripción como se utilizó por B<apropos> y " -"B<whatis>, la lista de filtros preprocesados requeridos por la página man " -"antes de que sea pasada por B<nroff> o B<troff>, o ambos." +"B<lexgrog> es una implementación de la tradicional utilidad \\(lqgroff " +"guess\\(rq en B<lex>. Lee la lista de archivos en su lÃnea de órdenes bien " +"como archivos fuente de página man, bien como páginas preformateadas " +"\\(lqcat\\(rq, y muestra su nombre y descripción como se utilizó por " +"B<apropos> y B<whatis>, la lista de filtros preprocesados requeridos por la " +"página man antes de que sea pasada por B<nroff> o B<troff>, o ambos." #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" "Si esta entrada está formateada equivocadamente, B<lexgrog> escribirá " "\\(lqparse fallado\\(rq; esto puede ser útil para programas externos que " @@ -701,8 +702,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" "Algunos paginadores del manual requieren que la \\(oq\\e-\\(cq esté " @@ -776,11 +777,11 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "Hay distintas razones por las que el análisis de whatis suele fallar. A " "veces los autores de las páginas de manual sustituyen \\(oq.SH NOMBRE\\(cq " @@ -878,13 +879,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:88 msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "B<%man%> es el paginador de manuales del sistema. Cada argumento de " @@ -1204,8 +1205,8 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "Busca en las descripciones cortas y en los nombres de página de manual la " "palabra clave I<printf> como expresión regular. Imprime cualquier " @@ -1366,12 +1367,12 @@ msgstr "PREDETERMINACIONES" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" "El orden en que se busca en las secciones puede alterarse mediante la " -"variable de entorno $B<MANSECT> o la directiva B<SECTION> en I<" -"%manpath_config_file%>. Está predefinida asÃ:" +"variable de entorno $B<MANSECT> o la directiva B<SECTION> en " +"I<%manpath_config_file%>. Está predefinida asÃ:" #. type: Plain text #: ../../man/man1/man.man1:361 @@ -1462,10 +1463,10 @@ msgstr "Opciones generales" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "Esta opción, generalmente la primera de todas, restablece el comportamiento " "predefinido de B<%man%>. Se utiliza para restablecer aquellas opciones que " @@ -1612,8 +1613,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" "Esta opción no es para utilización general y solo deberÃa utilizarla el " "programa B<%catman%>." @@ -1748,9 +1749,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" "Algunos sistemas incorporan paquetes grandes de páginas de manual, como " "aquellas que acompañan al paquete B<Tcl>, dentro de la jerarquÃa de páginas " @@ -1828,9 +1829,9 @@ msgid "" "pages with names that match the search criteria." msgstr "" "El comportamiento predeterminado es que B<%man%> termine tras mostrar la " -"página de manual más adecuada que encuentra. Esta opción provoca que B<%man" -"%> muestre todas las páginas del manual con nombres que coincidan con los " -"criterios de búsqueda." +"página de manual más adecuada que encuentra. Esta opción provoca que " +"B<%man%> muestre todas las páginas del manual con nombres que coincidan con " +"los criterios de búsqueda." #. type: Plain text #: ../../man/man1/man.man1:707 @@ -1888,8 +1889,8 @@ msgid "" "overrides the $B<PAGER> environment variable. It is not used in conjunction " "with B<-f> or B<-k>." msgstr "" -"Especifica el paginador de salida que se va a utilizar. Por defecto, B<%man" -"%> utiliza B<%pager%>, retrotrayéndose a B<%cat%> si B<%pager%> no se " +"Especifica el paginador de salida que se va a utilizar. Por defecto, " +"B<%man%> utiliza B<%pager%>, retrotrayéndose a B<%cat%> si B<%pager%> no se " "encuentra o no es ejecutable. Esta opción anula la variable de entorno " "$B<MANPAGER>, la cual, a su vez, anula la variable de entorno $B<PAGER>. No " "se emplea a la vez que B<-f> o B<-k>." @@ -2158,8 +2159,8 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "Si está escribiendo una página de manual y simplemente quiere impedir que " @@ -2342,13 +2343,14 @@ msgstr "" msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "Si $B<MANPAGER> o $B<PAGER> está establecida ($B<MANPAGER> tiene " "preferencia), su valor se emplea como nombre del programa utilizado para " -"mostrar la página de manual. A falta de otra indicación, se utiliza B<%pager" -"%>, o se recurre a B<%cat%> si B<%pager%> no se encuentra o no es ejecutable." +"mostrar la página de manual. A falta de otra indicación, se utiliza " +"B<%pager%>, o se recurre a B<%cat%> si B<%pager%> no se encuentra o no es " +"ejecutable." #. type: Plain text #: ../../man/man1/man.man1:1151 @@ -2357,8 +2359,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "Si $B<MANLESS> está establecida, su valor se emplea como indicador " "predefinido para el paginador B<less>, como si se hubiera pasado utilizando " @@ -2374,13 +2376,13 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "Si $B<BROWSER> está establecida, su valor es una lista de órdenes " "delimitadas por dos puntos, cada una de las cuales se emplea, a su vez, para " -"intentar arrancar un navegador web para B<man> B<--html>. En cada orden, I<" -"%s> se sustituye por un nombre de archivo que contiene la salida HTML de " +"intentar arrancar un navegador web para B<man> B<--html>. En cada orden, " +"I<%s> se sustituye por un nombre de archivo que contiene la salida HTML de " "B<groff>, I<%%> se sustituye por un único signo de porcentaje (%), y I<%c> " "se sustituye por dos puntos (:)." @@ -2482,8 +2484,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" "Si la variable de entorno $B<PIPELINE_DEBUG> se establece en \"1\", entonces " @@ -2494,8 +2496,8 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "Según el sistema y la implementación, se examinará una de las variables de " @@ -2777,8 +2779,8 @@ msgid "" "environment." msgstr "" "La ruta delimitada por dos puntos se determina utilizando información " -"obtenida a partir del archivo de configuración de man-db \\(en (I<" -"%manpath_config_file%>) y del entorno del usuario." +"obtenida a partir del archivo de configuración de man-db \\(en " +"(I<%manpath_config_file%>) y del entorno del usuario." #. type: Plain text #: ../../man/man1/manpath.man1:42 @@ -2813,8 +2815,8 @@ msgid "" "include NewOS's manual page hierarchies use the option B<-m> B<NewOS>." msgstr "" "Si este sistema tiene acceso a las jerarquÃas de manual de otro sistema " -"operativo, esta opcion puede utilizarse para incluirlas en la salida de B<" -"%manpath%>. Para incluir las jerarquÃas de las páginas de manual de " +"operativo, esta opcion puede utilizarse para incluirlas en la salida de " +"B<%manpath%>. Para incluir las jerarquÃas de las páginas de manual de " "SOnuevo, utilice la opción B<-m> B<SOnuevo>." #. type: Plain text @@ -2848,13 +2850,15 @@ msgstr "%whatis% - muestra descripciones de una lÃnea de las páginas de manual #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<lista>" -"\\|] [\\|B<-m> I<sistema>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<ruta>\\|] [\\|" -"B<-L> I<localización>\\|] [\\|B<-C> I<archivo>\\|] I<nombre> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<lista>\\|] [\\|B<-m> I<sistema>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<ruta>\\|] [\\|B<-L> I<localización>\\|] [\\|B<-C> I<archivo>\\|] I<nombre> " +"\\&.\\|.\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -2882,17 +2886,17 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" msgstr "" -"Durante la búsqueda se utilizan bases de datos de B<Ãndices> y el programa B<" -"%mandb%> las actualiza. Dependiendo de su instalación, esto lo ejecuta una " -"tarea de cron periódica o puede ser que requiera ejecución manual después de " -"instalar páginas de manual nuevas. Para generar una base de datos de " -"B<whatis> en texto al viejo estilo a partir de la base de datos de " +"Durante la búsqueda se utilizan bases de datos de B<Ãndices> y el programa " +"B<%mandb%> las actualiza. Dependiendo de su instalación, esto lo ejecuta " +"una tarea de cron periódica o puede ser que requiera ejecución manual " +"después de instalar páginas de manual nuevas. Para generar una base de " +"datos de B<whatis> en texto al viejo estilo a partir de la base de datos de " "B<Ãndices> relativa, ejecute la orden:" #. type: Plain text @@ -2928,8 +2932,8 @@ msgid "" msgstr "" "Interpreta cada I<nombre> como un patrón que contiene comodines de estilo " "shell. Para considerar una coincidencia, un I<nombre> expandido debe " -"coincidir con el nombre completo de página. Esta opción ralentiza un poco B<" -"%whatis%> a causa de la naturaleza de las búsquedas en base de datos." +"coincidir con el nombre completo de página. Esta opción ralentiza un poco " +"B<%whatis%> a causa de la naturaleza de las búsquedas en base de datos." #. type: Plain text #: ../../man/man1/whatis.man1:131 @@ -3396,11 +3400,16 @@ msgstr "B<CATWIDTH>I<\\ anchura>" #. type: Plain text #: ../../man/man5/manpath.man5:235 +#, fuzzy +#| msgid "" +#| "If I<width> is non-zero, cat pages will always be formatted for a " +#| "terminal of the given width, regardless of the width of the terminal " +#| "actually being used. This should generally be within the range set by " +#| "B<MINCATWIDTH> and B<MAXCATWIDTH>." msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "Si I<anchura> es distinta de cero, las páginas cat siempre se formatean para " "un terminal de la anchura indicada, independientemente de la anchura del " @@ -3549,8 +3558,8 @@ msgid "" "B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<file>\\|] B<-f> I<filename>\\ .\\|." "\\|." msgstr "" -"B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<archivo>\\|] B<-f> I<nombrearchivo>" -"\\ .\\|.\\|." +"B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<archivo>\\|] B<-f> " +"I<nombrearchivo>\\ .\\|.\\|." #. type: Plain text #: ../../man/man8/mandb.man8:38 @@ -3712,10 +3721,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" "Por defecto, B<%mandb%> intenta actualizar cualquier base de datos " "anteriormente creada. Si una base de datos no existe, la crea. Esta opción " diff --git a/man/po4a/po/fr.po b/man/po4a/po/fr.po index 7c0ebe67..a0fb491c 100644 --- a/man/po4a/po/fr.po +++ b/man/po4a/po/fr.po @@ -4,13 +4,13 @@ # # Valery Perrin <valery.perrin.debian@free.fr>, 2005, 2006. # David Prévot <david@tilapin.org>, 2010-2014. -# Stéphane Aulery <lkppo@free.fr>, 2016, 2019, 2020. +# Stéphane Aulery <lkppo@free.fr>, 2016-2022. # msgid "" msgstr "" -"Project-Id-Version: man-db-manpages 2.9.0-pre1\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" -"PO-Revision-Date: 2020-05-07 18:57+0200\n" +"Project-Id-Version: man-db-manpages 2.10.0-pre1\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" +"PO-Revision-Date: 2022-07-05 00:50+0200\n" "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n" "Language-Team: French <traduc@traduc.org>\n" "Language: fr\n" @@ -63,8 +63,9 @@ msgstr "SYNOPSIS" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<liste>\\|] [\\|B<-m> I<système>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " @@ -249,10 +250,6 @@ msgstr "B<-m> I<système>\\|[\\|,.\\|.\\|.\\|]\\|, B<--systems=>I<système>\\|[\ #. type: Plain text #: ../../man/man1/apropos.man1:126 #, fuzzy -#| msgid "" -#| "If this system has access to other operating system's manual page " -#| "descriptions, they can be searched using this option. To search NewOS's " -#| "manual page descriptions, use the option B<-m> B<NewOS>." msgid "" "If this system has access to other operating systems' manual page " "descriptions, they can be searched using this option. To search NewOS's " @@ -294,11 +291,12 @@ msgid "" "the contents of $B<MANPATH>." msgstr "" "Indique une liste de structures hiérarchiques de pages de manuel, séparées " -"par des deux-points, à utiliser lors des recherches. Par défaut, B<%program" -"%> utilise la variable d'environnement $B<MANPATH>, à moins qu'elle ne soit " -"vide ou n'ait été supprimée. Dans ce cas, il détermine la liste appropriée " -"des chemins d'accès aux pages de manuel en se basant sur la variable " -"d'environnement $B<PATH>. Cette option remplace le contenu de $B<MANPATH>." +"par des deux-points, à utiliser lors des recherches. Par défaut, " +"B<%program%> utilise la variable d'environnement $B<MANPATH>, à moins " +"qu'elle ne soit vide ou n'ait été supprimée. Dans ce cas, il détermine la " +"liste appropriée des chemins d'accès aux pages de manuel en se basant sur la " +"variable d'environnement $B<PATH>. Cette option remplace le contenu de " +"$B<MANPATH>." #. type: TP #: ../../man/man1/apropos.man1:152 ../../man/man1/man.man1:545 @@ -459,9 +457,9 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" "Si $B<POSIXLY_CORRECT> est définie, même avec une valeur vide, B<%apropos%> " "fera, par défaut, une recherche selon une expression rationnelle, comme si " @@ -533,11 +531,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encodage>" -"\\|] I<fichier> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encodage>\\|] I<fichier> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/lexgrog.man1:36 @@ -560,11 +558,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" "Si les données en entrée sont mal formatées, B<lexgrog> affichera «\\ parse " "failed\\ ». Cela peut être utile pour les programmes externes qui doivent " @@ -706,8 +704,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" "Certains afficheurs de pages de manuel exigent «\\ \\e-\\ » exactement comme " @@ -780,11 +778,11 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "Il y a plusieurs raisons habituelles pour lesquelles l'analyse whatis " "échoue. Parfois les auteurs des pages de manuel remplacent «\\ .SH NOM\\ » " @@ -883,13 +881,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:88 msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "B<%man%> est le programme de visualisation des pages de manuel. Chacun des " @@ -950,9 +948,6 @@ msgstr "Jeux" #. type: tbl table #: ../../man/man1/man.man1:117 #, fuzzy, no-wrap -#| msgid "" -#| "Miscellaneous (including macro packages and conventions),\n" -#| "e.g.\\& B<man>(7), B<groff>(7)" msgid "" "Miscellaneous (including macro packages and conventions),\n" "e.g.\\& B<man>(7), B<groff>(7), B<man-pages>(7)" @@ -986,10 +981,10 @@ msgid "" "B<BUGS>, B<EXAMPLE>, B<AUTHORS>, and B<SEE\\ ALSO>." msgstr "" "Parmi les noms de section conventionnels se trouvent B<NOM>, B<SYNOPSIS>, " -"B<CONFIGURATION>, B<DESCRIPTION>, B<OPTIONS>, B<CODE\\ DE\\ RETOUR>, B<VALEUR" -"\\ RENVOYÉE>, B<ERREURS>, B<ENVIRONNEMENT>, B<FICHIERS>, B<VERSIONS>, " -"B<CONFORMITÉ>, B<NOTES>, B<BOGUES>, B<EXEMPLE>, B<AUTEURS> et B<VOIR\\ " -"AUSSI>." +"B<CONFIGURATION>, B<DESCRIPTION>, B<OPTIONS>, B<CODE\\ DE\\ RETOUR>, " +"B<VALEUR\\ RENVOYÉE>, B<ERREURS>, B<ENVIRONNEMENT>, B<FICHIERS>, " +"B<VERSIONS>, B<CONFORMITÉ>, B<NOTES>, B<BOGUES>, B<EXEMPLE>, B<AUTEURS> et " +"B<VOIR\\ AUSSI>." #. type: Plain text #: ../../man/man1/man.man1:153 @@ -1210,8 +1205,8 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "Recherche la description courte et le nom des pages de manuel comportant le " "mot-clé I<printf>, utilisé comme une expression rationnelle, puis affiche " @@ -1374,12 +1369,12 @@ msgstr "COMPORTEMENT PAR DÉFAUT" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" "L'ordre de recherche dans les sections peut être modifié par la variable " -"d'environnement $B<MANSECT> ou par la directive B<SECTION> du fichier I<" -"%manpath_config_file%>. L'ordre par défaut est :" +"d'environnement $B<MANSECT> ou par la directive B<SECTION> du fichier " +"I<%manpath_config_file%>. L'ordre par défaut est :" #. type: Plain text #: ../../man/man1/man.man1:361 @@ -1471,10 +1466,10 @@ msgstr "Options générales" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "Cette option est normalement utilisée en toute première option et " "réinitialise les comportements de B<%man%> à leurs valeurs par défaut. Son " @@ -1526,8 +1521,8 @@ msgid "" "keywords and display any matches. See B<%apropos%>(1) for details." msgstr "" "Équivalent à B<%apropos%>. Cherche la description courte des pages de manuel " -"correspondant au mot-clé et affiche toutes celles qu'il trouve. Voir B<" -"%apropos%>(1) pour obtenir des précisions." +"correspondant au mot-clé et affiche toutes celles qu'il trouve. Voir " +"B<%apropos%>(1) pour obtenir des précisions." #. type: Plain text #: ../../man/man1/man.man1:470 @@ -1624,8 +1619,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" "Cette option n'est pas d'un usage général et devrait seulement être utilisée " "par le programme B<%catman%>." @@ -1674,10 +1669,6 @@ msgstr "Trouver des pages de manuel" #. type: Plain text #: ../../man/man1/man.man1:571 #, fuzzy -#| msgid "" -#| "If this system has access to other operating system's manual pages, they " -#| "can be accessed using this option. To search for a manual page from " -#| "NewOS's manual page collection, use the option B<-m> B<NewOS>." msgid "" "If this system has access to other operating systems' manual pages, they can " "be accessed using this option. To search for a manual page from NewOS's " @@ -1710,8 +1701,8 @@ msgid "" "derived code to determine the path to search. This option overrides the " "$B<MANPATH> environment variable and causes option B<-m> to be ignored." msgstr "" -"Précise le chemin de recherche à utiliser. Par défaut, B<%man%> se sert de B<" -"%manpath%> pour déterminer la liste des chemins d'accès aux structures " +"Précise le chemin de recherche à utiliser. Par défaut, B<%man%> se sert de " +"B<%manpath%> pour déterminer la liste des chemins d'accès aux structures " "hiérarchiques de pages de manuel. Cette option remplace la variable " "d'environnement $B<MANPATH> et entraîne l'inefficience de l'option B<-m>." @@ -1768,9 +1759,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" "Certains programmes installent un grand nombre de pages de manuel dans la " "structure hiérarchique principale des manuels, comme celles qui accompagnent " @@ -2153,9 +2144,9 @@ msgid "" msgstr "" "Pour éviter à B<nroff> de couper un mot au mauvais endroit quand vous " "écrivez une page de manuel, n'utilisez pas cette option, mais consultez " -"plutôt la documentation de B<nroff>. Par exemple, vous pouvez placer « \\e" -"% » dans un mot pour indiquer qu'il peut être coupé à cet endroit, ou « \\e" -"% » au début d'un mot pour l'empêcher d'être coupé." +"plutôt la documentation de B<nroff>. Par exemple, vous pouvez placer " +"« \\e% » dans un mot pour indiquer qu'il peut être coupé à cet endroit, ou " +"« \\e% » au début d'un mot pour l'empêcher d'être coupé." #. type: Plain text #: ../../man/man1/man.man1:944 @@ -2173,8 +2164,8 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "Pour éviter à B<nroff> de justifier certains paragraphes quand vous écrivez " @@ -2202,10 +2193,10 @@ msgstr "" "Indique la liste des préprocesseurs à utiliser avant B<nroff>, B<troff> ou " "B<groff>. Toutes les implémentations ne disposent pas du jeu complet de " "préprocesseurs. Voici une liste de certains préprocesseurs, avec les lettres " -"les désignant\\ : B<eqn>\\ (B<e>), B<grap>\\ (B<g>), B<pic>\\ (B<p>), B<tbl>" -"\\ (B<t>), B<vgrind>\\ (B<v>), B<refer>\\ (B<r>). Cette option remplace la " -"variable d'environnement $B<MANROFFSEQ>. B<%zsoelim%> est toujours exécuté " -"comme le tout premier préprocesseur." +"les désignant\\ : B<eqn>\\ (B<e>), B<grap>\\ (B<g>), B<pic>\\ (B<p>), " +"B<tbl>\\ (B<t>), B<vgrind>\\ (B<v>), B<refer>\\ (B<r>). Cette option " +"remplace la variable d'environnement $B<MANROFFSEQ>. B<%zsoelim%> est " +"toujours exécuté comme le tout premier préprocesseur." #. type: Plain text #: ../../man/man1/man.man1:980 @@ -2353,16 +2344,16 @@ msgstr "" "Si $B<MANSECT> est définie, sa valeur est une liste de sections, séparées " "par des deux-points. Cette liste est utilisée pour déterminer les sections " "de manuel, et l’ordre, utilisés pour la recherche. C’est « %sections% » par " -"défaut, à moins d’être écrasée par la directive B<SECTION> dans I<" -"%manpath_config_file%>." +"défaut, à moins d’être écrasée par la directive B<SECTION> dans " +"I<%manpath_config_file%>." #. type: Plain text #: ../../man/man1/man.man1:1126 msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "Si $B<MANPAGER> ou $B<PAGER> est définie ($B<MANPAGER> est prioritaire), sa " "valeur est exploitée en tant que nom du programme utilisé pour afficher les " @@ -2376,8 +2367,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "Si $B<MANLESS> est définie, sa valeur sera utilisée comme chaîne d’invite " "par défaut de l'afficheur B<less>, comme si elle avait été passée en " @@ -2393,8 +2384,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "Si $B<BROWSER> est définie, sa valeur est une liste de commandes séparées " "par des deux-points. Chaque élément de la liste est utilisé pour essayer de " @@ -2497,8 +2488,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" @@ -2506,8 +2497,8 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "Suivant le système et l'implémentation, soit $B<LANG>, soit $B<LC_MESSAGES>, " @@ -2619,8 +2610,8 @@ msgstr "" "utile pour le réencodage de pages écrites dans d'anciens encodages, ou pour " "les systèmes de compilation qui réencodent toutes les pages dans en seul " "encodage (le plus souvent UTF-8) avant pour une installation. Pour une " -"conversion de pages de manuel ce programme est plus rapide que d'exécuter B<" -"%man% --recode> ou B<%manconv%> pour chaque page." +"conversion de pages de manuel ce programme est plus rapide que d'exécuter " +"B<%man% --recode> ou B<%manconv%> pour chaque page." #. type: Plain text #: ../../man/man1/man-recode.man1:36 @@ -2824,10 +2815,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/manpath.man1:63 #, fuzzy -#| msgid "" -#| "If this system has access to other operating system's manual hierarchies, " -#| "this option can be used to include them in the output of B<%manpath%>. " -#| "To include NewOS's manual page hierarchies use the option B<-m> B<NewOS>." msgid "" "If this system has access to other operating systems' manual hierarchies, " "this option can be used to include them in the output of B<%manpath%>. To " @@ -2867,13 +2854,15 @@ msgstr "%whatis% - Afficher une ligne de description des pages de manuel" #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<liste>" -"\\|] [\\|B<-m> I<système>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<chemin>\\|] " -"[\\|B<-L> I<locale>\\|] [\\|B<-C> I<fichier>\\|] I<nom> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<liste>\\|] [\\|B<-m> I<système>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<chemin>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<fichier>\\|] I<nom> \\&." +"\\|.\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -2902,8 +2891,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" @@ -2958,10 +2947,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:131 #, fuzzy -#| msgid "" -#| "If this system has access to other operating system's manual page names, " -#| "they can be accessed using this option. To search NewOS's manual page " -#| "names, use the option B<-m> B<NewOS>." msgid "" "If this system has access to other operating systems' manual page names, " "they can be accessed using this option. To search NewOS's manual page " @@ -3144,15 +3129,6 @@ msgstr "" #. type: Plain text #: ../../man/man5/manpath.man5:96 #, fuzzy -#| msgid "" -#| "If $B<MANPATH> is set, B<%manpath%> displays its value rather than " -#| "determining it on the fly. If $B<MANPATH> is prefixed by a colon, then " -#| "the value of the variable is appended to the list determined from the " -#| "content of the configuration files. If the colon comes at the end of the " -#| "value in the variable, then the determined list is appended to the " -#| "content of the variable. If the value of the variable contains a double " -#| "colon (B<::>), then the determined list is inserted in the middle of the " -#| "value, between the two colons." msgid "" "If the value of $B<MANPATH> starts with a colon, then the default search " "path is added at its start. If the value of $B<MANPATH> ends with a colon, " @@ -3424,11 +3400,16 @@ msgstr "B<CATWIDTH>I<\\ largeur>" #. type: Plain text #: ../../man/man5/manpath.man5:235 +#, fuzzy +#| msgid "" +#| "If I<width> is non-zero, cat pages will always be formatted for a " +#| "terminal of the given width, regardless of the width of the terminal " +#| "actually being used. This should generally be within the range set by " +#| "B<MINCATWIDTH> and B<MAXCATWIDTH>." msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "Si I<largeur> est non nulle, les pages « cat » seront toujours formatées " "pour un terminal de la largeur donnée, quelque soit la largeur du terminal " @@ -3534,8 +3515,8 @@ msgstr "" "spécifiées comme structures hiérarchiques «\\ système\\ » dans le fichier de " "configuration de man-db. Les sections par défaut sont celles, séparées par " "des «\\ :\\ », contenues dans la variable d'environnement $B<MANSECT>. Si " -"$B<MANSECT> n'est pas définie alors la liste standard, compilée dans B<%man" -"%>, sera utilisée. La présence de plusieurs sections, séparées par des " +"$B<MANSECT> n'est pas définie alors la liste standard, compilée dans " +"B<%man%>, sera utilisée. La présence de plusieurs sections, séparées par des " "blancs (whitespace), dans la commande B<%catman%>, remplacera les deux " "valeurs par défaut précédentes." @@ -3589,8 +3570,8 @@ msgid "" "B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<file>\\|] B<-f> I<filename>\\ .\\|." "\\|." msgstr "" -"B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<fichier>\\|] B<-f> I<nom_de_fichier>" -"\\ .\\|.\\|." +"B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<fichier>\\|] B<-f> " +"I<nom_de_fichier>\\ .\\|.\\|." #. type: Plain text #: ../../man/man8/mandb.man8:38 @@ -3601,8 +3582,8 @@ msgid "" "db utilities to enhance their speed and functionality." msgstr "" "B<%mandb%> est employé pour initialiser ou mettre à jour manuellement les " -"B<bases de données d'indexation>. Ces bases de données forment un «\\ cache" -"\\ » du système de fichiers qui contient les pages de manuel. Elles " +"B<bases de données d'indexation>. Ces bases de données forment un «\\ " +"cache\\ » du système de fichiers qui contient les pages de manuel. Elles " "contiennent l'état actuel du système de pages de manuel ainsi que les " "informations qui y sont stockées. Elles sont exploitées par les utilitaires " "de man-db pour accroître leur vitesse et leurs fonctionnalités." @@ -3754,10 +3735,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" "Par défaut, B<%mandb%> essaiera de mettre à jour les bases de données " "précédemment créées. Si une base de données n'existe pas, elle sera créée. " @@ -3783,8 +3764,8 @@ msgid "" "With this option, B<%mandb%> will not alter existing databases." msgstr "" "Exécute les contrôles de validité des pages de manuel de la liste des " -"structures hiérarchiques du chemin de recherche. Avec cette option, B<%mandb" -"%> ne modifie pas les bases de données existantes." +"structures hiérarchiques du chemin de recherche. Avec cette option, " +"B<%mandb%> ne modifie pas les bases de données existantes." #. type: Plain text #: ../../man/man8/mandb.man8:125 @@ -3938,15 +3919,12 @@ msgstr "" "La section B<ANALYSE WHATIS> autrefois incluse dans cette page de manuel est " "maintenant incorporée à B<lexgrog>(1)." -#, no-wrap #~ msgid "Type" #~ msgstr "Type" -#, no-wrap #~ msgid "Binary tree" #~ msgstr "Arbre Binaire" -#, no-wrap #~ msgid "Hashed" #~ msgstr "Hachage" @@ -3955,19 +3933,19 @@ msgstr "" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> [\\|B<-C> I<fichier>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#~ "avertissements>\\|[\\|=I<avertissements>\\|]\\|] [\\|B<-R> I<encodage>" -#~ "\\|] [\\|B<-L> I<locale>\\|] [\\|B<-m> I<système>\\|[\\|,.\\|.\\|." -#~ "\\|]\\|] [\\|B<-M> I<chemin>\\|] [\\|B<-S> I<liste>\\|] [\\|B<-e> " +#~ "avertissements>\\|[\\|=I<avertissements>\\|]\\|] [\\|B<-R> " +#~ "I<encodage>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-m> I<système>\\|[\\|,.\\|." +#~ "\\|.\\|]\\|] [\\|B<-M> I<chemin>\\|] [\\|B<-S> I<liste>\\|] [\\|B<-e> " #~ "I<extension>\\|] [\\|B<-i>\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--" #~ "wildcard>\\|] [\\|B<--noms-seuls>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--" #~ "no-souspages>\\|] [\\|B<-P> I<afficheur>\\|] [\\|B<-r> I<invite>\\|] [\\|" @@ -3978,33 +3956,33 @@ msgstr "" #~ "I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<liste>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<liste>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgid "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-l> [\\|B<-C> I<fichier>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|" #~ "B<--warnings>\\|[\\|=I<avertissements>\\|]\\|] [\\|B<-R> I<encodage>\\|] " -#~ "[\\|B<-L> I<locale>\\|] [\\|B<-P> I<afficheur>\\|] [\\|B<-r> I<invite>" -#~ "\\|] [\\|B<-7>\\|] [\\|B<-E> I<encodage>\\|] [\\|B<-p> I<chaîne>\\|] [\\|" -#~ "B<-t>\\|] [\\|B<-T>\\|[\\|I<périphérique>\\|]\\|] [\\|B<-H>\\|[\\|" -#~ "I<navigateur>\\|]\\|] [\\|B<-X>\\|[\\|I<ppp>\\|]\\|] [\\|B<-Z>\\|] " -#~ "I<fichier> \\&.\\|.\\|.\\&" +#~ "[\\|B<-L> I<locale>\\|] [\\|B<-P> I<afficheur>\\|] [\\|B<-r> " +#~ "I<invite>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encodage>\\|] [\\|B<-p> " +#~ "I<chaîne>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<périphérique>\\|]\\|] [\\|" +#~ "B<-H>\\|[\\|I<navigateur>\\|]\\|] [\\|B<-X>\\|[\\|I<ppp>\\|]\\|] [\\|B<-" +#~ "Z>\\|] I<fichier> \\&.\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<fichier>\\|] [\\|B<-d>\\|] [\\|B<-" #~ "D>\\|] I<page> \\&.\\|.\\|.\\&" @@ -4053,8 +4031,8 @@ msgstr "" #~ "par B<%mandb%>, pour une structure hiérarchique spécifique de pages de " #~ "manuel, il cherchera les pages de manuel demandées, bien que " #~ "l'utilisation d'un mécanisme semblable à la commande B<glob>(3) soit " -#~ "nécessaire pour chercher dans cette hiérarchie. Si B<%whatis%> ou B<" -#~ "%apropos%> ne trouvent pas la B<base de données d'indexation> ils " +#~ "nécessaire pour chercher dans cette hiérarchie. Si B<%whatis%> ou " +#~ "B<%apropos%> ne trouvent pas la B<base de données d'indexation> ils " #~ "essaieront d'extraire l'information depuis une base de données I<whatis> " #~ "traditionnelle." @@ -4091,8 +4069,8 @@ msgstr "" #~ "B<%man%> will search for the desired manual pages within the I<index> " #~ "database caches. If the B<-u> option is given, a cache consistency check " #~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " +#~ "If this option is always given, it is not generally necessary to run " +#~ "B<%mandb%> after the caches are initially created, unless a cache becomes " #~ "corrupt. However, the cache consistency check can be slow on systems " #~ "with many manual pages installed, so it is not performed by default, and " #~ "system administrators may wish to run B<%mandb%> every week or so to keep " @@ -4113,8 +4091,8 @@ msgstr "" #~ "cohérence n'est pas exécuté par défaut, laissant à l'administrateur du " #~ "système le soin d'exécuter B<%mandb%> chaque semaine ou de laisser les " #~ "B<bases de données d'indexation> telles quelles. Pour prévenir les " -#~ "problèmes provoqués par les B<bases de données d'indexation> périmées, B<" -#~ "%man%> se retournera vers l'utilisation d'un mécanisme semblable à la " +#~ "problèmes provoqués par les B<bases de données d'indexation> périmées, " +#~ "B<%man%> se retournera vers l'utilisation d'un mécanisme semblable à la " #~ "commande B<glob>(3) si une consultation de la B<base de données " #~ "d'indexation> échoue, exactement comme si aucune n'existait." diff --git a/man/po4a/po/id.po b/man/po4a/po/id.po index 4a35f9e6..9a840480 100644 --- a/man/po4a/po/id.po +++ b/man/po4a/po/id.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-manpages 2.6.6-pre2\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: 2014-08-10 09:25+0700\n" "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" @@ -57,8 +57,9 @@ msgstr "RINGKASAN" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalhvV>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<bagian>\\|] [\\|B<-m> I<sistem>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " @@ -82,8 +83,8 @@ msgid "" "Each manual page has a short description available within it. B<%apropos%> " "searches the descriptions for instances of I<keyword>." msgstr "" -"Setiap halaman buku panduan memiliki sebuah deskripsi singkat didalamnya. B<" -"%apropos%> mencari deskripsi untuk setiap hal dari I<kata kunci>." +"Setiap halaman buku panduan memiliki sebuah deskripsi singkat didalamnya. " +"B<%apropos%> mencari deskripsi untuk setiap hal dari I<kata kunci>." #. type: Plain text #: ../../man/man1/apropos.man1:50 @@ -224,9 +225,9 @@ msgstr "" "Hanya cari di bagian buku panduan yang diberikan. Jika I<bagian> adalah " "sebuah bagian sederhana, sebagai contoh \"3\", maka tampilkan daftar dari " "deskripsi akan memasukan halaman dalam bagian \"3\", \"3perl\", \"3x\", dan " -"selanjutnya; jika I<bagian> memiliki sebuah ekstensi, sebagai contoh \"3perl" -"\", maka daftar hanya akan memasukan halaman dalam bagian tepat dari bagian " -"buku panduan." +"selanjutnya; jika I<bagian> memiliki sebuah ekstensi, sebagai contoh " +"\"3perl\", maka daftar hanya akan memasukan halaman dalam bagian tepat dari " +"bagian buku panduan." #. type: TP #: ../../man/man1/apropos.man1:118 ../../man/man1/man.man1:562 @@ -449,9 +450,9 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" "Jika $B<POSIXLY_CORRECT> diset, meskipun ke sebuah nilai null, pencarian " "baku B<%apropos%> akan berupa sebuah ekstensi regex (B<-r>). Saat ini, ini " @@ -521,8 +522,8 @@ msgstr "lexgrog - ambil kepala informasi dalam halaman buku panduan" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" "B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-fhw?V>\\|] [\\|B<-E> " "I<pengkodean>\\|] I<berkas> \\&.\\|.\\|." @@ -548,11 +549,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" "Jika masukannya terformat buruk, B<lexgrog> akan menampilkan \\(lqparse " "failed\\(rq; ini mungkin berguna untuk program eksternal yang butuh " @@ -576,8 +577,9 @@ msgid "" "Parse input as preformatted man pages (\\(lqcat pages\\(rq). B<--man> and " "B<--cat> may not be given simultaneously." msgstr "" -"Ambil masukan sebagai halaman buku panduan terformat (\\(lqcat halaman" -"\\(rq). B<--man> dan B<--cat> mungkin tidak diberikan secara bersamaan." +"Ambil masukan sebagai halaman buku panduan terformat (\\(lqcat " +"halaman\\(rq). B<--man> dan B<--cat> mungkin tidak diberikan secara " +"bersamaan." #. type: Plain text #: ../../man/man1/lexgrog.man1:75 @@ -701,8 +703,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" "Beberapa halaman buku panduan membutuhkan \\(oq\\e-\\(cq sama seperti yang " @@ -774,11 +776,11 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "Ada beberapa sebab umum kenapa pengambilan whatis gagal. Kadang kadang " "pengarang dari halaman buku panduan mengganti \\(oq.SH NAMA\\(cq dengan " @@ -885,23 +887,23 @@ msgstr "B<%man%> B<-f> [\\|I<whatis> I<pilihan>\\|] I<halaman> \\&.\\|.\\|." #: ../../man/man1/man.man1:88 #, fuzzy #| msgid "" -#| "B<%man%> is the system's manual pager. Each I<page> argument given to B<" -#| "%man%> is normally the name of a program, utility or function. The " +#| "B<%man%> is the system's manual pager. Each I<page> argument given to " +#| "B<%man%> is normally the name of a program, utility or function. The " #| "I<manual page> associated with each of these arguments is then found and " #| "displayed. A I<section>, if provided, will direct B<%man%> to look only " #| "in that I<section> of the manual. The default action is to search in all " #| "of the available I<sections> following a pre-defined order (\"%sections%" -#| "\" by default, unless overridden by the B<SECTION> directive in I<" -#| "%manpath_config_file%>), and to show only the first I<page> found, even " +#| "\" by default, unless overridden by the B<SECTION> directive in " +#| "I<%manpath_config_file%>), and to show only the first I<page> found, even " #| "if I<page> exists in several I<sections>." msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "B<%man%> adalah sistem halaman buku panduan. Setiap argumen I<halaman> " @@ -1238,12 +1240,12 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "Cari deskripsi singkat dan nama halaman buku panduan untuk kata kunci " -"I<printf> seperti ekspresi umum. Cetak semua kecocokan. Sama dengan B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> seperti ekspresi umum. Cetak semua kecocokan. Sama dengan " +"B<%apropos%>I<\\ printf>B<.>" #. type: TP #: ../../man/man1/man.man1:261 @@ -1419,8 +1421,8 @@ msgstr "BAKU" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" #. type: Plain text @@ -1522,10 +1524,10 @@ msgstr "Pilihan umum" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "Pilihan ini secara normal diisukan sebagai pilihan paling pertama dan " "mereset B<%man%> perilaku ke bakunya. Ini digunakan untuk mereset pilihan " @@ -1685,8 +1687,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" "Pilihan in tidak untuk penggunaan umum dan seharusnya hanya digunakan oleh " "aplikasi B<%catman%>." @@ -1768,8 +1770,8 @@ msgid "" "derived code to determine the path to search. This option overrides the " "$B<MANPATH> environment variable and causes option B<-m> to be ignored." msgstr "" -"Spesifikasikan sebuah jalur man alternatif untuk digunakan. Secara baku, B<" -"%man%> menggunakan B<%manpath%> kode turunan untuk menentukan jalur " +"Spesifikasikan sebuah jalur man alternatif untuk digunakan. Secara baku, " +"B<%man%> menggunakan B<%manpath%> kode turunan untuk menentukan jalur " "pencarian. Pilihan ini mengesampingkan variabel lingkungan $B<MANPATH> dan " "dapat menyebabkan pilihan B<-m> untuk diabaikan." @@ -1783,9 +1785,9 @@ msgid "" msgstr "" "Sebuah jalur dispesifikasikan sebagai sebuah jalur buku panduan harus berupa " "akar dari struktur halaman buku panduan terstruktur dalam daerah seperti " -"dijelaskan dalam buku panduan man-db (dibawah \"Halaman buku panduan sistem" -"\"). Untuk melihat halaman buku panduan diluar dari struktur seperti itu, " -"lihat pilihan B<-l>." +"dijelaskan dalam buku panduan man-db (dibawah \"Halaman buku panduan " +"sistem\"). Untuk melihat halaman buku panduan diluar dari struktur seperti " +"itu, lihat pilihan B<-l>." #. type: TP #: ../../man/man1/man.man1:602 @@ -1846,9 +1848,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" "Beberapa sistem menggunakan paket besar dari halaman buku panduan, seperti " "yang menyertai paket B<Tcl>, kedalam hierarki halaman buku panduan utama. " @@ -1978,10 +1980,10 @@ msgstr "B<-P\\ >I<pager>,\\ B<--pager=>I<pager>" #: ../../man/man1/man.man1:757 #, fuzzy #| msgid "" -#| "Specify which output pager to use. By default, B<%man%> uses B<%pager" -#| "%>. This option overrides the $B<MANPAGER> environment variable, which " -#| "in turn overrides the $B<PAGER> environment variable. It is not used in " -#| "conjunction with B<-f> or B<-k>." +#| "Specify which output pager to use. By default, B<%man%> uses " +#| "B<%pager%>. This option overrides the $B<MANPAGER> environment variable, " +#| "which in turn overrides the $B<PAGER> environment variable. It is not " +#| "used in conjunction with B<-f> or B<-k>." msgid "" "Specify which output pager to use. By default, B<%man%> uses B<%pager%>, " "falling back to B<%cat%> if B<%pager%> is not found or is not executable. " @@ -1989,10 +1991,10 @@ msgid "" "overrides the $B<PAGER> environment variable. It is not used in conjunction " "with B<-f> or B<-k>." msgstr "" -"Spesifikasikan pager keluaran mana yang akan digunakan, Secara baku, B<%man" -"%> menggunakan B<%pager%>. Pilihan ini mengesampingkan variabel lingkungan " -"$B<MANPAGER>, yang jadinya mengesampingkan variabel lingkungan $B<PAGER>. " -"Ini tidak digunakan dengan konjungsi dengan B<-f> atau B<-k>." +"Spesifikasikan pager keluaran mana yang akan digunakan, Secara baku, " +"B<%man%> menggunakan B<%pager%>. Pilihan ini mengesampingkan variabel " +"lingkungan $B<MANPAGER>, yang jadinya mengesampingkan variabel lingkungan " +"$B<PAGER>. Ini tidak digunakan dengan konjungsi dengan B<-f> atau B<-k>." #. type: Plain text #: ../../man/man1/man.man1:763 ../../man/man1/man.man1:1132 @@ -2098,8 +2100,8 @@ msgstr "" "dievaluasi oleh shell. Semua double quotes, back-quotes dan backslashes " "dalam prompt harus diberi karakter untuk keluar dengan sebuah awalan " "backslash. Prompt string mungkin berakhir dalam sebuah karakter untuk keluar " -"$ yang mungkin diikuti oleh pilihan selanjutnya untuk less. Secara baku B<" -"%man%> menset pilihan B<-ix8>." +"$ yang mungkin diikuti oleh pilihan selanjutnya untuk less. Secara baku " +"B<%man%> menset pilihan B<-ix8>." #. type: Plain text #: ../../man/man1/man.man1:827 @@ -2260,8 +2262,8 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "Jika anda menulis sebuah halaman buku panduan dan hanya ingin menjaga " @@ -2379,9 +2381,9 @@ msgid "" "processor. It implies B<-t>." msgstr "" "B<groff> akan menjalankan B<troff> dan kemudian menggunakan sebuah post " -"prosesor yang sesuai untuk menghasilkan perangkat yang dipilih. Jika I<%troff" -"%> adalah B<groff>, pilihan ini akan dilewatkan ke B<groff> dan akan menekan " -"penggunaan dari sebuah post-prosesor. Ini mengimplikasikan B<-t>." +"prosesor yang sesuai untuk menghasilkan perangkat yang dipilih. Jika " +"I<%troff%> adalah B<groff>, pilihan ini akan dilewatkan ke B<groff> dan akan " +"menekan penggunaan dari sebuah post-prosesor. Ini mengimplikasikan B<-t>." #. type: SS #: ../../man/man1/man.man1:1038 @@ -2450,8 +2452,8 @@ msgstr "" msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "jika $B<MANPAGER> atau $B<PAGER> diset ($B<MANPAGER> digunakan dalam " "kesukaan), nilainya digunakan sebagai nama dari aplikasi yang digunakan " @@ -2464,8 +2466,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "Jika $B<MANLESS> diset, B<%man%> tidak akan melakukan pemrosesan biasa untuk " "mengkonfigurasi prompt string untuk pager B<less>. Sebaliknya, nilai dari " @@ -2479,8 +2481,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "Jika $B<BROWSER> diset, nilai itu adalah daftar dipisahkan kolon dari " "perintah, setiap perintah itu digunakan untuk mencoba menjalankan sebuah web " @@ -2594,8 +2596,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" @@ -2603,8 +2605,8 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "Tergantung dari sistem dan implementasi, baik atau kedua dari $B<LANG> dan " @@ -2737,8 +2739,9 @@ msgstr "" #, fuzzy #| msgid "" #| "If an encoding declaration is found on the first line of the manual page, " -#| "that declaration overrides any input encodings specified on B<%manconv" -#| "%>'s command line. Encoding declarations have the following form:" +#| "that declaration overrides any input encodings specified on " +#| "B<%manconv%>'s command line. Encoding declarations have the following " +#| "form:" msgid "" "If an encoding declaration is found on the first line of a manual page, then " "that declaration is used as the input encoding for that page. Failing that, " @@ -2991,13 +2994,15 @@ msgstr "%whatis% - menampilkan deskripsi halaman buku panduan" #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlhvV>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<bagian>" -"\\|] [\\|B<-m> I<sistem>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<jalur>\\|] [\\|" -"B<-L> I<lokal>\\|] [\\|B<-C> I<berkas>\\|] I<nama> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlhvV>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<bagian>\\|] [\\|B<-m> I<sistem>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<jalur>\\|] [\\|B<-L> I<lokal>\\|] [\\|B<-C> I<berkas>\\|] I<nama> \\&.\\|." +"\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -3025,8 +3030,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" @@ -3072,8 +3077,8 @@ msgid "" msgstr "" "Interpretasikan setiap I<nama> sebagai sebuah pola berisi shell style " "karakter bebas. Untuk sebuah pencocokan untuk dibuat, sebuah I<nama> " -"terekspan harus cocok dengan seluruh nama halaman. Pilihan ini menyebabkan B<" -"%whatis%> menjadi lebih lambat karena cara kerja dari pencarian basis data." +"terekspan harus cocok dengan seluruh nama halaman. Pilihan ini menyebabkan " +"B<%whatis%> menjadi lebih lambat karena cara kerja dari pencarian basis data." #. type: Plain text #: ../../man/man1/whatis.man1:131 @@ -3357,10 +3362,10 @@ msgstr "" "Baris dari bentuk ini mengindikasikan manpaths mana yang diperlakukan " "sebagai sistem manpath, dan secara opsional dimana berkas catnya seharusnya " "disimpan. Tipe bagian ini biasanya penting jika B<man> adalah aplikasi " -"setuid, seperti (ketika dalam berkas sistem konfigurasi %manpath_config_file" -"% daripada berkas konfiguras setiap pengguna .manpath) ini mengindikasikan " -"ke susunan halaman buku panduan mana untuk diakses sebagai setuid pengguna " -"dan mana yang memanggil pengguna." +"setuid, seperti (ketika dalam berkas sistem konfigurasi " +"%manpath_config_file% daripada berkas konfiguras setiap pengguna .manpath) " +"ini mengindikasikan ke susunan halaman buku panduan mana untuk diakses " +"sebagai setuid pengguna dan mana yang memanggil pengguna." #. type: Plain text #: ../../man/man5/manpath.man5:142 @@ -3527,11 +3532,16 @@ msgstr "B<CATWIDTH>I<\\ lebar>" #. type: Plain text #: ../../man/man5/manpath.man5:235 +#, fuzzy +#| msgid "" +#| "If I<width> is non-zero, cat pages will always be formatted for a " +#| "terminal of the given width, regardless of the width of the terminal " +#| "actually being used. This should generally be within the range set by " +#| "B<MINCATWIDTH> and B<MAXCATWIDTH>." msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "Jika I<lebar> bukan-nol, halaman buku panduan akan selalu diformat untuk " "sebuah terminal dari lebar yang diberikan, tidak perduli lebar dari terminal " @@ -3673,8 +3683,8 @@ msgstr "%mandb% - buat atau perbarui indeks persediaan halaman buku panduan" msgid "" "B<%mandb%> [\\|B<-dqsucpt?V>\\|] [\\|B<-C> I<file>\\|] [\\|I<manpath>\\|]" msgstr "" -"B<%mandb%> [\\|B<-dqsucpt?V>\\||\\|B<-h>\\||\\|B<-V>\\|] [\\|B<-C> I<berkas>" -"\\|] [\\|I<jalurman>\\|]" +"B<%mandb%> [\\|B<-dqsucpt?V>\\||\\|B<-h>\\||\\|B<-V>\\|] [\\|B<-C> " +"I<berkas>\\|] [\\|I<jalurman>\\|]" #. type: Plain text #: ../../man/man8/mandb.man8:30 @@ -3852,10 +3862,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" "Secara baku, B<%mandb%> akan mencoba memperbarui basis data yang dibuat " "sebelumnya. Jika sebuah basis data tidak ada, ini akan dibuat. Pilihan ini " @@ -4049,87 +4059,89 @@ msgstr "" #~| "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~| "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~| "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#~| "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>" -#~| "\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~| "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-" +#~| "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" #~| "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~| "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~| "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~| "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>" -#~| "\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] " -#~| "[\\|[\\|I<section>\\|] I<page>\\ .\\|.\\|.\\|]\\ .\\|.\\|." +#~| "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~| "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-" +#~| "justification>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|" +#~| "I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|" +#~| "I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<section>\\|] I<page>\\ .\\|.\\|." +#~| "\\|]\\ .\\|.\\|." #~ msgid "" #~ "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> [\\|B<-C> I<berkas>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<peringatan>\\|]\\|] [\\|B<-R> I<pengkodean>\\|] [\\|B<-" #~ "L> I<lokal>\\|] [\\|B<-m> I<sistem>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#~ "I<jalur>\\|] [\\|B<-S> I<daftar>\\|] [\\|B<-e> I<ekstensi>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "I<jalur>\\|] [\\|B<-S> I<daftar>\\|] [\\|B<-e> I<ekstensi>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" #~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|][\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<pengkodean>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " -#~ "[\\|B<-T>\\|[\\|I<perangkat>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] " -#~ "[\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<bagian>\\|] " -#~ "I<halaman>\\ .\\|.\\|.\\|]\\ .\\|.\\|." +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<pengkodean>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<-p> I<string>\\|] [\\|" +#~ "B<-t>\\|] [\\|B<-T>\\|[\\|I<perangkat>\\|]\\|] [\\|B<-H>\\|[\\|" +#~ "I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|" +#~ "I<bagian>\\|] I<halaman>\\ .\\|.\\|.\\|]\\ .\\|.\\|." #, fuzzy #~| msgid "" -#~| "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~| "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~| "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~| "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." #~| "\\|." #~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<daftar>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<bagian>\\|] I<term>\\.\\|.\\|." +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<daftar>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<bagian>\\|] I<term>\\.\\|.\\|." #, fuzzy #~| msgid "" #~| "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~| "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~| "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~| "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~| "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-" -#~| "X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|." +#~| "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~| "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-" +#~| "t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|" +#~| "I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> " +#~| "\\&.\\|.\\|." #~ msgid "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-l> [\\|B<-C> I<berkas>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|" #~ "B<--warnings>\\|[\\|=I<peringatan>\\|]\\|] [\\|B<-R> I<pengkodean>\\|] " #~ "[\\|B<-L> I<lokal>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" -#~ "B<-7>\\|] [\\|B<-E> I<pengkodean>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>" -#~ "\\|] [\\|B<-T>\\|[\\|I<perangkat>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>" -#~ "\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<berkas> \\&.\\|." -#~ "\\|." +#~ "B<-7>\\|] [\\|B<-E> I<pengkodean>\\|] [\\|B<-p> I<string>\\|] [\\|B<-" +#~ "t>\\|] [\\|B<-T>\\|[\\|I<perangkat>\\|]\\|] [\\|B<-H>\\|[\\|" +#~ "I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<berkas> " +#~ "\\&.\\|.\\|." #, fuzzy #~| msgid "" -#~| "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~| "\\|] I<page> \\&.\\|.\\|." +#~| "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~| "D>\\|] I<page> \\&.\\|.\\|." #~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<berkas>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<halaman> \\&.\\|.\\|." +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<berkas>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<halaman> \\&.\\|.\\|." #, fuzzy #~| msgid "" @@ -4214,8 +4226,8 @@ msgstr "" #~ "B<%man%> will search for the desired manual pages within the I<index> " #~ "database caches. If the B<-u> option is given, a cache consistency check " #~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " +#~ "If this option is always given, it is not generally necessary to run " +#~ "B<%mandb%> after the caches are initially created, unless a cache becomes " #~ "corrupt. However, the cache consistency check can be slow on systems " #~ "with many manual pages installed, so it is not performed by default, and " #~ "system administrators may wish to run B<%mandb%> every week or so to keep " @@ -4363,15 +4375,15 @@ msgstr "" #~ msgstr "_\n" #~ msgid "" -#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis" -#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), " -#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), " -#~ "the man-db package manual, B<FSSTND>." +#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), " +#~ "B<%whatis%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), " +#~ "B<groff>(1), B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), " +#~ "B<latin1>(7), the man-db package manual, B<FSSTND>." #~ msgstr "" -#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis" -#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), " -#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), " -#~ "paket buku panduan man-db, B<FSSTND>." +#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), " +#~ "B<%whatis%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), " +#~ "B<groff>(1), B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), " +#~ "B<latin1>(7), paket buku panduan man-db, B<FSSTND>." #~ msgid "Name@Type@Async@Filename\n" #~ msgstr "Nama@Tipe@Async@Namaberkas\n" diff --git a/man/po4a/po/ja.po b/man/po4a/po/ja.po index 36cb9228..f14c1f9d 100644 --- a/man/po4a/po/ja.po +++ b/man/po4a/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-manpages 2.6.0.2\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: 2011-09-11 22:32+0900\n" "Last-Translator: Yasuaki Taniguchi <yasuakit@gmail.com>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" @@ -64,12 +64,14 @@ msgstr "書å¼" #| "\\|.\\|." msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalhvV>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." #. type: SH #: ../../man/man1/apropos.man1:32 ../../man/man1/lexgrog.man1:20 @@ -123,8 +125,8 @@ msgid "" msgstr "" "B<%apropos%> ã«ã‚ˆã£ã¦æ¤œç´¢ã•ã‚Œã‚‹ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã¯ B<%mandb%> プãƒã‚°ãƒ©ãƒ ã«ã‚ˆã£ã¦æ›´" "æ–°ã•ã‚Œã¾ã™ã€‚インストール方法ã«ã‚ˆã‚Šã¾ã™ãŒã€cron ジョブã¨ã—㦠B<%mandb%> ãŒå®šæœŸ" -"çš„ã«å®Ÿè¡Œã•ã‚Œã¦ã„ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã—ã€ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’インストール時㫠B<" -"%mandb%> を手動ã§å®Ÿè¡Œã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。" +"çš„ã«å®Ÿè¡Œã•ã‚Œã¦ã„ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“ã—ã€ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’インストール時㫠" +"B<%mandb%> を手動ã§å®Ÿè¡Œã™ã‚‹å¿…è¦ãŒã‚ã‚‹ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。" #. type: SH #: ../../man/man1/apropos.man1:61 ../../man/man1/lexgrog.man1:45 @@ -225,9 +227,9 @@ msgstr "" "指定ã—ãŸãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã®ã¿æ¤œç´¢ã—ã¾ã™ã€‚ I<list> ã¯ã‚³ãƒãƒ³ã¾ãŸã¯ã‚³ãƒ³ãƒžã§åŒº" "切られãŸã‚»ã‚¯ã‚·ãƒ§ãƒ³ã®ãƒªã‚¹ãƒˆã§ã™ã€‚ã‚‚ã—〠I<list> ã®é …ç›®ãŒå˜ç´”ãªã‚»ã‚¯ã‚·ãƒ§ãƒ³ã€ä¾‹ãˆ" "ã° \"3\" ãªã‚‰ã°ã€è¡¨ç¤ºã•ã‚Œã‚‹èª¬æ˜Žã®ãƒªã‚¹ãƒˆã«ã¯ \"3\"〠\"3perl\"〠\"3x\" ç‰ã®ã‚»" -"クションã®ãƒšãƒ¼ã‚¸ãŒå«ã¾ã‚Œã¾ã™ã€‚一方 I<list> ã«æ‹¡å¼µéƒ¨åˆ†ã‚‚å«ã‚ã‚‹ã€ä¾‹ãˆã° \"3perl" -"\" ãªã‚‰ã°ã€è¡¨ç¤ºã•ã‚Œã‚‹èª¬æ˜Žã®ãƒªã‚¹ãƒˆã¯ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã«åŽ³å¯†ã«ä¸€è‡´ã—ãŸãƒšãƒ¼ã‚¸" -"ã®ã¿å«ã¾ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚" +"クションã®ãƒšãƒ¼ã‚¸ãŒå«ã¾ã‚Œã¾ã™ã€‚一方 I<list> ã«æ‹¡å¼µéƒ¨åˆ†ã‚‚å«ã‚ã‚‹ã€ä¾‹ãˆã° " +"\"3perl\" ãªã‚‰ã°ã€è¡¨ç¤ºã•ã‚Œã‚‹èª¬æ˜Žã®ãƒªã‚¹ãƒˆã¯ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã«åŽ³å¯†ã«ä¸€è‡´ã—" +"ãŸãƒšãƒ¼ã‚¸ã®ã¿å«ã¾ã‚Œã‚‹ã‚ˆã†ã«ãªã‚Šã¾ã™ã€‚" #. type: TP #: ../../man/man1/apropos.man1:118 ../../man/man1/man.man1:562 @@ -449,13 +451,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" -"$B<POSIXLY_CORRECT> ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€å€¤ãŒç©ºã§ã‚ã£ãŸã¨ã—ã¦ã‚‚〠B<%apropos" -"%> ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§æ‹¡å¼µæ£è¦è¡¨ç¾ (B<-r>) を使用ã—ã¦æ¤œç´¢ã—ã¾ã™ã€‚今日ã§ã¯ã“ã®å‹•ä½œ" -"ãŒå¸¸ã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã™ã€‚" +"$B<POSIXLY_CORRECT> ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€å€¤ãŒç©ºã§ã‚ã£ãŸã¨ã—ã¦ã‚‚〠" +"B<%apropos%> ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§æ‹¡å¼µæ£è¦è¡¨ç¾ (B<-r>) を使用ã—ã¦æ¤œç´¢ã—ã¾ã™ã€‚今日ã§" +"ã¯ã“ã®å‹•ä½œãŒå¸¸ã«ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§ã™ã€‚" #. type: SH #: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1260 @@ -525,11 +527,11 @@ msgstr "lexgrog - マニュアルページã®ãƒ˜ãƒƒãƒ€ãƒ¼æƒ…å ±ã‚’è§£é‡ˆã™ã‚‹" #| "B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-fhwV>\\|] [\\|B<-E> " #| "I<encoding>\\|] I<file> \\&.\\|.\\|." msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-fhwV>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-fhwV>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/lexgrog.man1:36 @@ -545,11 +547,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" #. type: Plain text @@ -656,8 +658,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" @@ -709,11 +711,11 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" #. type: SH @@ -806,8 +808,8 @@ msgstr "B<%man%> B<-f> [\\|I<whatis> I<options>\\|] I<page> \\&.\\|.\\|." #: ../../man/man1/man.man1:88 #, fuzzy #| msgid "" -#| "B<%man%> is the system's manual pager. Each I<page> argument given to B<" -#| "%man%> is normally the name of a program, utility or function. The " +#| "B<%man%> is the system's manual pager. Each I<page> argument given to " +#| "B<%man%> is normally the name of a program, utility or function. The " #| "I<manual page> associated with each of these arguments is then found and " #| "displayed. A I<section>, if provided, will direct B<%man%> to look only " #| "in that I<section> of the manual. The default action is to search in all " @@ -815,13 +817,13 @@ msgstr "B<%man%> B<-f> [\\|I<whatis> I<options>\\|] I<page> \\&.\\|.\\|." #| "only the first I<page> found, even if I<page> exists in several " #| "I<sections>." msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "B<%man%> ã¯ã‚·ã‚¹ãƒ†ãƒ ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«å‚照ツール (ページャー) ã§ã™ã€‚ B<%man%> ã«ä¸Žãˆ" @@ -1155,8 +1157,8 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "ã‚ーワード I<printf> をマニュアルページåã¨è¦ç´„æ–‡ã®ä¸ã‹ã‚‰æ£è¦è¡¨ç¾ã¨ã—ã¦æ¤œç´¢ã—" "ã¾ã™ã€‚一致ã™ã‚‹ã™ã¹ã¦ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ãŒè¡¨ç¤ºã•ã‚Œã¾ã™ã€‚ B<%apropos%>I<\\ " @@ -1331,8 +1333,8 @@ msgstr "デフォルトã®å€¤ã¨å‹•ä½œ" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" #. type: Plain text @@ -1430,10 +1432,10 @@ msgstr "一般的ãªã‚ªãƒ—ション" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "通常ã¯ã“ã®ã‚ªãƒ—ションを一番最åˆã«æŒ‡å®šã—〠B<%man%> ã®å‹•ä½œã‚’デフォルトã«ãƒªã‚»ãƒƒ" "トã—ã¾ã™ã€‚ã“れを使用ã™ã‚‹ã¨ã€ $B<MANOPT> ã§è¨å®šã•ã‚Œã¦ã„るオプションをリセット" @@ -1573,8 +1575,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" "ã“ã®ã‚ªãƒ—ションã¯ä¸€èˆ¬çš„ã«ã¯ä½¿ç”¨ã—ã¾ã›ã‚“。 B<%catman%> プãƒã‚°ãƒ©ãƒ ã®ã¿ãŒä½¿ç”¨ã—ã¾" "ã™ã€‚" @@ -1652,9 +1654,9 @@ msgid "" "derived code to determine the path to search. This option overrides the " "$B<MANPATH> environment variable and causes option B<-m> to be ignored." msgstr "" -"代替ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸æ¤œç´¢ãƒ‘スを指定ã—ã¾ã™ã€‚デフォルトã§ã¯ B<%man%> 㯠B<" -"%manpath%> ã§å–å¾—ã§ãるコードを使用ã—ã¦ã‹ã‚‰æ¤œç´¢ã™ã‚‹ãƒ‘スを決定ã—ã¾ã™ã€‚ã“ã®ã‚ªãƒ—" -"ション㯠$B<MANPATH> 環境変数を上書ãã—〠B<-m> オプションã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚" +"代替ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸æ¤œç´¢ãƒ‘スを指定ã—ã¾ã™ã€‚デフォルトã§ã¯ B<%man%> 㯠" +"B<%manpath%> ã§å–å¾—ã§ãるコードを使用ã—ã¦ã‹ã‚‰æ¤œç´¢ã™ã‚‹ãƒ‘スを決定ã—ã¾ã™ã€‚ã“ã®ã‚ª" +"プション㯠$B<MANPATH> 環境変数を上書ãã—〠B<-m> オプションã¯ç„¡è¦–ã•ã‚Œã¾ã™ã€‚" #. type: Plain text #: ../../man/man1/man.man1:602 @@ -1708,9 +1710,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" #. type: Plain text @@ -1806,10 +1808,10 @@ msgstr "B<-P\\ >I<pager>,\\ B<--pager=>I<pager>" #: ../../man/man1/man.man1:757 #, fuzzy #| msgid "" -#| "Specify which output pager to use. By default, B<%man%> uses B<%pager" -#| "%>. This option overrides the $B<MANPAGER> environment variable, which " -#| "in turn overrides the $B<PAGER> environment variable. It is not used in " -#| "conjunction with B<-f> or B<-k>." +#| "Specify which output pager to use. By default, B<%man%> uses " +#| "B<%pager%>. This option overrides the $B<MANPAGER> environment variable, " +#| "which in turn overrides the $B<PAGER> environment variable. It is not " +#| "used in conjunction with B<-f> or B<-k>." msgid "" "Specify which output pager to use. By default, B<%man%> uses B<%pager%>, " "falling back to B<%cat%> if B<%pager%> is not found or is not executable. " @@ -1817,9 +1819,10 @@ msgid "" "overrides the $B<PAGER> environment variable. It is not used in conjunction " "with B<-f> or B<-k>." msgstr "" -"出力用ã§ä½¿ç”¨ã™ã‚‹ãƒšãƒ¼ã‚¸ãƒ£ãƒ¼ã‚’指定ã—ã¾ã™ã€‚デフォルトã§ã¯ã€ B<%man%> 㯠B<%pager" -"%> を使用ã—ã¾ã™ã€‚ã“ã®ã‚ªãƒ—ション㯠$B<MANPAGER> 環境変数ãŠã‚ˆã³ $B<PAGER> 環境" -"変数より優先ã•ã‚Œã¾ã™ã€‚ B<-f> ã¾ãŸã¯ B<-k> ã¨åŒæ™‚ã«æŒ‡å®šã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。" +"出力用ã§ä½¿ç”¨ã™ã‚‹ãƒšãƒ¼ã‚¸ãƒ£ãƒ¼ã‚’指定ã—ã¾ã™ã€‚デフォルトã§ã¯ã€ B<%man%> 㯠" +"B<%pager%> を使用ã—ã¾ã™ã€‚ã“ã®ã‚ªãƒ—ション㯠$B<MANPAGER> 環境変数ãŠã‚ˆã³ " +"$B<PAGER> 環境変数より優先ã•ã‚Œã¾ã™ã€‚ B<-f> ã¾ãŸã¯ B<-k> ã¨åŒæ™‚ã«æŒ‡å®šã™ã‚‹ã“ã¨" +"ã¯ã§ãã¾ã›ã‚“。" #. type: Plain text #: ../../man/man1/man.man1:763 ../../man/man1/man.man1:1132 @@ -2080,8 +2083,8 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "マニュアルページを書ã„ã¦ã„ã¦ã€ B<nroff> ãŒã‚る段è½ã«å¯¾ã—ã¦å‡ç‰å‰²ã‚Šä»˜ã‘ã‚’è¡Œã†" @@ -2272,8 +2275,8 @@ msgstr "" msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "$B<MANPAGER> ã¾ãŸã¯ $B<PAGER> ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆ ($B<MANPAGER> ãŒå„ªå…ˆã—ã¦ä½¿" "用ã•ã‚Œã¾ã™)〠ãã®å€¤ãŒãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’表示ã™ã‚‹ãŸã‚ã®ãƒ—ãƒã‚°ãƒ©ãƒ åã¨ã—ã¦ä½¿ç”¨" @@ -2293,14 +2296,14 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "$B<MANLESS> ãŒè¨å®šã•ã‚Œã¦ã„ã‚‹å ´åˆã€ B<%man%> 㯠B<less> ページャーã®ãƒ—ãƒãƒ³ãƒ—ト" "æ–‡å—列ã«å¯¾ã—ã¦ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆå€¤ã‚’使用ã—ã¾ã›ã‚“。ãã®ã‹ã‚り〠$B<MANLESS> ã®å€¤ã‚’ " "$B<LESS> ã«ãã®ã¾ã¾æ¸¡ã—ã¾ã™ã€‚例ãˆã°ã€ãƒ—ãƒãƒ³ãƒ—ト文å—列を固定値 \\(lqmy prompt " -"string\\(rq ã«ã—ãŸã„å ´åˆã€ $B<MANLESS> ã« \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq ã¨è¨å®šã—ã¾ã™ã€‚" +"string\\(rq ã«ã—ãŸã„å ´åˆã€ $B<MANLESS> ã« \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq ã¨è¨å®šã—ã¾ã™ã€‚" #. type: Plain text #: ../../man/man1/man.man1:1167 @@ -2308,8 +2311,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "$B<BROWSER> ãŒè¨å®šã•ã¦ã„ã‚‹å ´åˆã€ã“ã®å€¤ã¯ã‚³ãƒãƒ³ã§åŒºåˆ‡ã‚‰ã‚ŒãŸã‚³ãƒžãƒ³ãƒ‰ã®ãƒªã‚¹ãƒˆã¨" "ã—ã¦ã€ B<man> B<--html> 用ã®ã‚¦ã‚§ãƒ–ブラウザーã¨ã—ã¦é †ç•ªã«è©¦ã•ã‚Œã¾ã™ã€‚ãã‚Œãžã‚Œ" @@ -2415,8 +2418,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" @@ -2424,8 +2427,8 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "システムã®å®Ÿè£…ã«ä¾å˜ã—ã¦ã€ $B<LANG> ãŠã‚ˆã³ $B<LC_MESSAGES> ã¯ã€ç¾åœ¨ã®ãƒ¡ãƒƒã‚»ãƒ¼" @@ -2560,16 +2563,17 @@ msgstr "" #, fuzzy #| msgid "" #| "If an encoding declaration is found on the first line of the manual page, " -#| "that declaration overrides any input encodings specified on B<%manconv" -#| "%>'s command line. Encoding declarations have the following form:" +#| "that declaration overrides any input encodings specified on " +#| "B<%manconv%>'s command line. Encoding declarations have the following " +#| "form:" msgid "" "If an encoding declaration is found on the first line of a manual page, then " "that declaration is used as the input encoding for that page. Failing that, " "the input encoding is guessed based on the file name." msgstr "" -"エンコーディング宣言ãŒãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã®å…ˆé ã«ã‚ã‚‹å ´åˆã€ãã®å®£è¨€ã¯ B<%manconv" -"%> ã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³æŒ‡å®šã‚’上書ãã—ã¾ã™ã€‚エンコーディング指定ã¯æ¬¡ã®ã‚ˆã†ã«ãªã‚Šã¾" -"ã™ã€‚" +"エンコーディング宣言ãŒãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã®å…ˆé ã«ã‚ã‚‹å ´åˆã€ãã®å®£è¨€ã¯ " +"B<%manconv%> ã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³æŒ‡å®šã‚’上書ãã—ã¾ã™ã€‚エンコーディング指定ã¯æ¬¡ã®ã‚ˆ" +"ã†ã«ãªã‚Šã¾ã™ã€‚" #. type: Plain text #: ../../man/man1/man-recode.man1:38 @@ -2663,9 +2667,9 @@ msgid "" "that declaration overrides any input encodings specified on B<%manconv%>'s " "command line. Encoding declarations have the following form:" msgstr "" -"エンコーディング宣言ãŒãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã®å…ˆé ã«ã‚ã‚‹å ´åˆã€ãã®å®£è¨€ã¯ B<%manconv" -"%> ã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³æŒ‡å®šã‚’上書ãã—ã¾ã™ã€‚エンコーディング指定ã¯æ¬¡ã®ã‚ˆã†ã«ãªã‚Šã¾" -"ã™ã€‚" +"エンコーディング宣言ãŒãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã®å…ˆé ã«ã‚ã‚‹å ´åˆã€ãã®å®£è¨€ã¯ " +"B<%manconv%> ã®ã‚³ãƒžãƒ³ãƒ‰ãƒ©ã‚¤ãƒ³æŒ‡å®šã‚’上書ãã—ã¾ã™ã€‚エンコーディング指定ã¯æ¬¡ã®ã‚ˆ" +"ã†ã«ãªã‚Šã¾ã™ã€‚" #. type: TP #: ../../man/man1/manconv.man1:51 @@ -2810,17 +2814,20 @@ msgstr "%whatis% - マニュアルページã®è¦ç´„文を表示ã™ã‚‹" #: ../../man/man1/whatis.man1:32 #, fuzzy #| msgid "" -#| "B<%whatis%> [\\|B<-dlhvV>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -#| "\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] " -#| "[\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." -msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +#| "B<%whatis%> [\\|B<-dlhvV>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +#| "I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +#| "I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +#| "\\|." +msgid "" +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlhvV>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlhvV>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -2848,8 +2855,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" @@ -3271,11 +3278,16 @@ msgstr "B<CATWIDTH>I<\\ width>" #. type: Plain text #: ../../man/man5/manpath.man5:235 +#, fuzzy +#| msgid "" +#| "If I<width> is non-zero, cat pages will always be formatted for a " +#| "terminal of the given width, regardless of the width of the terminal " +#| "actually being used. This should generally be within the range set by " +#| "B<MINCATWIDTH> and B<MAXCATWIDTH>." msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "I<width> ã‚’ 0 以外ã«è¨å®šã—ãŸå ´åˆã€å®Ÿéš›ã«ä½¿ç”¨ã—ã¦ã„る端末幅ã«ã‹ã‹ã‚らãšã€æ•´å½¢" "済ã¿ãƒšãƒ¼ã‚¸ã¯å¸¸ã«æŒ‡å®šã•ã‚ŒãŸç«¯æœ«å¹…用ã¨ã—ã¦æ•´å½¢ã•ã‚Œã¾ã™ã€‚ã“ã®å€¤ã¯é€šå¸¸ " @@ -3392,8 +3404,8 @@ msgstr "%mandb% - マニュアルページã®ã‚¤ãƒ³ãƒ‡ãƒƒã‚¯ã‚¹ã‚ャッシュ゠#: ../../man/man8/mandb.man8:23 #, fuzzy #| msgid "" -#| "B<%mandb%> [\\|B<-dqsucpt>\\||\\|B<-h>\\||\\|B<-V>\\|] [\\|B<-C> I<file>" -#| "\\|] [\\|I<manpath>\\|]" +#| "B<%mandb%> [\\|B<-dqsucpt>\\||\\|B<-h>\\||\\|B<-V>\\|] [\\|B<-C> " +#| "I<file>\\|] [\\|I<manpath>\\|]" msgid "" "B<%mandb%> [\\|B<-dqsucpt?V>\\|] [\\|B<-C> I<file>\\|] [\\|I<manpath>\\|]" msgstr "" @@ -3550,10 +3562,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" "デフォルトã§ã¯ã€ B<%mandb%> ã¾ä½œæˆæ¸ˆã¿ã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’æ›´æ–°ã—ã¾ã™ã€‚データベー" "スãŒå˜åœ¨ã—ãªã„å ´åˆã€ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã‚’作æˆã—ã¾ã™ã€‚ã“ã®ã‚ªãƒ—ションを使用ã—ãŸå ´åˆã€ " @@ -3737,86 +3749,89 @@ msgstr "" #~| "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~| "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~| "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#~| "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>" -#~| "\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~| "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-" +#~| "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" #~| "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~| "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~| "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~| "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>" -#~| "\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] " -#~| "[\\|[\\|I<section>\\|] I<page>\\ .\\|.\\|.\\|]\\ .\\|.\\|." +#~| "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~| "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-" +#~| "justification>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|" +#~| "I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|" +#~| "I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<section>\\|] I<page>\\ .\\|.\\|." +#~| "\\|]\\ .\\|.\\|." #~ msgid "" #~ "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>\\ .\\|.\\|.\\|]\\ .\\|.\\|." +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>\\ .\\|.\\|.\\|]\\ .\\|.\\|." #, fuzzy #~| msgid "" -#~| "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~| "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~| "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~| "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." #~| "\\|." #~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|." #, fuzzy #~| msgid "" #~| "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~| "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~| "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~| "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~| "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-" -#~| "X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|." +#~| "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~| "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-" +#~| "t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|" +#~| "I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> " +#~| "\\&.\\|.\\|." #~ msgid "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|." +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|." #, fuzzy #~| msgid "" -#~| "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~| "\\|] I<page> \\&.\\|.\\|." +#~| "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~| "D>\\|] I<page> \\&.\\|.\\|." #~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|." +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|." #, fuzzy #~| msgid "" @@ -3862,11 +3877,11 @@ msgstr "" #~ "it will try to extract information from a traditional I<whatis> database " #~ "instead." #~ msgstr "" -#~ "ã‚る特定ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸éšŽå±¤ã«B<インデックス型>データベースã§ã‚ã‚‹ B<" -#~ "%mandb%> ãŒç„¡ã„å ´åˆã€ B<%man%> ã¯ã€éšŽå±¤å†…ã™ã¹ã¦ã‚’検索ã™ã‚‹å¿…è¦ãŒã‚ã£ãŸã¨ã—" -#~ "ã¦ã‚‚ã€è¦æ±‚ã•ã‚ŒãŸãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’探ã—ã¾ã™ã€‚ B<%whatis%> ã¾ãŸã¯ B<%apropos" -#~ "%> ãŒB<インデックス型>データベースã®æ¤œç´¢ã«å¤±æ•—ã—ãŸå ´åˆã€ä»£ã‚ã‚Šã«ä¼çµ±çš„㪠" -#~ "I<whatis> データベースã‹ã‚‰æƒ…å ±ã‚’æŠ½å‡ºã—よã†ã¨ã—ã¾ã™ã€‚" +#~ "ã‚る特定ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸éšŽå±¤ã«B<インデックス型>データベースã§ã‚ã‚‹ " +#~ "B<%mandb%> ãŒç„¡ã„å ´åˆã€ B<%man%> ã¯ã€éšŽå±¤å†…ã™ã¹ã¦ã‚’検索ã™ã‚‹å¿…è¦ãŒã‚ã£ãŸã¨" +#~ "ã—ã¦ã‚‚ã€è¦æ±‚ã•ã‚ŒãŸãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’探ã—ã¾ã™ã€‚ B<%whatis%> ã¾ãŸã¯ " +#~ "B<%apropos%> ãŒB<インデックス型>データベースã®æ¤œç´¢ã«å¤±æ•—ã—ãŸå ´åˆã€ä»£ã‚ã‚Šã«" +#~ "ä¼çµ±çš„㪠I<whatis> データベースã‹ã‚‰æƒ…å ±ã‚’æŠ½å‡ºã—よã†ã¨ã—ã¾ã™ã€‚" #~ msgid "" #~ "These utilities support compressed source nroff files having, by default, " @@ -3897,8 +3912,8 @@ msgstr "" #~ "B<%man%> will search for the desired manual pages within the I<index> " #~ "database caches. If the B<-u> option is given, a cache consistency check " #~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " +#~ "If this option is always given, it is not generally necessary to run " +#~ "B<%mandb%> after the caches are initially created, unless a cache becomes " #~ "corrupt. However, the cache consistency check can be slow on systems " #~ "with many manual pages installed, so it is not performed by default, and " #~ "system administrators may wish to run B<%mandb%> every week or so to keep " @@ -4013,12 +4028,12 @@ msgstr "" #~ "$B<MANLESS> 環境変数を使用ã—ã¦ãã ã•ã„。" #~ msgid "" -#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis" -#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), " -#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), " -#~ "the man-db package manual, B<FSSTND>." +#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), " +#~ "B<%whatis%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), " +#~ "B<groff>(1), B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), " +#~ "B<latin1>(7), the man-db package manual, B<FSSTND>." #~ msgstr "" -#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis" -#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), " -#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), " -#~ "man-db パッケージマニュアル, B<FSSTND>." +#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), " +#~ "B<%whatis%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), " +#~ "B<groff>(1), B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), " +#~ "B<latin1>(7), man-db パッケージマニュアル, B<FSSTND>." diff --git a/man/po4a/po/man-db-manpages.pot b/man/po4a/po/man-db-manpages.pot index a8028682..8dcd2159 100644 --- a/man/po4a/po/man-db-manpages.pot +++ b/man/po4a/po/man-db-manpages.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -2586,8 +2586,7 @@ msgstr "" msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" #. type: Plain text diff --git a/man/po4a/po/nl.po b/man/po4a/po/nl.po index 3b90d736..0972440d 100644 --- a/man/po4a/po/nl.po +++ b/man/po4a/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-manpages 2.5.8-pre1\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: 2010-10-24 20:48+0200\n" "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" @@ -65,8 +65,9 @@ msgstr "SAMENVATTING" #| "\\&.\\|.\\|." msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalhvV>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<sectie>\\|] [\\|B<-m> I<systeem>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " @@ -124,9 +125,9 @@ msgid "" "Depending on your installation, this may be run by a periodic cron job, or " "may need to be run manually after new manual pages have been installed." msgstr "" -"De database, doorzocht door B<%apropos%> is bijgewerkt door programma B<" -"%mandb%>. Afhankelijk van uw installatie kan dit worden uitgevoerd met een " -"periodieke cron-opdracht of handmatig na de installatie van nieuwe man-" +"De database, doorzocht door B<%apropos%> is bijgewerkt door programma " +"B<%mandb%>. Afhankelijk van uw installatie kan dit worden uitgevoerd met " +"een periodieke cron-opdracht of handmatig na de installatie van nieuwe man-" "pagina's." #. type: SH @@ -467,9 +468,9 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" "Wanneer $B<POSIXLY_CORRECT> is opgegeven, zelfs met een nulwaarde, wordt de " "standaardzoekopdracht B<%apropos%> uitgevoerd als een reguliere expressie " @@ -543,11 +544,11 @@ msgstr "lexgrog - hoofdinginformatie in manpagina's ontleden" #| "B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-fhwV>\\|] [\\|B<-E> " #| "I<encoding>\\|] I<file> \\&.\\|.\\|." msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-fhwV>\\|] [\\|B<-E> I<encoding>" -"\\|] I<bestand> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-fhwV>\\|] [\\|B<-E> " +"I<encoding>\\|] I<bestand> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/lexgrog.man1:36 @@ -569,14 +570,14 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" -"Als de invoer slecht gestructureerd is, dan zal B<lexgrog> \\(lqparse failed" -"\\(rq tonen; dit kan nuttig zijn voor externe programma's die de man-" +"Als de invoer slecht gestructureerd is, dan zal B<lexgrog> \\(lqparse " +"failed\\(rq tonen; dit kan nuttig zijn voor externe programma's die de man-" "pagina's op juistheid controleren. Wanneer één van B<lexgrog>'s " "invoerbestanden (lq-\\(rq is, dan wordt uit de standaardinvoer gelezen; als " "enig invoerbestand gecomprimeerd is, dan zal een gedecomprimeerde versie " @@ -722,8 +723,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" "Sommige opmakers van man-pagina's vereisen de \\(oq\\e-\\(cq precies zoals " @@ -795,11 +796,11 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "Er zijn meerdere, veelvoorkomende redenen waarom ontleden van watis " "mislukt. Soms vervangen de auteurs van man-pagina's \\(oq.SH NAME\\(cq door " @@ -906,8 +907,8 @@ msgstr "B<%man%> B<-f> [\\|I<watis> I<optie>\\|] I<pagina> \\&.\\|.\\|." #: ../../man/man1/man.man1:88 #, fuzzy #| msgid "" -#| "B<%man%> is the system's manual pager. Each I<page> argument given to B<" -#| "%man%> is normally the name of a program, utility or function. The " +#| "B<%man%> is the system's manual pager. Each I<page> argument given to " +#| "B<%man%> is normally the name of a program, utility or function. The " #| "I<manual page> associated with each of these arguments is then found and " #| "displayed. A I<section>, if provided, will direct B<%man%> to look only " #| "in that I<section> of the manual. The default action is to search in all " @@ -915,13 +916,13 @@ msgstr "B<%man%> B<-f> [\\|I<watis> I<optie>\\|] I<pagina> \\&.\\|.\\|." #| "only the first I<page> found, even if I<page> exists in several " #| "I<sections>." msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "B<%man%> is de man-paginaopmaker van het systeem. Ieder I<pagina>-argument " @@ -1263,12 +1264,12 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "Zoek in de korte beschrijvingen en namen van man-pagina's naar het trefwoord " -"I<printf> als reguliere expressie. Toon iedere treffer. Komt overeen met B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> als reguliere expressie. Toon iedere treffer. Komt overeen met " +"B<%apropos%>I<\\ printf>B<.>" #. type: TP #: ../../man/man1/man.man1:261 @@ -1329,17 +1330,17 @@ msgid "" "will allow %man% to \"forget\" about the options specified in $B<MANOPT>, " "although they must still have been valid." msgstr "" -"Verschillende omgevingsvariabelen worden uitgelezen om te bepalen hoe B<" -"%mandb%> werkt, mits ingesteld. Het is mogelijk om de `catch all'-variabele " -"$B<MANOPT> op iedere tekenreeks in te stellen, zoals in een opdrachtregel, " -"met als uitzondering dat iedere spatie die als onderdeel van een " -"optieargument wordt gebruikt, voorafgegaan moet worden door een backslash. " -"B<%man%> zal eerst $B<MANOPT> ontleden vóór zijn eigen opdrachtregel. De " -"opties die een argument vereisen, worden overschreven door gelijknamige " -"opties op de opdrachtregel. Om alle opties die in $B<MANOPT> insteld zijn " -"te herstellen, kan B<-D> worden opgegeven als de eerste optie van de " -"opdrachtregel. Zo kan %man% opties die opgegeven zijn in $B<MANOPT> " -"`vergeten', hoewel ze nog wel geldig moeten zijn." +"Verschillende omgevingsvariabelen worden uitgelezen om te bepalen hoe " +"B<%mandb%> werkt, mits ingesteld. Het is mogelijk om de `catch all'-" +"variabele $B<MANOPT> op iedere tekenreeks in te stellen, zoals in een " +"opdrachtregel, met als uitzondering dat iedere spatie die als onderdeel van " +"een optieargument wordt gebruikt, voorafgegaan moet worden door een " +"backslash. B<%man%> zal eerst $B<MANOPT> ontleden vóór zijn eigen " +"opdrachtregel. De opties die een argument vereisen, worden overschreven " +"door gelijknamige opties op de opdrachtregel. Om alle opties die in " +"$B<MANOPT> insteld zijn te herstellen, kan B<-D> worden opgegeven als de " +"eerste optie van de opdrachtregel. Zo kan %man% opties die opgegeven zijn " +"in $B<MANOPT> `vergeten', hoewel ze nog wel geldig moeten zijn." #. type: Plain text #: ../../man/man1/man.man1:307 @@ -1443,8 +1444,8 @@ msgstr "STANDAARDEN" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" #. type: Plain text @@ -1546,10 +1547,10 @@ msgstr "Algemene opties" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "Deze optie wordt normaal als allereerste opgegeven en hersteld het gedrag " "van B<%man%>. Het wordt gebruikt om die opties te herstellen die mogelijk " @@ -1710,8 +1711,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" "De optie is niet voor algemeen gebruik en mag alleen gebruikt worden door " "het programma B<%catman%>." @@ -1867,9 +1868,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" "Sommige systemen bevatten grote hoeveelheden man-pagina's in de " "hoofdstructuur, bijvoorbeeld pagina's die behoren tot het pakket B<Tcl>. Om " @@ -1947,8 +1948,8 @@ msgid "" "pages with names that match the search criteria." msgstr "" "Standaard zal B<%man%> stoppen na het weergeven van de meeste geschikte man-" -"pagina die het kan vinden. Door gebruik te maken van deze optie, wordt B<" -"%man%> gedwongen alle man-pagina's te tonen met namen die overeenkomen met " +"pagina die het kan vinden. Door gebruik te maken van deze optie, wordt " +"B<%man%> gedwongen alle man-pagina's te tonen met namen die overeenkomen met " "de zoekcriteria." #. type: Plain text @@ -1999,10 +2000,10 @@ msgstr "B<-P\\ >I<opmaker>,\\ B<--pager=>I<opmaker>" #: ../../man/man1/man.man1:757 #, fuzzy #| msgid "" -#| "Specify which output pager to use. By default, B<%man%> uses B<%pager" -#| "%>. This option overrides the $B<MANPAGER> environment variable, which " -#| "in turn overrides the $B<PAGER> environment variable. It is not used in " -#| "conjunction with B<-f> or B<-k>." +#| "Specify which output pager to use. By default, B<%man%> uses " +#| "B<%pager%>. This option overrides the $B<MANPAGER> environment variable, " +#| "which in turn overrides the $B<PAGER> environment variable. It is not " +#| "used in conjunction with B<-f> or B<-k>." msgid "" "Specify which output pager to use. By default, B<%man%> uses B<%pager%>, " "falling back to B<%cat%> if B<%pager%> is not found or is not executable. " @@ -2010,8 +2011,8 @@ msgid "" "overrides the $B<PAGER> environment variable. It is not used in conjunction " "with B<-f> or B<-k>." msgstr "" -"Geef op welke uitvoeropmaker moet worden gebruikt. Standaard gebruikt B<%man" -"%> B<%pager%>." +"Geef op welke uitvoeropmaker moet worden gebruikt. Standaard gebruikt " +"B<%man%> B<%pager%>." #. type: Plain text #: ../../man/man1/man.man1:763 ../../man/man1/man.man1:1132 @@ -2291,8 +2292,8 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "Als u tijdens het schrijven van een man-pagina wilt verhinderen dat B<nroff> " @@ -2484,8 +2485,8 @@ msgstr "" msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "De waarde van $B<MANPAGER> of $B<PAGER> ($B<MANPAGER> heeft de voorkeur) " "wordt gebruikt als programma om de man-pagina te tonen. Standaard wordt " @@ -2505,8 +2506,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "Wanneer $B<MANLESS> is ingesteld, zal B<%man%> geen 'prompt-string' aanmaken " "voor de B<less>-opmaker. In plaats daarvan wordt de waarde van $B<MANLESS> " @@ -2520,8 +2521,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "Als $B<BROWSER> ingesteld is, bestaat deze uit een dubbelepuntgescheiden " "lijst met opdrachten, waarbij iedere opdracht poogt een webbrowser voor " @@ -2635,8 +2636,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" @@ -2644,8 +2645,8 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "Afhankelijk van het systeem en de implementatie, worden $B<LANG> en " @@ -2981,9 +2982,10 @@ msgstr "%apropos% - namen en beschrijvingen van de man-pagina's doorzoeken" #| "M> I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> " #| "\\&.\\|.\\|." msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalhvV>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<sectie>\\|] [\\|B<-m> I<systeem>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " @@ -3009,8 +3011,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" @@ -3401,8 +3403,7 @@ msgstr "" msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" #. type: Plain text @@ -3451,8 +3452,9 @@ msgstr "" #: ../../man/man8/catman.man8:24 #, fuzzy #| msgid "" -#| "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#| "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." +#| "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#| "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#| "\\|." msgid "" "B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<path>\\|] [\\|B<-C> I<file>\\|] [\\|" "I<section>\\|] \\&.\\|.\\|." @@ -3663,10 +3665,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" #. type: Plain text @@ -3820,27 +3822,28 @@ msgstr "" #~| "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~| "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~| "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#~| "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>" -#~| "\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~| "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-" +#~| "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" #~| "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~| "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~| "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~| "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>" -#~| "\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] " -#~| "[\\|[\\|I<section>\\|] I<page>\\ .\\|.\\|.\\|]\\ .\\|.\\|." +#~| "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~| "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-" +#~| "justification>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|" +#~| "I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|" +#~| "I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<section>\\|] I<page>\\ .\\|.\\|." +#~| "\\|]\\ .\\|.\\|." #~ msgid "" #~ "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> [\\|B<-C> I<bestand>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<waarschuwingen>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|" @@ -3848,56 +3851,58 @@ msgstr "" #~ "B<-M> I<pad>\\|] [\\|B<-S> I<lijst>\\|] [\\|B<-e> I<extensie>\\|] [\\|B<-" #~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" #~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<opmaker>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<apparaat>\\|]\\|] [\\|B<-H>" -#~ "\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] " -#~ "[\\|[\\|I<sectie>\\|] I<pagina>\\ .\\|.\\|.\\|]\\ .\\|.\\|." +#~ "I<opmaker>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<apparaat>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<sectie>\\|] I<pagina>\\ .\\|.\\|.\\|]\\ .\\|.\\|." #, fuzzy #~| msgid "" -#~| "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~| "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~| "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~| "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." #~| "\\|." #~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<sectie>\\|] I<term>\\ .\\|.\\|." +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<sectie>\\|] I<term>\\ .\\|." +#~ "\\|." #, fuzzy #~| msgid "" #~| "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~| "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~| "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~| "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~| "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-" -#~| "X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|." +#~| "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~| "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-" +#~| "t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|" +#~| "I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> " +#~| "\\&.\\|.\\|." #~ msgid "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-l> [\\|B<-C> I<bestand>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|" #~ "B<--warnings>\\|[\\|=I<waarschuwingen>\\|]\\|] [\\|B<-R> I<encoding>\\|] " -#~ "[\\|B<-L> I<taalgebied>\\|] [\\|B<-P> I<opmaker>\\|] [\\|B<-r> I<prompt>" -#~ "\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|" -#~ "B<-t>\\|] [\\|B<-T>\\|[\\|I<apparaat>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>" -#~ "\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<bestand> \\&.\\|." -#~ "\\|." +#~ "[\\|B<-L> I<taalgebied>\\|] [\\|B<-P> I<opmaker>\\|] [\\|B<-r> " +#~ "I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> " +#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<apparaat>\\|]\\|] [\\|B<-" +#~ "H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] " +#~ "I<bestand> \\&.\\|.\\|." #, fuzzy #~| msgid "" -#~| "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~| "\\|] I<page> \\&.\\|.\\|." +#~| "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~| "D>\\|] I<page> \\&.\\|.\\|." #~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<bestand>\\|] [\\|B<-d>\\|] [\\|B<-" #~ "D>\\|] I<pagina> \\&.\\|.\\|." @@ -3932,8 +3937,8 @@ msgstr "" #~ "De opmaakhulpprogramma's opgeslagen als B<man-db> maken intensief gebruik " #~ "van B<index>-database-caches. Deze caches bevat informatie, zoals de " #~ "locatie van iedere man-pagina en de inhoud van I<watis> (korte, " -#~ "éénregelige beschrijving van de man-pagina), en maakt het mogelijk dat B<" -#~ "%man%> sneller resultaten vindt dan met het iedere keer doorzoeken van " +#~ "éénregelige beschrijving van de man-pagina), en maakt het mogelijk dat " +#~ "B<%man%> sneller resultaten vindt dan met het iedere keer doorzoeken van " #~ "het bestandssysteem om de juiste man-pagina te vinden. Wordt B<man> " #~ "aangeroepen met de optie B<-u>, dan zal de cache consistent blijven, " #~ "waarmee voorkomen wordt dat software handmatig uitgevoerd moet worden om " @@ -3950,9 +3955,9 @@ msgstr "" #~ "Als B<%man%> een door B<%mandb%> geïnitialiseerde B<index>-database voor " #~ "een bepaalde man-paginastructuur niet kan vinden, dan zal het toch naar " #~ "de gevraagde man-pagina's zoeken, hoewel hiervoor expansie van " -#~ "jokertekens (file globbing) nodig zal zijn. Als B<%whatis%> en B<%apropos" -#~ "%> beide B<index> niet kunnen vinden, dan zal het informatie uit een " -#~ "traditionele I<watis>-database halen." +#~ "jokertekens (file globbing) nodig zal zijn. Als B<%whatis%> en " +#~ "B<%apropos%> beide B<index> niet kunnen vinden, dan zal het informatie " +#~ "uit een traditionele I<watis>-database halen." #~ msgid "" #~ "These utilities support compressed source nroff files having, by default, " @@ -3983,8 +3988,8 @@ msgstr "" #~ "B<%man%> will search for the desired manual pages within the I<index> " #~ "database caches. If the B<-u> option is given, a cache consistency check " #~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " +#~ "If this option is always given, it is not generally necessary to run " +#~ "B<%mandb%> after the caches are initially created, unless a cache becomes " #~ "corrupt. However, the cache consistency check can be slow on systems " #~ "with many manual pages installed, so it is not performed by default, and " #~ "system administrators may wish to run B<%mandb%> every week or so to keep " @@ -4097,15 +4102,15 @@ msgstr "" #~ "gebruik dan de omgevingsvariabele $B<MANLESS> zoals hieronder beschreven." #~ msgid "" -#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis" -#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), " -#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), " -#~ "the man-db package manual, B<FSSTND>." +#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), " +#~ "B<%whatis%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), " +#~ "B<groff>(1), B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), " +#~ "B<latin1>(7), the man-db package manual, B<FSSTND>." #~ msgstr "" -#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis" -#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), " -#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), " -#~ "de man-db-pakkethandleiding, B<FSSTND>." +#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), " +#~ "B<%whatis%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), " +#~ "B<groff>(1), B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), " +#~ "B<latin1>(7), de man-db-pakkethandleiding, B<FSSTND>." #~ msgid "_\n" #~ msgstr "_\n" diff --git a/man/po4a/po/pl.po b/man/po4a/po/pl.po index d9d3ca0a..e98385fa 100644 --- a/man/po4a/po/pl.po +++ b/man/po4a/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-manpages 2.7.6.1\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: 2016-12-21 21:00+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -63,8 +63,9 @@ msgstr "SKÅADNIA" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<lista>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " @@ -458,13 +459,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" -"Jeżeli ustawiono $B<POSIXLY_CORRECT>, nawet na pustÄ… wartość, to domyÅ›lnie B<" -"%apropos%> bÄ™dzie wyszukiwaÅ‚ w trybie wyrażeÅ„ regularnych (B<-r>). Obecnie " -"i tak to jest domyÅ›lne zachowanie." +"Jeżeli ustawiono $B<POSIXLY_CORRECT>, nawet na pustÄ… wartość, to domyÅ›lnie " +"B<%apropos%> bÄ™dzie wyszukiwaÅ‚ w trybie wyrażeÅ„ regularnych (B<-r>). " +"Obecnie i tak to jest domyÅ›lne zachowanie." #. type: SH #: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1260 @@ -530,8 +531,8 @@ msgstr "lexgrog - przetwarza nagłówki stron podrÄ™cznika ekranowego" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" "B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " "I<kodowanie_znaków>\\|] I<plik> \\&.\\|.\\|." @@ -557,11 +558,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" "Jeżeli wejÅ›cie B<lexgrog> jest w zÅ‚ym formacie, to wypisze on komunikat " "\\(lqparse failed\\(rq; może to być użyteczne dla zewnÄ™trznych programów " @@ -714,12 +715,12 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" -"Niektóre programy do obsÅ‚ugi stron podrÄ™cznika wymagajÄ…, aby separator \\(oq" -"\\e-\\(cq byÅ‚ dokÅ‚adnie taki, jak to pokazano; B<%mandb%> jest bardziej " +"Niektóre programy do obsÅ‚ugi stron podrÄ™cznika wymagajÄ…, aby separator " +"\\(oq\\e-\\(cq byÅ‚ dokÅ‚adnie taki, jak to pokazano; B<%mandb%> jest bardziej " "tolerancyjny, jednakże w celu zachowania kompatybilnoÅ›ci z innymi systemami " "dobrym pomysÅ‚em jest pozostawienie znaku odwrotnego ukoÅ›nika." @@ -788,19 +789,19 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "Jest kilka powszechnych przyczyn, dla których przetwarzanie whatis koÅ„czy " -"siÄ™ fiaskiem. Czasami autorzy stron podrÄ™cznika zastÄ™pujÄ… \\(oq.SH NAZWA" -"\\(cq przez \\(oq.SH MÓJPROGRAM\\(cq, co powoduje, że B<%mandb%> nie potrafi " -"odnaleźć potrzebnych informacji. Czasami autorzy umieszczajÄ… wprawdzie " -"sekcjÄ™ NAZWA, ale zawierajÄ… w niej dowolny tekst zamiast używać \\(oqnazwa " -"\\e- opis\\(cq. Jednakże każda skÅ‚adania przypominajÄ…ca powyższÄ… powinna być " -"akceptowana." +"siÄ™ fiaskiem. Czasami autorzy stron podrÄ™cznika zastÄ™pujÄ… \\(oq.SH " +"NAZWA\\(cq przez \\(oq.SH MÓJPROGRAM\\(cq, co powoduje, że B<%mandb%> nie " +"potrafi odnaleźć potrzebnych informacji. Czasami autorzy umieszczajÄ… " +"wprawdzie sekcjÄ™ NAZWA, ale zawierajÄ… w niej dowolny tekst zamiast używać " +"\\(oqnazwa \\e- opis\\(cq. Jednakże każda skÅ‚adania przypominajÄ…ca powyższÄ… " +"powinna być akceptowana." #. type: SH #: ../../man/man1/lexgrog.man1:202 @@ -899,23 +900,23 @@ msgstr "B<%man%> B<-f> [\\|I<opcje> I<whatis>\\|] I<strona> \\&.\\|.\\|." #: ../../man/man1/man.man1:88 #, fuzzy #| msgid "" -#| "B<%man%> is the system's manual pager. Each I<page> argument given to B<" -#| "%man%> is normally the name of a program, utility or function. The " +#| "B<%man%> is the system's manual pager. Each I<page> argument given to " +#| "B<%man%> is normally the name of a program, utility or function. The " #| "I<manual page> associated with each of these arguments is then found and " #| "displayed. A I<section>, if provided, will direct B<%man%> to look only " #| "in that I<section> of the manual. The default action is to search in all " #| "of the available I<sections> following a pre-defined order (\"%sections%" -#| "\" by default, unless overridden by the B<SECTION> directive in I<" -#| "%manpath_config_file%>), and to show only the first I<page> found, even " +#| "\" by default, unless overridden by the B<SECTION> directive in " +#| "I<%manpath_config_file%>), and to show only the first I<page> found, even " #| "if I<page> exists in several I<sections>." msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "Program B<%man%> jest systemowÄ… przeglÄ…darkÄ… stron podrÄ™cznika ekranowego. " @@ -1258,8 +1259,8 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "Szuka sÅ‚owa kluczowego I<printf> jako wyrażenia regularnego w krótkich " "opisach i nazwach stron podrÄ™cznika. WyÅ›wietla wszystkie dopasowania. " @@ -1437,8 +1438,8 @@ msgstr "ZACHOWANIA DOMYÅšLNE" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" #. type: Plain text @@ -1533,10 +1534,10 @@ msgstr "Opcje ogólne" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "Ta opcja powinna być zazwyczaj podana jako pierwsza, gdyż przywraca domyÅ›lne " "zachowanie programu B<%man%>. Jej zastosowaniem jest wyÅ‚Ä…czenie tych opcji " @@ -1696,8 +1697,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" "Ta opcja nie jest przeznaczona dla ogółu i powinna być używana tylko przez " "program B<%catman%>." @@ -1720,8 +1721,8 @@ msgid "" msgstr "" "Zamiast w normalny sposób wyÅ›wietlić stronÄ™ podrÄ™cznika, wypisze źródÅ‚o " "strony przeksztaÅ‚cone na podane I<kodowanie_znaków>. JeÅ›li znane jest " -"kodowanie znaków pliku źródÅ‚owego, to można użyć bezpoÅ›rednio polecenia B<" -"%manconv%>(1). Jednakże, opcja ta pozwala przeksztaÅ‚cić kilka stron " +"kodowanie znaków pliku źródÅ‚owego, to można użyć bezpoÅ›rednio polecenia " +"B<%manconv%>(1). Jednakże, opcja ta pozwala przeksztaÅ‚cić kilka stron " "podrÄ™cznika do jednego kodowania, bez dokÅ‚adnego podawania kodowania źródeÅ‚ " "każdej z nich, pod warunkiem że strony te sÄ… umieszczone w strukturze " "katalogów podobnej do hierarchii stron podrÄ™cznika." @@ -1854,9 +1855,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" "Niektóre systemu zawierajÄ… w głównej sekcji hierarchii stron duże pakiety " "stron podrÄ™cznika, takich jak te, które towarzyszÄ… pakietowi B<Tcl>. Aby " @@ -1984,10 +1985,10 @@ msgstr "B<-P\\ >I<pager>,\\ B<--pager=>I<pager>" #: ../../man/man1/man.man1:757 #, fuzzy #| msgid "" -#| "Specify which output pager to use. By default, B<%man%> uses B<%pager" -#| "%>. This option overrides the $B<MANPAGER> environment variable, which " -#| "in turn overrides the $B<PAGER> environment variable. It is not used in " -#| "conjunction with B<-f> or B<-k>." +#| "Specify which output pager to use. By default, B<%man%> uses " +#| "B<%pager%>. This option overrides the $B<MANPAGER> environment variable, " +#| "which in turn overrides the $B<PAGER> environment variable. It is not " +#| "used in conjunction with B<-f> or B<-k>." msgid "" "Specify which output pager to use. By default, B<%man%> uses B<%pager%>, " "falling back to B<%cat%> if B<%pager%> is not found or is not executable. " @@ -2264,23 +2265,23 @@ msgid "" msgstr "" "Zazwyczaj B<nroff> automatycznie wyrówna tekst w linii do obu marginesów. " "Opcja ta wyÅ‚Ä…cza takie wyrównywanie, zostawiajÄ…c wyrównywanie tylko do " -"lewego marginesu, co powoduje, że tekst z prawej strony jest \"postrzÄ™piony" -"\"." +"lewego marginesu, co powoduje, że tekst z prawej strony jest " +"\"postrzÄ™piony\"." #. type: Plain text #: ../../man/man1/man.man1:951 msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "Podczas pisania strony podrÄ™cznika ekranowego, nie należy używać tej opcji " "do powstrzymywania B<nroff>a od wyrównywania linii w akapicie do obu " "marginesów. Zamiast tego proszÄ™ zapoznać siÄ™ z dokumentacjÄ… programu " -"B<nroff>. Na przykÅ‚ad można użyć żądaÅ„ \".na\", \".nf\", \".fi\", and \".ad" -"\", aby tymczasowo wyÅ‚Ä…czyć wyrównywanie linii i wypeÅ‚nianie spacjami." +"B<nroff>. Na przykÅ‚ad można użyć żądaÅ„ \".na\", \".nf\", \".fi\", and \"." +"ad\", aby tymczasowo wyÅ‚Ä…czyć wyrównywanie linii i wypeÅ‚nianie spacjami." #. type: TP #: ../../man/man1/man.man1:951 @@ -2448,8 +2449,8 @@ msgstr "" "Jeżeli ustawiona jest $B<MANSECT>, to jej wartość jest listÄ… oddzielonych " "dwukropkami sekcji i sÅ‚uży do okreÅ›lania, które sekcje podrÄ™cznika man i w " "jakiej kolejnoÅ›ci bÄ™dÄ… przeszukiwane. DomyÅ›lnÄ… wartoÅ›ciÄ… jest \"%sections%" -"\", chyba że zostanie to nadpisane w polu B<SECTION> pliku I<" -"%manpath_config_file%>." +"\", chyba że zostanie to nadpisane w polu B<SECTION> pliku " +"I<%manpath_config_file%>." #. type: Plain text #: ../../man/man1/man.man1:1126 @@ -2461,13 +2462,13 @@ msgstr "" msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "JeÅ›li ustawiono zmiennÄ… $B<MANPAGER> lub $B<PAGER> ($B<MANPAGER> ma wyższy " "priorytet), to jej wartość jest używana jako nazwa programu, w którym bÄ™dzie " -"wyÅ›wietlona strona podrÄ™cznika ekranowego. DomyÅ›lnie używany jest program B<" -"%pager%>." +"wyÅ›wietlona strona podrÄ™cznika ekranowego. DomyÅ›lnie używany jest program " +"B<%pager%>." #. type: Plain text #: ../../man/man1/man.man1:1151 @@ -2476,8 +2477,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "JeÅ›li $B<MANLESS> jest ustawiona, to jej wartość zostanie użyta jako " "domyÅ›lna linia zachÄ™ty programu B<less>, dokÅ‚adnie tak jakby przekazano jÄ… w " @@ -2492,8 +2493,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "Jeżeli jest ustawiona zmienna $B<BROWSER>, to jej wartoÅ›ciÄ… jest rozdzielona " "dwukropkami lista poleceÅ„, które %man% bÄ™dzie - w kolejnoÅ›ci - próbowaÅ‚ " @@ -2605,8 +2606,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" @@ -2614,13 +2615,13 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "W zależnoÅ›ci od systemu i implementacji bieżące ustawienia jÄ™zykowe bÄ™dÄ… " -"pobierane z jednej lub obu spoÅ›ród zmiennych $B<LANG> i $B<LC_MESSAGES>. B<" -"%man%> wyÅ›wietli swoje komunikaty w tym jÄ™zyku (jeÅ›li sÄ… dostÄ™pne). " +"pobierane z jednej lub obu spoÅ›ród zmiennych $B<LANG> i $B<LC_MESSAGES>. " +"B<%man%> wyÅ›wietli swoje komunikaty w tym jÄ™zyku (jeÅ›li sÄ… dostÄ™pne). " "Szczegóły można znaleźć w B<setlocale>(3)." #. type: Plain text @@ -2736,8 +2737,9 @@ msgstr "" #, fuzzy #| msgid "" #| "If an encoding declaration is found on the first line of the manual page, " -#| "that declaration overrides any input encodings specified on B<%manconv" -#| "%>'s command line. Encoding declarations have the following form:" +#| "that declaration overrides any input encodings specified on " +#| "B<%manconv%>'s command line. Encoding declarations have the following " +#| "form:" msgid "" "If an encoding declaration is found on the first line of a manual page, then " "that declaration is used as the input encoding for that page. Failing that, " @@ -2993,14 +2995,15 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." -msgstr "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<lista>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<Å›cieżka>\\|] " -"[\\|B<-L> I<ustawienia_jÄ™zykowe>\\|] [\\|B<-C> I<plik>\\|] I<nazwa> \\&.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." "\\|." +msgstr "" +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<lista>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<Å›cieżka>\\|] [\\|B<-L> I<ustawienia_jÄ™zykowe>\\|] [\\|B<-C> I<plik>\\|] " +"I<nazwa> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -3028,8 +3031,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" @@ -3543,11 +3546,16 @@ msgstr "B<CATWIDTH>I<\\ szerokość>" #. type: Plain text #: ../../man/man5/manpath.man5:235 +#, fuzzy +#| msgid "" +#| "If I<width> is non-zero, cat pages will always be formatted for a " +#| "terminal of the given width, regardless of the width of the terminal " +#| "actually being used. This should generally be within the range set by " +#| "B<MINCATWIDTH> and B<MAXCATWIDTH>." msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "Jeżeli I<szerokość> jest wiÄ™ksza od zera, to zawsze bÄ™dÄ… tworzone " "preformatowane strony podrÄ™cznika dla terminalu o podanej szerokoÅ›ci, " @@ -3649,8 +3657,8 @@ msgstr "" "(drzewami katalogów) sÄ… te, które okreÅ›lono jako systemowe w pliku " "konfiguracyjnym man-db. DomyÅ›lne sekcje okreÅ›la albo podzielona dwukropkami " "zawartość zmiennej Å›rodowiska $B<MANSECT>, albo zestaw standardowy " -"wkompilowany w B<man>, jeżeli $B<MANSECT> jest niezdefiniowana. WywoÅ‚anie B<" -"%catman%> z zestawem rozdzielonych biaÅ‚ymi znakami nazw sekcji nadpisuje " +"wkompilowany w B<man>, jeżeli $B<MANSECT> jest niezdefiniowana. WywoÅ‚anie " +"B<%catman%> z zestawem rozdzielonych biaÅ‚ymi znakami nazw sekcji nadpisuje " "powyższe ustawienia domyÅ›lne." #. type: Plain text @@ -3718,10 +3726,10 @@ msgid "" "db utilities to enhance their speed and functionality." msgstr "" "B<%mandb%> sÅ‚uży do inicjowania lub rÄ™cznej aktualizacji B<indeksowych> " -"buforów baz danych (index database caches), zwykle obsÅ‚ugiwanych przez B<%man" -"%>. Bufory zawierajÄ… informacjÄ™ zwiÄ…zanÄ… z aktualnym stanem systemu stron " -"man. Informacja w nich przechowywana używana jest przez narzÄ™dzia man-db do " -"poprawy ich szybkoÅ›ci i funkcjonalnoÅ›ci dziaÅ‚ania." +"buforów baz danych (index database caches), zwykle obsÅ‚ugiwanych przez " +"B<%man%>. Bufory zawierajÄ… informacjÄ™ zwiÄ…zanÄ… z aktualnym stanem systemu " +"stron man. Informacja w nich przechowywana używana jest przez narzÄ™dzia man-" +"db do poprawy ich szybkoÅ›ci i funkcjonalnoÅ›ci dziaÅ‚ania." #. type: Plain text #: ../../man/man8/mandb.man8:46 @@ -3868,10 +3876,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" "DomyÅ›lnie B<%mandb%> próbuje zaktualizować uprzednio utworzone bazy. JeÅ›li " "baza nie istnieje, to jÄ… utworzy. Niniejsza opcja wymusza na B<%mandb%> " @@ -4063,14 +4071,14 @@ msgstr "" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> [\\|B<-C> I<plik>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<ostrzeżenia>\\|]\\|] [\\|B<-R> I<kodowanie_znaków>\\|] " @@ -4079,44 +4087,44 @@ msgstr "" #~ "I<rozszerzenie>\\|] [\\|B<-i>\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--" #~ "wildcard>\\|] [\\|B<--names-only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--" #~ "no-subpages>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<linia_zachÄ™ty>\\|] " -#~ "[\\|B<-7>\\|] [\\|B<-E> I<kodowanie_znaków>\\|] [\\|B<--no-hyphenation>" -#~ "\\|] [\\|B<--no-justification>\\|] [\\|B<-p> I<Å‚aÅ„cuch_znaków>\\|] [\\|B<-" -#~ "t>\\|] [\\|B<-T>\\|[\\|I<urzÄ…dzenie>\\|]\\|] [\\|B<-H>\\|[\\|" -#~ "I<przeglÄ…darka>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<sekcja>\\|] I<strona>[.\\|I<sekcja>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "[\\|B<-7>\\|] [\\|B<-E> I<kodowanie_znaków>\\|] [\\|B<--no-" +#~ "hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " +#~ "I<Å‚aÅ„cuch_znaków>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<urzÄ…dzenie>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<przeglÄ…darka>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] " +#~ "[\\|B<-Z>\\|] [\\|[\\|I<sekcja>\\|] I<strona>[.\\|I<sekcja>\\|]\\ \\|.\\|." +#~ "\\|.\\|]\\ .\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<sekcja>\\|] I<sÅ‚owo>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<sekcja>\\|] I<sÅ‚owo>\\ .\\|." +#~ "\\|.\\&" #~ msgid "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-l> [\\|B<-C> I<plik>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<ostrzeżenia>\\|]\\|] [\\|B<-R> I<kodowanie_znaków>\\|] " #~ "[\\|B<-L> I<ustawienia_jÄ™zykowe>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> " #~ "I<linia_zachÄ™ty>\\|] [\\|B<-7>\\|] [\\|B<-E> I<kodowanie_znaków>\\|] [\\|" -#~ "B<-p> I<Å‚aÅ„cuch_znaków>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<urzÄ…dzenie>" -#~ "\\|]\\|] [\\|B<-H>\\|[\\|I<przeglÄ…darka>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>" -#~ "\\|]\\|] [\\|B<-Z>\\|] I<plik> \\&.\\|.\\|.\\&" +#~ "B<-p> I<Å‚aÅ„cuch_znaków>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|" +#~ "I<urzÄ…dzenie>\\|]\\|] [\\|B<-H>\\|[\\|I<przeglÄ…darka>\\|]\\|] [\\|B<-X>\\|" +#~ "[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<plik> \\&.\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<plik>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<strona> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<plik>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<strona> \\&.\\|.\\|.\\&" #~ msgid "" #~ "B<%man%> B<-c> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I<page> " @@ -4160,8 +4168,8 @@ msgstr "" #~ "Jeżeli B<%man%> nie bÄ™dzie mógÅ‚ znaleźć zainicjowanej przez B<%mandb%> " #~ "B<indeksowanej> bazy danych dla pewnej hierarchii stron podrÄ™cznika, to " #~ "wciąż bÄ™dzie przeszukiwaÅ‚ tÄ™ hierarchiÄ™, chociaż w takim wypadku bÄ™dzie " -#~ "potrzebne użycie przeszukiwania sytemu plików. JeÅ›li B<%whatis%> lub B<" -#~ "%apropos%> nie znajdÄ… B<indeksu>, bÄ™dÄ… próbowaÅ‚y znaleźć potrzebne " +#~ "potrzebne użycie przeszukiwania sytemu plików. JeÅ›li B<%whatis%> lub " +#~ "B<%apropos%> nie znajdÄ… B<indeksu>, bÄ™dÄ… próbowaÅ‚y znaleźć potrzebne " #~ "informacje w tradycyjnej bazie danych I<whatis>." #~ msgid "" @@ -4194,8 +4202,8 @@ msgstr "" #~ "B<%man%> will search for the desired manual pages within the I<index> " #~ "database caches. If the B<-u> option is given, a cache consistency check " #~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " +#~ "If this option is always given, it is not generally necessary to run " +#~ "B<%mandb%> after the caches are initially created, unless a cache becomes " #~ "corrupt. However, the cache consistency check can be slow on systems " #~ "with many manual pages installed, so it is not performed by default, and " #~ "system administrators may wish to run B<%mandb%> every week or so to keep " @@ -4261,8 +4269,8 @@ msgstr "" #~ msgstr "" #~ "Ta opcja powoduje, że B<%man%> przeprowadzi sprawdzenie spójnoÅ›ci swoich " #~ "baz danych na poziomie i-wÄ™złów, tak aby mieć pewność, że dokÅ‚adnie " -#~ "odzwierciedlajÄ… system plików. Opcja ta ma efekt tylko wtedy, gdy B<%man" -#~ "%> jest zainstalowany z ustawionym bitem set-user-id." +#~ "odzwierciedlajÄ… system plików. Opcja ta ma efekt tylko wtedy, gdy " +#~ "B<%man%> jest zainstalowany z ustawionym bitem set-user-id." #~ msgid "" #~ "The contents of $B<MANROFFOPT> are added to the command line every time " @@ -4340,8 +4348,8 @@ msgstr "" #~ "manpath~5 -E<gt> \"5 5 795981543 A - - format of the /etc/man_db.config " #~ "file\"\n" #~ "whatis -E<gt> \"1 1 795981543 A - - search the manual page names\"\n" -#~ "zsoelim -E<gt> \"1 1 795981543 A - - satisfy .so requests in roff input" -#~ "\"\n" +#~ "zsoelim -E<gt> \"1 1 795981543 A - - satisfy .so requests in roff " +#~ "input\"\n" #~ msgstr "" #~ "$mtime$ -E<gt> \"795987034\"\n" #~ "$version$ -E<gt> \"2.3.1\"\n" @@ -4349,8 +4357,8 @@ msgstr "" #~ "podrÄ™cznika ekranowego\"\n" #~ "catman -E<gt> \"8 8 795981544 A - - tworzy lub aktualizuje preformatowane " #~ "strony podrÄ™cznika ekranowego\"\n" -#~ "man -E<gt> \"1 1 795981542 A - - interfejs stron podrÄ™cznika ekranowego" -#~ "\"\n" +#~ "man -E<gt> \"1 1 795981542 A - - interfejs stron podrÄ™cznika " +#~ "ekranowego\"\n" #~ "mandb -E<gt> \"8 8 795981544 A - - tworzy lub aktualizuje bufory " #~ "indeksowe stron podrÄ™cznika ekranowego\"\n" #~ "manpath -E<gt> \" 1 5\"\n" @@ -4360,8 +4368,8 @@ msgstr "" #~ "\"\n" #~ "whatis -E<gt> \"1 1 795981543 A - - wyÅ›wietla opisy stron podrÄ™cznika " #~ "systemowego\"\n" -#~ "zsoelim -E<gt> \"1 1 795981543 A - - wypeÅ‚nia żądania .so w wejÅ›ciu roff" -#~ "\"\n" +#~ "zsoelim -E<gt> \"1 1 795981543 A - - wypeÅ‚nia żądania .so w wejÅ›ciu " +#~ "roff\"\n" #~ msgid "" #~ "If you want to override B<%man%>'s prompt string processing completely, " @@ -4443,15 +4451,15 @@ msgstr "" #~ msgstr "x\n" #~ msgid "" -#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis" -#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), " -#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), " -#~ "the man-db package manual, B<FSSTND>." +#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), " +#~ "B<%whatis%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), " +#~ "B<groff>(1), B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), " +#~ "B<latin1>(7), the man-db package manual, B<FSSTND>." #~ msgstr "" -#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis" -#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), " -#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), " -#~ "podrÄ™cznik pakietu man-db, B<FSSTND>." +#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), " +#~ "B<%whatis%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), " +#~ "B<groff>(1), B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), " +#~ "B<latin1>(7), podrÄ™cznik pakietu man-db, B<FSSTND>." #~ msgid "B<-s> I<section>, B<--section> I<section>" #~ msgstr "B<-s> I<sekcja>, B<--section> I<sekcja>" diff --git a/man/po4a/po/pt.po b/man/po4a/po/pt.po index ad254144..1d83ed2e 100644 --- a/man/po4a/po/pt.po +++ b/man/po4a/po/pt.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-manpages 2.9.0-pre1\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: 2019-10-03 07:53+0100\n" "Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n" "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n" @@ -60,8 +60,9 @@ msgstr "SINOPSE" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<lista>\\|] [\\|B<-m> I<sistema>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " @@ -118,8 +119,8 @@ msgid "" "Depending on your installation, this may be run by a periodic cron job, or " "may need to be run manually after new manual pages have been installed." msgstr "" -"A base de dados procurada por B<%apropos%> é actualizada pelo programa B<" -"%mandb%>. Dependendo da sua instalação, pode ser uma tarefa periódica cron " +"A base de dados procurada por B<%apropos%> é actualizada pelo programa " +"B<%mandb%>. Dependendo da sua instalação, pode ser uma tarefa periódica cron " "ou pode ter de ser manualmente executado após a instalação de novas páginas " "do manual." @@ -444,9 +445,9 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" "Se $B<POSIXLY_CORRECT> estiver definido, mesmo como valor nulo, a procura " "predefinida B<%apropos%> será como uma regex estendida (B<-r>). Hoje em dia, " @@ -516,8 +517,8 @@ msgstr "lexgrog - analisar informação de cabeçalho em páginas do manual" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" "B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " "I<codificação>\\|] I<ficheiro> \\&.\\|.\\|." @@ -532,8 +533,8 @@ msgid "" "preprocessing filters required by the man page before it is passed to " "B<nroff> or B<troff>, or both." msgstr "" -"B<lexgrog> é uma implementação do utilitário tradicional \\(lqgroff guess" -"\\(rq) em B<lex>. Ele lê a lista de ficheiros na linha de comandos como " +"B<lexgrog> é uma implementação do utilitário tradicional \\(lqgroff " +"guess\\(rq) em B<lex>. Ele lê a lista de ficheiros na linha de comandos como " "ficheiros fonte de páginas do manual ou páginas pré-formatadas \\(lqcat\\(rq " "e mostra o seu nome e descrição conforme utilizados por B<apropos> e " "B<whatis>, a lista de filtros de pré-processamento exigidos pela página do " @@ -542,17 +543,18 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" -"Se a entrada estiver mal formatada, B<lexgrog> imprime \\(lqa análise falhou" -"\\(rq; isto pode ser útil para programas externos que precisam verificar as " -"páginas do manual para correcção. Se um dos ficheiros de entrada do " -"B<lexgrog> for \\(lq-\\(rq, lerá da entrada padrão; se algum ficheiro de " -"entrada for comprimido, será lida automaticamente uma versão descomprimida)." +"Se a entrada estiver mal formatada, B<lexgrog> imprime \\(lqa análise " +"falhou\\(rq; isto pode ser útil para programas externos que precisam " +"verificar as páginas do manual para correcção. Se um dos ficheiros de " +"entrada do B<lexgrog> for \\(lq-\\(rq, lerá da entrada padrão; se algum " +"ficheiro de entrada for comprimido, será lida automaticamente uma versão " +"descomprimida)." #. type: Plain text #: ../../man/man1/lexgrog.man1:57 @@ -569,8 +571,8 @@ msgid "" "Parse input as preformatted man pages (\\(lqcat pages\\(rq). B<--man> and " "B<--cat> may not be given simultaneously." msgstr "" -"Analisar entrada como páginas do manual pré-formatadas (\\(lqpáginas cat" -"\\(rq). B<--man> e B<--cat> não podem ser indicados em simultâneo." +"Analisar entrada como páginas do manual pré-formatadas (\\(lqpáginas " +"cat\\(rq). B<--man> e B<--cat> não podem ser indicados em simultâneo." #. type: Plain text #: ../../man/man1/lexgrog.man1:75 @@ -688,8 +690,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" "Algumas páginas do manual requerem que \\(oq\\e-\\(cq seja exactamente como " @@ -761,18 +763,18 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "Há várias razões para a falha da análise do whatis. Por vezes, os autores " -"das páginas do manual substituem \\(oq.SH NOME\\(cq por \\(oq.SH MEUPROGRAMA" -"\\(cq, o que leva a que B<%mandb%> não consiga encontra a secção de onde " -"extrair a informação necessária. Outras vezes, incluem uma secção NOME mas " -"colocam aqui texto livre, em vez de \\(oqnome \\e- descrição\\(cq. Contudo, " -"qualquer sintaxe parecida com o acima deverá ser aceite." +"das páginas do manual substituem \\(oq.SH NOME\\(cq por \\(oq.SH " +"MEUPROGRAMA\\(cq, o que leva a que B<%mandb%> não consiga encontra a secção " +"de onde extrair a informação necessária. Outras vezes, incluem uma secção " +"NOME mas colocam aqui texto livre, em vez de \\(oqnome \\e- descrição\\(cq. " +"Contudo, qualquer sintaxe parecida com o acima deverá ser aceite." #. type: SH #: ../../man/man1/lexgrog.man1:202 @@ -861,13 +863,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:88 msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "B<%man%> é o paginador do manual do sistema. Cada argumento I<página> dado a " @@ -1185,8 +1187,8 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "Procura nas descriçoes curtas e nomes de páginas do manual pela palavra-" "chave I<printf> como expressão regular. Imprime quaisquer correspondências. " @@ -1247,9 +1249,9 @@ msgstr "" "antes de analisar a sua própria linha de comando. As opções que requerem um " "argumento serão substituÃdas pelas mesmas opções encontradas na linha de " "comando. Para repor todas as opções definidas em $B<MANOPT>, B<-D> pode ser " -"especificada como opção inicial da linha de comando. Isto permitirá que %man" -"% \"esqueça\" as opções especificadas em $B<MANOPT>, embora elas pudessem " -"ainda ser válidas." +"especificada como opção inicial da linha de comando. Isto permitirá que " +"%man% \"esqueça\" as opções especificadas em $B<MANOPT>, embora elas " +"pudessem ainda ser válidas." #. type: Plain text #: ../../man/man1/man.man1:307 @@ -1342,8 +1344,8 @@ msgstr "PREDEFINIÇÕES" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" "A ordem das secções a procurar pode ser sobreposta pela variável de ambiente " "$B<MANSECT> ou pela directiva B<SECTION> em I<%manpath_config_file%>. Por " @@ -1436,10 +1438,10 @@ msgstr "Opções gerais" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "Esta opção é normalmente emitida como a primeira opção e repõe o " "comportamento de B<%man%> na predefinição. A sua finalidade é repor as " @@ -1582,11 +1584,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" -"Esta opção não é para uso geral e só deve ser usada pelo programa B<%catman" -"%>." +"Esta opção não é para uso geral e só deve ser usada pelo programa " +"B<%catman%>." #. type: TP #: ../../man/man1/man.man1:527 @@ -1722,9 +1724,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" "Alguns sistemas incorporam grandes pacotes de páginas do manual, tais como " "as que acompanham o pacote B<Tcl>, na hierarquia principal das páginas do " @@ -1734,8 +1736,8 @@ msgstr "" "páginas na secção correcta e atribuir-lhes uma \"extensão\" especÃfica, " "neste caso, B<exit>(3tcl). Sob operação normal, B<%man%> mostrará B<exit>(3) " "preferencialmente a B<exit>(3tcl). Para negociar esta situação e evitar ter " -"de saber qual a secção em que está o que necessita, é agora possÃvel dar a B<" -"%man%> uma cadeia I<sub-extensão> indicando a que pacote a página tem de " +"de saber qual a secção em que está o que necessita, é agora possÃvel dar a " +"B<%man%> uma cadeia I<sub-extensão> indicando a que pacote a página tem de " "pertencer. Usando o exemplo acima, indicando a opção B<-e\\ tcl> a B<%man%> " "restringe a procura a páginas com uma extensão B<*tcl>." @@ -1777,8 +1779,9 @@ msgstr "" "descrições correspondentes a cada argumento I<page> usando caracteres " "universais, como com B<apropos>(1) B<-wildcard>. O argumento I<page> tem de " "corresponder ao nome ou descrição completos ou corresponder aos limites de " -"palavras na descrição. Como não há habitualmente forma de escolher a \"melhor" -"\" página ao procurar um carácter universal, esta opção implica B<-a>." +"palavras na descrição. Como não há habitualmente forma de escolher a " +"\"melhor\" página ao procurar um carácter universal, esta opção implica B<-" +"a>." #. type: Plain text #: ../../man/man1/man.man1:691 @@ -1855,8 +1858,8 @@ msgid "" "overrides the $B<PAGER> environment variable. It is not used in conjunction " "with B<-f> or B<-k>." msgstr "" -"Especifica o paginador de saÃda a usar. Por predefinição, B<%man%> usa B<" -"%pager%>, caindo em B<%cat%> se o B<%pager%> não for encontrado ou não for " +"Especifica o paginador de saÃda a usar. Por predefinição, B<%man%> usa " +"B<%pager%>, caindo em B<%cat%> se o B<%pager%> não for encontrado ou não for " "executável. Esta opção sobrepõe-se à variável de ambiente $B<MANPAGER>, que, " "por sua vez, se sobrepõe à variável de ambiente $B<PAGER>. Não é usada em " "conjunto com B<-f> ou B<-k>." @@ -1960,8 +1963,8 @@ msgstr "" "significado, veja a página do B<less>(1). A cadeia do prompt é primeiro " "avaliada pela shell. Todas as aspas e barras invertidas no prompt têm de ser " "escapadas com uma barra invertida precedente. A cadeia pode terminar num $ " -"escapadoque pode ser seguido de mais opções do B<less>. Por predefinição, B<" -"%man%> define as opções B<-ix8>" +"escapadoque pode ser seguido de mais opções do B<less>. Por predefinição, " +"B<%man%> define as opções B<-ix8>" #. type: Plain text #: ../../man/man1/man.man1:827 @@ -2117,14 +2120,14 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "Se está a escrever uma página do manual e simplesmente quer impedir o " "B<nroff> de alinhar assim determinados parágrafos, não use esta opção, " -"consulte antes a documentação do B<nroff>; e.g., pode usar os pedidos \".na" -"\", \".nf\", \".fi\" e \".ad\" para desactivar temporariamente o ajuste e " +"consulte antes a documentação do B<nroff>; e.g., pode usar os pedidos \"." +"na\", \".nf\", \".fi\" e \".ad\" para desactivar temporariamente o ajuste e " "preenchimento." #. type: TP @@ -2302,13 +2305,13 @@ msgstr "" msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "Se $B<MANPAGER> ou $B<PAGER> estiverem definidas ($B<MANPAGER> é preferida), " "o seu valor é usado como nome do programa usado para mostrar a página do " -"manual. Por predefinição, é usada B<%pager%>, voltando a B<%cat%> se o B<" -"%pager%> não for encontrado ou não for executável." +"manual. Por predefinição, é usada B<%pager%>, voltando a B<%cat%> se o " +"B<%pager%> não for encontrado ou não for executável." #. type: Plain text #: ../../man/man1/man.man1:1151 @@ -2317,8 +2320,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "Se $B<MANLESS> estiver definida, o seu valor será usado como cadeia de " "prompt predefinida do paginador B<less>, como se fosse passada como opção B<-" @@ -2334,8 +2337,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "Se $B<BROWSER> estiver definida, o seu valor é uma lista de comandos " "separados por dois-pontos, cada um dos quais é usado à vez para tentar " @@ -2433,8 +2436,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" @@ -2442,13 +2445,13 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "Dependendo do sistema e da implementação, ou uma ou ambas $B<LANG> e " -"$B<LC_MESSAGES> serão interrogadas sobre o idioma da mensagem actual. O B<" -"%man%> mostrará as suas mensagens nesse idioma (se disponÃvel). Veja " +"$B<LC_MESSAGES> serão interrogadas sobre o idioma da mensagem actual. O " +"B<%man%> mostrará as suas mensagens nesse idioma (se disponÃvel). Veja " "B<setlocale>(3) para detalhes precisos." #. type: Plain text @@ -2796,13 +2799,15 @@ msgstr "%whatis% - mostra descrições das páginas do manual numa linha" #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<lista>" -"\\|] [\\|B<-m> I<sistema>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<caminho>\\|] " -"[\\|B<-L> I<idioma>\\|] [\\|B<-C> I<ficheiro>\\|] I<nome> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<lista>\\|] [\\|B<-m> I<sistema>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<caminho>\\|] [\\|B<-L> I<idioma>\\|] [\\|B<-C> I<ficheiro>\\|] I<nome> \\&." +"\\|.\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -2830,8 +2835,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" @@ -2876,8 +2881,9 @@ msgid "" msgstr "" "Interpreta cada I<nome> como um padrão contendo caracteres universais ao " "estilo da shell. Para que haja uma correspondência, um I<nome> expandido tem " -"de corresponder a todo o nome da página. Esta opção faz com que o B<%whatis" -"%> seja algo mais lento devido à natureza das base de dados de procura." +"de corresponder a todo o nome da página. Esta opção faz com que o " +"B<%whatis%> seja algo mais lento devido à natureza das base de dados de " +"procura." #. type: Plain text #: ../../man/man1/whatis.man1:131 @@ -3333,11 +3339,16 @@ msgstr "B<CATWIDTH>I<\\ largura>" #. type: Plain text #: ../../man/man5/manpath.man5:235 +#, fuzzy +#| msgid "" +#| "If I<width> is non-zero, cat pages will always be formatted for a " +#| "terminal of the given width, regardless of the width of the terminal " +#| "actually being used. This should generally be within the range set by " +#| "B<MINCATWIDTH> and B<MAXCATWIDTH>." msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "Se a I<largura> for diferente de zero, as páginas cat serão sempre " "formatadas para um terminal da largura indicada, independentemente da " @@ -3400,8 +3411,8 @@ msgid "" "B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<path>\\|] [\\|B<-C> I<file>\\|] [\\|" "I<section>\\|] \\&.\\|.\\|." msgstr "" -"B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<caminho>\\|] [\\|B<-C> I<ficheiro>" -"\\|] [\\|I<secção>\\|] \\&.\\|.\\|." +"B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<caminho>\\|] [\\|B<-C> " +"I<ficheiro>\\|] [\\|I<secção>\\|] \\&.\\|.\\|." #. type: Plain text #: ../../man/man8/catman.man8:32 @@ -3481,8 +3492,8 @@ msgid "" "B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<file>\\|] B<-f> I<filename>\\ .\\|." "\\|." msgstr "" -"B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<ficheiro>\\|] B<-f> I<nomeficheiro>" -"\\ .\\|.\\|." +"B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<ficheiro>\\|] B<-f> " +"I<nomeficheiro>\\ .\\|.\\|." #. type: Plain text #: ../../man/man8/mandb.man8:38 @@ -3643,10 +3654,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" "Por predefinição, o B<%mandb%> tentará actualizar quaisquer bases de dados " "anteriormente criadas. Se uma delas não existir, será criada. Esta opção " @@ -3838,56 +3849,56 @@ msgstr "" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> [\\|B<-C> I<ficheiro>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<avisos>\\|]\\|] [\\|B<-R> I<codificação>\\|] [\\|B<-L> " #~ "I<idioma>\\|] [\\|B<-m> I<sistema>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#~ "I<caminho>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-e> I<extensão>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "I<caminho>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-e> I<extensão>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" #~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " #~ "I<paginador>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " -#~ "I<codificação>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>" -#~ "\\|] [\\|B<-p> I<cadeia>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<dispositivo>" -#~ "\\|]\\|] [\\|B<-H>\\|[\\|I<navegador>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>" -#~ "\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<secção>\\|] I<página>[.\\|I<secção>" -#~ "\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" +#~ "I<codificação>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-" +#~ "justification>\\|] [\\|B<-p> I<cadeia>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|" +#~ "I<dispositivo>\\|]\\|] [\\|B<-H>\\|[\\|I<navegador>\\|]\\|] [\\|B<-X>\\|" +#~ "[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<secção>\\|] I<página>[.\\|" +#~ "I<secção>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<secção>\\|] I<termo>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<secção>\\|] I<termo>\\ .\\|." +#~ "\\|.\\&" #~ msgid "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-l> [\\|B<-C> I<ficheiro>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|" #~ "B<--warnings>\\|[\\|=I<avisos>\\|]\\|] [\\|B<-R> I<codificação>\\|] [\\|" #~ "B<-L> I<idioma>\\|] [\\|B<-P> I<paginador>\\|] [\\|B<-r> I<prompt>\\|] " #~ "[\\|B<-7>\\|] [\\|B<-E> I<codificação>\\|] [\\|B<-p> I<cadeia>\\|] [\\|B<-" -#~ "t>\\|] [\\|B<-T>\\|[\\|I<dispositivo>\\|]\\|] [\\|B<-H>\\|[\\|I<navegador>" -#~ "\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<ficheiro> \\&.\\|." -#~ "\\|.\\&" +#~ "t>\\|] [\\|B<-T>\\|[\\|I<dispositivo>\\|]\\|] [\\|B<-H>\\|[\\|" +#~ "I<navegador>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] " +#~ "I<ficheiro> \\&.\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<ficheiro>\\|] [\\|B<-d>\\|] [\\|B<-" #~ "D>\\|] I<página> \\&.\\|.\\|.\\&" @@ -3967,8 +3978,8 @@ msgstr "" #~ "B<%man%> will search for the desired manual pages within the I<index> " #~ "database caches. If the B<-u> option is given, a cache consistency check " #~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " +#~ "If this option is always given, it is not generally necessary to run " +#~ "B<%mandb%> after the caches are initially created, unless a cache becomes " #~ "corrupt. However, the cache consistency check can be slow on systems " #~ "with many manual pages installed, so it is not performed by default, and " #~ "system administrators may wish to run B<%mandb%> every week or so to keep " @@ -3984,8 +3995,8 @@ msgstr "" #~ "inicial das caches, a menos que as caches sejam corrompidas. No entanto, " #~ "a verificação de consistência da cache pode ser lenta em sistemas com " #~ "muitas páginas do manual instaladas, portanto, não é executada por " -#~ "predefinição. Os administradores de sistema podem desejar executar B<" -#~ "%mandb%> semanalmente para manter as caches actualizadas. Para evitar " +#~ "predefinição. Os administradores de sistema podem desejar executar " +#~ "B<%mandb%> semanalmente para manter as caches actualizadas. Para evitar " #~ "problemas causados por caches desactualizadas, B<%man%> voltará ao " #~ "globbing de ficheiros se uma consulta de cache falhar, assim como " #~ "ocorreria se nenhuma cache estivesse presente." diff --git a/man/po4a/po/pt_BR.po b/man/po4a/po/pt_BR.po index fa2d7106..b805243c 100644 --- a/man/po4a/po/pt_BR.po +++ b/man/po4a/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-manpages 2.9.0-pre1\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: 2019-10-01 14:35-0200\n" "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." @@ -60,8 +60,9 @@ msgstr "SINOPSE" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<lista>\\|] [\\|B<-m> I<sistema>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " @@ -118,8 +119,8 @@ msgid "" "Depending on your installation, this may be run by a periodic cron job, or " "may need to be run manually after new manual pages have been installed." msgstr "" -"O banco de dados pesquisado por B<%apropos%> é atualizado pelo programa B<" -"%mandb%>. Dependendo de sua instalação, ele pode ser executado por um " +"O banco de dados pesquisado por B<%apropos%> é atualizado pelo programa " +"B<%mandb%>. Dependendo de sua instalação, ele pode ser executado por um " "trabalho cron periódico ou pode precisar ser executado manualmente após " "novas páginas serem instaladas." @@ -287,9 +288,9 @@ msgid "" "the contents of $B<MANPATH>." msgstr "" "Especifica um conjunto alternativo de hierarquias de páginas de manual, " -"separadas por caractere de dois pontos, a ser pesquisado. Por padrão, B<" -"%program%> usa a variável de ambiente $B<MANPATH>, a menos que esteja vazia " -"ou não definida, caso em que ele vai determinar um manpath apropriado " +"separadas por caractere de dois pontos, a ser pesquisado. Por padrão, " +"B<%program%> usa a variável de ambiente $B<MANPATH>, a menos que esteja " +"vazia ou não definida, caso em que ele vai determinar um manpath apropriado " "baseado em sua variável de ambiente $B<PATH>. Essa opção sobrescreve o " "conteúdo de $B<MANPATH>." @@ -449,9 +450,9 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" "Se $B<POSIXLY_CORRECT> estiver definido, ainda que com um valor nulo, a " "pesquisa padrão de B<%apropos%> será feita como uma expressão regular " @@ -521,8 +522,8 @@ msgstr "lexgrog - analisa informações do cabeçalho em páginas man" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" "B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " "I<codificação>\\|] I<arquivo> \\&.\\|.\\|." @@ -547,11 +548,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" "Se sua entrada estiver mal formatada, B<lexgrog> irá imprimir \\(lqparse " "failed\\(rq; isso pode ser útil para programas externos que precisam " @@ -693,8 +694,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" "Alguns paginadores de manual exigem que \\(oq\\e-\\(cq seja exatamente como " @@ -766,11 +767,11 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "Há vários motivos comuns pelos quais a análise com whatis falha. Alguns " "autores de páginas de manual substituem \\(oq.SH NAME\\(cq com \\(oq.SH " @@ -870,13 +871,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:88 msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "B<%man%> é o paginador de manual do sistema. Cada argumento I<página> " @@ -1194,8 +1195,8 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "Pesquisa por descrições curtas e nomes de páginas de manual para a palavra-" "chave I<printf> como expressão regular. Emite qualquer correspondência. " @@ -1214,8 +1215,8 @@ msgid "" "descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" "Procura as páginas de manual referenciadas por I<smail> e imprime as " -"descrições curtas de qualquer uma que tenha sido localizada. Equivalente a B<" -"%whatis%>I<\\ smail>B<.>" +"descrições curtas de qualquer uma que tenha sido localizada. Equivalente a " +"B<%whatis%>I<\\ smail>B<.>" #. type: SH #: ../../man/man1/man.man1:268 @@ -1353,12 +1354,12 @@ msgstr "PADRÕES" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" "A ordem das seções para pesquisar pode ser substituÃda pela variável de " -"ambiente $B<MANSECT> ou pela diretiva B<SECTION> em I<%manpath_config_file" -"%>. Por padrão, é o seguinte:" +"ambiente $B<MANSECT> ou pela diretiva B<SECTION> em " +"I<%manpath_config_file%>. Por padrão, é o seguinte:" #. type: Plain text #: ../../man/man1/man.man1:361 @@ -1448,10 +1449,10 @@ msgstr "Opções gerais" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "Essa opção normalmente é chamada como a primeira opção e redefine o " "comportamento do B<%man%> para seu padrão. Seu uso é para redefinir aquelas " @@ -1501,8 +1502,8 @@ msgid "" "keywords and display any matches. See B<%apropos%>(1) for details." msgstr "" "Equivalente a B<%apropos%>. Pesquisa as descrições curtas de página de " -"manual para palavras-chave e exibe quaisquer correspondências. Veja B<" -"%apropos%>(1) para detalhes." +"manual para palavras-chave e exibe quaisquer correspondências. Veja " +"B<%apropos%>(1) para detalhes." #. type: Plain text #: ../../man/man1/man.man1:470 @@ -1596,11 +1597,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" -"Essa opção não é para uso geral e deve ser usado apenas pelo programa B<" -"%catman%>." +"Essa opção não é para uso geral e deve ser usado apenas pelo programa " +"B<%catman%>." #. type: TP #: ../../man/man1/man.man1:527 @@ -1737,9 +1738,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" "Alguns sistemas incorporam pacotes grandes de páginas de manual, como " "aquelas que acompanham o pacote B<Tcl>, à hierarquia principal de páginas de " @@ -1751,9 +1752,9 @@ msgstr "" "preferência em relação a B<exit>(3tcl). Para negociar essa situação e para " "evitar de ter que saber em qual seção de página você deseja está, agora é " "possÃvel fornecer ao B<%man%> um texto I<subextensão> indicando a qual " -"pacote a página deve pertencer. Usando o exemplo acima, fornecer a opção B<-e" -"\\ tcl> para B<%man%> vai restringir a pesquisa a páginas tendo uma extensão " -"de B<*tcl>." +"pacote a página deve pertencer. Usando o exemplo acima, fornecer a opção B<-" +"e\\ tcl> para B<%man%> vai restringir a pesquisa a páginas tendo uma " +"extensão de B<*tcl>." #. type: Plain text #: ../../man/man1/man.man1:654 @@ -1942,8 +1943,8 @@ msgid "" "current manual page and its section name surrounded by \"(\" and \")\". The " "string used to produce the default could be expressed as" msgstr "" -"Fornecer B<-r> com um texto sobrescreverá esse padrão. O texto pode conter B<" -"$MAN_PN> que será expandido para o nome da página manual atual e o nome de " +"Fornecer B<-r> com um texto sobrescreverá esse padrão. O texto pode conter " +"B<$MAN_PN> que será expandido para o nome da página manual atual e o nome de " "sua seção envolto por \"(\" e \")\". O texto usado para produzir o padrão " "poderia se expressado com" @@ -2138,14 +2139,14 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "Se você está escrevendo uma página de manual e só deseja evitar que B<nroff> " "justifique certos parágrafos, não use essa opção; em vez disso, consulte a " -"documentação do B<nroff>. Por exemplo, você pode usar as requisições \".na" -"\", \".nf\", \".fi\" e \".ad\" para temporariamente desabilitar ajuste de " +"documentação do B<nroff>. Por exemplo, você pode usar as requisições \"." +"na\", \".nf\", \".fi\" e \".ad\" para temporariamente desabilitar ajuste de " "preenchimento." #. type: TP @@ -2239,10 +2240,10 @@ msgid "" "respectively." msgstr "" "Essa opção exibe a saÃda de B<groff> em uma janela gráfica usando o programa " -"B<gxditview>. O I<dpi> (pontos por polegada ou, em inglês, \"dots per inch" -"\") pode ser 75, 75-12, 100 ou 100-12, tendo como padrão o 75; as variantes " -"-12 usam uma fonte de base de 12 pontos. Essa opção resulta em B<-T> com o " -"dispositivo X75, X75-12, X100 ou X100-12, respectivamente." +"B<gxditview>. O I<dpi> (pontos por polegada ou, em inglês, \"dots per " +"inch\") pode ser 75, 75-12, 100 ou 100-12, tendo como padrão o 75; as " +"variantes -12 usam uma fonte de base de 12 pontos. Essa opção resulta em B<-" +"T> com o dispositivo X75, X75-12, X100 ou X100-12, respectivamente." #. type: Plain text #: ../../man/man1/man.man1:1038 @@ -2317,16 +2318,16 @@ msgstr "" "Se $B<MANSECT> estiver definido, seu valor é uma lista delimitada por " "caractere de dois pontos contendo seções que é usada para determinar quais " "seções de manual devem ser pesquisadas e em qual ordem. O padrão é " -"\"%sections%\", a menos que seja sobrescrito pela diretiva B<SECTION> em I<" -"%manpath_config_file%>." +"\"%sections%\", a menos que seja sobrescrito pela diretiva B<SECTION> em " +"I<%manpath_config_file%>." #. type: Plain text #: ../../man/man1/man.man1:1126 msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "Se $B<MANPAGER> ou $B<PAGER> estiverem definidos ($B<MANPAGER> é usado " "preferencialmente), seu valor é usado como o nome do programa para exibir a " @@ -2340,8 +2341,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "Se $B<MANLESS> estiver definido, seu valor será usado como o texto de prompt " "padrão para o paginador B<less>, como se ele tivesse sido passado usando a " @@ -2357,8 +2358,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "Se $B<BROWSER> estiver definido, seu valor é uma lista delimitada por " "caractere de dois pontos contendo os comandos, cada um dos quais, por sua " @@ -2459,8 +2460,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" @@ -2468,8 +2469,8 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "Dependendo do sistema e implementação, $B<LANG> e/ou $B<LC_MESSAGES> serão " @@ -2660,8 +2661,8 @@ msgid "" "I<to-code> [\\|B<-dqhV>\\|] [\\|I<filename>\\|]" msgstr "" "B<%manconv%> B<-f> [\\|I<da-codificação>\\|[:I<da-codificação>\\|.\\|." -"\\|.]\\|] B<-t> I<para-codificação> [\\|B<-dqhV>\\|] [\\|I<nome-de-arquivo>" -"\\|]" +"\\|.]\\|] B<-t> I<para-codificação> [\\|B<-dqhV>\\|] [\\|I<nome-de-" +"arquivo>\\|]" #. type: Plain text #: ../../man/man1/manconv.man1:30 @@ -2751,8 +2752,8 @@ msgid "" "environment." msgstr "" "O caminho, delimitado por caractere de dois pontos, é determinado usando " -"informação obtida a partir do arquivo de configuração man-db \\(en (I<" -"%manpath_config_file%>) e o ambiente do usuário." +"informação obtida a partir do arquivo de configuração man-db \\(en " +"(I<%manpath_config_file%>) e o ambiente do usuário." #. type: Plain text #: ../../man/man1/manpath.man1:42 @@ -2792,9 +2793,9 @@ msgid "" "include NewOS's manual page hierarchies use the option B<-m> B<NewOS>." msgstr "" "Se esse sistema possuir acesso à s hierarquias de manual de outro sistema " -"operacional, essa opção pode ser usada para incluÃ-las na saÃda de B<%manpath" -"%>. Para incluir hierarquias de página de manual do NewOS, use a opção B<-m> " -"B<NewOS>." +"operacional, essa opção pode ser usada para incluÃ-las na saÃda de " +"B<%manpath%>. Para incluir hierarquias de página de manual do NewOS, use a " +"opção B<-m> B<NewOS>." #. type: Plain text #: ../../man/man1/manpath.man1:74 @@ -2825,13 +2826,15 @@ msgstr "%whatis% - exibe descrições de uma linha de páginas de manual" #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<lista>" -"\\|] [\\|B<-m> I<sistema>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<caminho>\\|] " -"[\\|B<-L> I<localidade>\\|] [\\|B<-C> I<arquivo>\\|] I<nome> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<lista>\\|] [\\|B<-m> I<sistema>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<caminho>\\|] [\\|B<-L> I<localidade>\\|] [\\|B<-C> I<arquivo>\\|] I<nome> " +"\\&.\\|.\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -2858,8 +2861,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" @@ -3362,11 +3365,16 @@ msgstr "B<CATWIDTH>I<\\ largura>" #. type: Plain text #: ../../man/man5/manpath.man5:235 +#, fuzzy +#| msgid "" +#| "If I<width> is non-zero, cat pages will always be formatted for a " +#| "terminal of the given width, regardless of the width of the terminal " +#| "actually being used. This should generally be within the range set by " +#| "B<MINCATWIDTH> and B<MAXCATWIDTH>." msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "Se I<largura> é diferente de zero, páginas cat sempre serão formatadas para " "um terminal da largura fornecida, independente da largura usada para o " @@ -3430,8 +3438,8 @@ msgid "" "B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<path>\\|] [\\|B<-C> I<file>\\|] [\\|" "I<section>\\|] \\&.\\|.\\|." msgstr "" -"B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<caminho>\\|] [\\|B<-C> I<arquivo>" -"\\|] [\\|I<seção>\\|] \\&.\\|.\\|." +"B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<caminho>\\|] [\\|B<-C> " +"I<arquivo>\\|] [\\|I<seção>\\|] \\&.\\|.\\|." #. type: Plain text #: ../../man/man8/catman.man8:32 @@ -3464,10 +3472,10 @@ msgstr "" "páginas de manual a serem pré-formatadas. As hierarquias padrões são aquelas " "especificadas como hierarquias de sistema no arquivo de configuração man-db, " "e as seções padrões são o conteúdo delimitado por caractere de dois pontos " -"da variável de ambiente $B<MANSECT> ou o conjunto padrão compilado em B<%man" -"%> se $B<MANSECT> não estiver definido. Fornecer B<%catman%> com um conjunto " -"de nomes de seções, delimitado por espaço em branco, sobrescreverá ambos " -"acima." +"da variável de ambiente $B<MANSECT> ou o conjunto padrão compilado em " +"B<%man%> se $B<MANSECT> não estiver definido. Fornecer B<%catman%> com um " +"conjunto de nomes de seções, delimitado por espaço em branco, sobrescreverá " +"ambos acima." #. type: Plain text #: ../../man/man8/catman.man8:55 @@ -3507,8 +3515,8 @@ msgstr "%mandb% - cria ou atualiza os caches de Ãndices de página de manual" msgid "" "B<%mandb%> [\\|B<-dqsucpt?V>\\|] [\\|B<-C> I<file>\\|] [\\|I<manpath>\\|]" msgstr "" -"B<%mandb%> [\\|B<-dqsucpt?V>\\|] [\\|B<-C> I<arquivo>\\|] [\\|I<caminho man>" -"\\|]" +"B<%mandb%> [\\|B<-dqsucpt?V>\\|] [\\|B<-C> I<arquivo>\\|] [\\|I<caminho " +"man>\\|]" #. type: Plain text #: ../../man/man8/mandb.man8:30 @@ -3679,10 +3687,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" "Por padrão, B<%mandb%> tentará atualizar quaisquer bancos de dados " "previamente criados. Se um banco de dados não existe, ele o criará. Essa " @@ -3876,56 +3884,56 @@ msgstr "" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> [\\|B<-C> I<arquivo>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<avisos>\\|]\\|] [\\|B<-R> I<codificação>\\|] [\\|B<-L> " #~ "I<localidade>\\|] [\\|B<-m> I<sistema>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#~ "I<caminho>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-e> I<extensão>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "I<caminho>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-e> I<extensão>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" #~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " #~ "I<paginador>\\|] [\\|B<-r> I<texto>\\|] [\\|B<-7>\\|] [\\|B<-E> " -#~ "I<codificação>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>" -#~ "\\|] [\\|B<-p> I<texto>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<dispositivo>" -#~ "\\|]\\|] [\\|B<-H>\\|[\\|I<navegador>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>" -#~ "\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<seção>\\|] I<página>[.\\|I<seção>\\|]\\ " -#~ "\\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" +#~ "I<codificação>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-" +#~ "justification>\\|] [\\|B<-p> I<texto>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|" +#~ "I<dispositivo>\\|]\\|] [\\|B<-H>\\|[\\|I<navegador>\\|]\\|] [\\|B<-X>\\|" +#~ "[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<seção>\\|] I<página>[.\\|" +#~ "I<seção>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<seção>\\|] I<terminal>\\ .\\|." +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<seção>\\|] I<terminal>\\ .\\|." #~ "\\|.\\&" #~ msgid "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-l> [\\|B<-C> I<arquivo>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|" #~ "B<--warnings>\\|[\\|=I<avisos>\\|]\\|] [\\|B<-R> I<codificação>\\|] [\\|" #~ "B<-L> I<localidade>\\|] [\\|B<-P> I<paginador>\\|] [\\|B<-r> I<texto>\\|] " #~ "[\\|B<-7>\\|] [\\|B<-E> I<codificação>\\|] [\\|B<-p> I<texto>\\|] [\\|B<-" -#~ "t>\\|] [\\|B<-T>\\|[\\|I<dispositivo>\\|]\\|] [\\|B<-H>\\|[\\|I<navegador>" -#~ "\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<arquivo> \\&.\\|." -#~ "\\|.\\&" +#~ "t>\\|] [\\|B<-T>\\|[\\|I<dispositivo>\\|]\\|] [\\|B<-H>\\|[\\|" +#~ "I<navegador>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] " +#~ "I<arquivo> \\&.\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<arquivo>\\|] [\\|B<-d>\\|] [\\|B<-" #~ "D>\\|] I<paginador> \\&.\\|.\\|.\\&" @@ -3973,8 +3981,8 @@ msgstr "" #~ "Se B<%man%> não puder localizar um banco de dados B<index> iniciado pelo " #~ "B<%mandb%> para uma hierarquia de páginas de manual em particular, ele " #~ "ainda pode pesquisar pelas páginas de manual, apesar de que uma busca por " -#~ "arquivos será necessária para pesquisar dentro daquela hierarquia. Se B<" -#~ "%whatis%> ou B<%apropos%> falhar em localizar um B<index>, ele tentará " +#~ "arquivos será necessária para pesquisar dentro daquela hierarquia. Se " +#~ "B<%whatis%> ou B<%apropos%> falhar em localizar um B<index>, ele tentará " #~ "extrair informações a partir de um banco de dados tradicional do " #~ "I<whatis>." @@ -4009,8 +4017,8 @@ msgstr "" #~ "B<%man%> will search for the desired manual pages within the I<index> " #~ "database caches. If the B<-u> option is given, a cache consistency check " #~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " +#~ "If this option is always given, it is not generally necessary to run " +#~ "B<%mandb%> after the caches are initially created, unless a cache becomes " #~ "corrupt. However, the cache consistency check can be slow on systems " #~ "with many manual pages installed, so it is not performed by default, and " #~ "system administrators may wish to run B<%mandb%> every week or so to keep " @@ -4022,15 +4030,15 @@ msgstr "" #~ "caches de banco de dados I<index>. Se a opção B<-u> for fornecida, uma " #~ "verificação de consistência do cache é realizada para assegurar de que os " #~ "bancos de dados reflitam precisamente o sistema de arquivos. Se essa " -#~ "opção sempre for fornecida, geralmente não é necessário executar B<%mandb" -#~ "%> após os caches terem sido inicialmente criados, a menos que um cache " -#~ "tenha se corrompido. Porém, a verificação de consistência do cache pode " -#~ "ser lenta em sistemas com muitas páginas de manual instaladas, então ela " -#~ "não é executada por padrão, e administradores de sistema podem preferir " -#~ "executar B<%mandb%> toda semana ou mais para manter os caches de banco de " -#~ "dados atualizados. Para se evitar problemas causados por caches não " -#~ "atualizados, B<%man%> voltará para busca por arquivos se uma procura no " -#~ "cache falhar, exatamente como faria se não houvesse cache presente." +#~ "opção sempre for fornecida, geralmente não é necessário executar " +#~ "B<%mandb%> após os caches terem sido inicialmente criados, a menos que um " +#~ "cache tenha se corrompido. Porém, a verificação de consistência do cache " +#~ "pode ser lenta em sistemas com muitas páginas de manual instaladas, então " +#~ "ela não é executada por padrão, e administradores de sistema podem " +#~ "preferir executar B<%mandb%> toda semana ou mais para manter os caches de " +#~ "banco de dados atualizados. Para se evitar problemas causados por caches " +#~ "não atualizados, B<%man%> voltará para busca por arquivos se uma procura " +#~ "no cache falhar, exatamente como faria se não houvesse cache presente." #~ msgid "" #~ "Once a manual page has been located, a check is performed to find out if " diff --git a/man/po4a/po/ro.po b/man/po4a/po/ro.po index d85cbfe1..7fdcb362 100644 --- a/man/po4a/po/ro.po +++ b/man/po4a/po/ro.po @@ -3,21 +3,25 @@ # Copyright (C) 2022 Free Software Foundation, Inc # This file is distributed under the same license as the man-db package. # -# Eugen Hoanca <eugenh@urban-grafx.ro>, 2003. # Florentina MuÈ™at <florentina.musat.28@gmail.com>, 2020. -# Actualizare a mesajelor, de la fiÈ™ierul „man-db-2.9.0-pre1.potâ€. +# Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 2022. +# +# Cronologia traducerii fiÈ™ierului „man-dbâ€: +# Traducerea iniÈ›ială, făcută de FM, pentru versiunea man-db-manpages 2.9.0-pre1. +# Actualizare a mesajelor, de la fiÈ™ierul „man-db-manpages-2.9.0-pre1.potâ€. # Actualizare a algoritmului formelor de plural (de la „trei-vechi†la „trei-actualâ€). # NU È™i a mesajelor traduse (acestea au rămas neschimbate). # Eliminare a mesajelor ce-au dispărut în ultima versiune. # Actualizări realizate de Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 15.01.2022. -# Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 2022. +# Actualizare a traducerii pentru versiunea 2.10.0-pre1, făcută de R-GC. +# Actualizare a traducerii pentru versiunea 2.11.0-pre1, făcută de R-GC. # msgid "" msgstr "" -"Project-Id-Version: man-db-manpages-2.10.0-pre1\n" +"Project-Id-Version: man-db-manpages-2.11.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" -"PO-Revision-Date: 2022-02-15 20:13+0100\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" +"PO-Revision-Date: 2022-10-03 18:54+0200\n" "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" "Language: ro\n" @@ -27,7 +31,7 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.1.1\n" # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # R-GC, scrie: @@ -3594,13 +3598,12 @@ msgstr "B<CATWIDTH>I<\\ lățime>" msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" -"Dacă I<lățimea> este diferită zero, paginile «cat» vor fi întotdeauna " +"Dacă I<lățimea> este diferită de zero, paginile «cat» vor fi întotdeauna " "formatate pentru un terminal cu lățimea dată, indiferent de lățimea " -"terminalului utilizat efectiv. Aceasta ar trebui să fie în general în " -"intervalul stabilit de B<MINCATWIDTH> È™i B<MAXCATWIDTH>." +"terminalului utilizat efectiv. Acest lucru suprascrie intervalul stabilit " +"de B<MINCATWIDTH> È™i B<MAXCATWIDTH>." #. type: Plain text #: ../../man/man5/manpath.man5:240 diff --git a/man/po4a/po/ru.po b/man/po4a/po/ru.po index 87bee203..2fb9c7f7 100644 --- a/man/po4a/po/ru.po +++ b/man/po4a/po/ru.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-manpages 2.9.0-pre1\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: 2019-10-04 19:39+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <gnu@d07.ru>\n" @@ -18,8 +18,8 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Lokalize 2.0\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. type: TH #: ../../man/man1/apropos.man1:12 ../../man/man1/lexgrog.man1:9 @@ -63,8 +63,9 @@ msgstr "СИÐТÐКСИС" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<ÑпиÑок>\\|] [\\|B<-m> I<ÑиÑтема>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " @@ -121,10 +122,10 @@ msgid "" "Depending on your installation, this may be run by a periodic cron job, or " "may need to be run manually after new manual pages have been installed." msgstr "" -"ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð°Ñ B<%apropos%> поиÑÐºÐ¾Ð²Ð°Ñ Ð±Ð°Ð·Ð° данных обновлÑетÑÑ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð¾Ð¹ B<" -"%mandb%>. Ð’ завиÑимоÑти от уÑтановки, она может запуÑкатьÑÑ ÐºÐ°Ðº периодичеÑки " -"выполнÑемое задание cron или вручную, поÑле уÑтановки новых Ñправочных " -"Ñтраниц." +"ИÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÐµÐ¼Ð°Ñ B<%apropos%> поиÑÐºÐ¾Ð²Ð°Ñ Ð±Ð°Ð·Ð° данных обновлÑетÑÑ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð¾Ð¹ " +"B<%mandb%>. Ð’ завиÑимоÑти от уÑтановки, она может запуÑкатьÑÑ ÐºÐ°Ðº " +"периодичеÑки выполнÑемое задание cron или вручную, поÑле уÑтановки новых " +"Ñправочных Ñтраниц." #. type: SH #: ../../man/man1/apropos.man1:61 ../../man/man1/lexgrog.man1:45 @@ -451,9 +452,9 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" "ЕÑли уÑтановлена Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ $B<POSIXLY_CORRECT>, даже Ð¸Ð¼ÐµÑŽÑ‰Ð°Ñ " "пуÑтое значение, то по умолчанию B<%apropos%> включает поиÑк по раÑширенным " @@ -524,11 +525,11 @@ msgstr "lexgrog - анализирует заголовочную информа #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<кодировка>" -"\\|] I<файл> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<кодировка>\\|] I<файл> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/lexgrog.man1:36 @@ -551,11 +552,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" "ЕÑли входные данные неправильно отформатированы, B<lexgrog> выведет " "\\(lqparse failed\\(rq; Ñто может оказатьÑÑ Ð¿Ð¾Ð»ÐµÐ·Ð½Ñ‹Ð¼ Ð´Ð»Ñ Ð²Ð½ÐµÑˆÐ½Ð¸Ñ… программ, " @@ -698,13 +699,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" -"Ðекоторые Ñправочные пейджеры требуют \\(oq\\e-\\(cq точно как показано; B<" -"%mandb%> более терпим, но Ð´Ð»Ñ ÑовмеÑтимоÑти Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ ÑиÑтемами вÑÑ‘ же лучше " -"оÑтавлÑÑ‚ÑŒ Ñимвол обратной коÑой черты." +"Ðекоторые Ñправочные пейджеры требуют \\(oq\\e-\\(cq точно как показано; " +"B<%mandb%> более терпим, но Ð´Ð»Ñ ÑовмеÑтимоÑти Ñ Ð´Ñ€ÑƒÐ³Ð¸Ð¼Ð¸ ÑиÑтемами вÑÑ‘ же " +"лучше оÑтавлÑÑ‚ÑŒ Ñимвол обратной коÑой черты." #. type: Plain text #: ../../man/man1/lexgrog.man1:158 @@ -771,11 +772,11 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "ЕÑÑ‚ÑŒ неÑколько раÑпроÑтранённых причин, по которым анализ может завершатьÑÑ " "неудачно. Иногда авторы Ñправочных Ñтраниц заменÑÑŽÑ‚ \\(oq.SH NAME\\(cq на " @@ -872,13 +873,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:88 msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "B<%man%> — Ñто пейджер Ñправочных Ñтраниц ÑиÑтемы. Каждый параметр " @@ -1202,8 +1203,8 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "ИÑкать в кратких опиÑаниÑÑ… и именах Ñправочных Ñтраниц ключевое Ñлово " "I<printf>, раÑÑматриваемое как регулÑрное выражение. Показать любые " @@ -1258,13 +1259,14 @@ msgid "" msgstr "" "Ð’ работе B<%man%> могут иÑпользоватьÑÑ Ñ€Ð°Ð·Ð»Ð¸Ñ‡Ð½Ñ‹Ðµ переменные окружениÑ. " "Возможно задать любые параметры во «вÑеобъемлющей» переменной $B<MANOPT>, " -"ÑÐºÑ€Ð°Ð½Ð¸Ñ€ÑƒÑ Ð¿Ñ€Ð¾Ð±ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ñимволы в значениÑÑ… (Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ обратной коÑой черты). B<" -"%man%> разбирает $B<MANOPT> перед началом анализа параметров, переданных при " -"вызове в командной Ñтроке. Ð’Ñе Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð², указанные в командной " -"Ñтроке, заменÑÑ‚ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñвоих аналогов из переменной окружениÑ. Ð”Ð»Ñ ÑброÑа " -"вÑех параметров, уÑтановленных Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ $B<MANOPT>, можно указать параметр " -"B<-D> в начале командной Ñтроки. Ðто позволит %man% «забыть» о значениÑÑ…, " -"указанных в $B<MANOPT>, Ñ…Ð¾Ñ‚Ñ Ð¾Ð½Ð¸ вÑÑ‘ равно должны быть заданы правильно." +"ÑÐºÑ€Ð°Ð½Ð¸Ñ€ÑƒÑ Ð¿Ñ€Ð¾Ð±ÐµÐ»ÑŒÐ½Ñ‹Ðµ Ñимволы в значениÑÑ… (Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ обратной коÑой черты). " +"B<%man%> разбирает $B<MANOPT> перед началом анализа параметров, переданных " +"при вызове в командной Ñтроке. Ð’Ñе Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð², указанные в " +"командной Ñтроке, заменÑÑ‚ Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ñвоих аналогов из переменной окружениÑ. " +"Ð”Ð»Ñ ÑброÑа вÑех параметров, уÑтановленных Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ $B<MANOPT>, можно " +"указать параметр B<-D> в начале командной Ñтроки. Ðто позволит %man% " +"«забыть» о значениÑÑ…, указанных в $B<MANOPT>, Ñ…Ð¾Ñ‚Ñ Ð¾Ð½Ð¸ вÑÑ‘ равно должны быть " +"заданы правильно." #. type: Plain text #: ../../man/man1/man.man1:307 @@ -1356,8 +1358,8 @@ msgstr "ЗÐÐЧЕÐИЯ ПО УМОЛЧÐÐИЮ" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" "ПорÑдок поиÑка по разделам можно изменить через переменную Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ " "$B<MANSECT> или директиву B<SECTION> в I<%manpath_config_file%>. Значение по " @@ -1451,10 +1453,10 @@ msgstr "Общие параметры" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "Ðтот параметр обычно вводитÑÑ Ñамым первым, и указывает B<%man%> " "активировать поведение по умолчанию. Он иÑпользуетÑÑ Ð´Ð»Ñ ÑброÑа параметров, " @@ -1505,8 +1507,8 @@ msgid "" "keywords and display any matches. See B<%apropos%>(1) for details." msgstr "" "Ðквивалентно работе B<%apropos%>. Ищет в кратких опиÑаниÑÑ… Ñправочных " -"Ñтраниц ключевые Ñлова и показывает любые ÑовпадениÑ. Подробней Ñмотрите B<" -"%apropos%>(1)." +"Ñтраниц ключевые Ñлова и показывает любые ÑовпадениÑ. Подробней Ñмотрите " +"B<%apropos%>(1)." #. type: Plain text #: ../../man/man1/man.man1:470 @@ -1600,8 +1602,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" "Ðтот параметр не Ð´Ð»Ñ Ð¾Ð±Ñ‹Ñ‡Ð½Ð¾Ð³Ð¾ иÑпользованиÑ, и должен иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ " "программой B<%catman%>." @@ -1624,11 +1626,11 @@ msgid "" msgstr "" "ВмеÑто обычного Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñправочной Ñтраницы можно преобразовать " "иÑходный текÑÑ‚ в заданную I<кодировку>. ЕÑли вам уже извеÑтна кодировка " -"иÑходного файла, то вы можете также иÑпользовать непоÑредÑтвенно B<%manconv" -"%>(1). Однако, Ñтот параметр позволÑет преобразовывать неÑколько Ñправочных " -"Ñтраниц в одну кодировку без Ñвного ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¸ каждой Ñтраницы, " -"предполагаÑ, что они уже уÑтановлены в Ñтруктуру, подобную иерархии " -"Ñправочных Ñтраниц." +"иÑходного файла, то вы можете также иÑпользовать непоÑредÑтвенно " +"B<%manconv%>(1). Однако, Ñтот параметр позволÑет преобразовывать неÑколько " +"Ñправочных Ñтраниц в одну кодировку без Ñвного ÑƒÐºÐ°Ð·Ð°Ð½Ð¸Ñ ÐºÐ¾Ð´Ð¸Ñ€Ð¾Ð²ÐºÐ¸ каждой " +"Ñтраницы, предполагаÑ, что они уже уÑтановлены в Ñтруктуру, подобную " +"иерархии Ñправочных Ñтраниц." #. type: Plain text #: ../../man/man1/man.man1:544 @@ -1740,9 +1742,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" "Ðекоторые ÑиÑтемы включают большое чиÑло пакетов Ñправочных Ñтраниц, " "например таких, которые поÑтавлÑÑŽÑ‚ÑÑ Ñ Ð¿Ð°ÐºÐµÑ‚Ð¾Ð¼ B<Tcl>, в главную иерархию " @@ -2144,8 +2146,8 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "ЕÑли вы пишите Ñправочную Ñтраницу и проÑто хотите отключить в B<nroff> " @@ -2260,8 +2262,8 @@ msgid "" "processor. It implies B<-t>." msgstr "" "B<groff> запуÑтит B<troff>, а затем иÑпользует ÑоответÑтвующий поÑтпроцеÑÑор " -"Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð°, подходÑщего Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾ уÑтройÑтва. ЕÑли I<%troff" -"%> Ñовпадает Ñ B<groff>, то данный параметр передаётÑÑ B<groff> и " +"Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð°, подходÑщего Ð´Ð»Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð¾Ð³Ð¾ уÑтройÑтва. ЕÑли " +"I<%troff%> Ñовпадает Ñ B<groff>, то данный параметр передаётÑÑ B<groff> и " "иÑпользование поÑтпроцеÑÑора отменÑетÑÑ. Подразумевает B<-t>." #. type: SS @@ -2332,13 +2334,13 @@ msgstr "" msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "ЕÑли уÑтановлена Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ $B<MANPAGER> или $B<PAGER> " "($B<MANPAGER> проÑматриваетÑÑ Ð¿ÐµÑ€Ð²Ð¾Ð¹), то в ней задано Ð¸Ð¼Ñ Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ñ‹ Ð´Ð»Ñ " -"Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ñправочной Ñтраницы. По умолчанию, иÑпользуетÑÑ B<%pager%> или B<" -"%cat%>, еÑли B<%pager%> не найден или не ÑвлÑетÑÑ Ð¸ÑполнÑемым файлом." +"Ð¾Ñ‚Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð¸Ñ Ñправочной Ñтраницы. По умолчанию, иÑпользуетÑÑ B<%pager%> или " +"B<%cat%>, еÑли B<%pager%> не найден или не ÑвлÑетÑÑ Ð¸ÑполнÑемым файлом." #. type: Plain text #: ../../man/man1/man.man1:1151 @@ -2347,8 +2349,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "ЕÑли уÑтановлена Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ $B<MANLESS>, то её значение будет " "иÑпользоватьÑÑ Ð¿Ð¾ умолчанию как Ñтрока Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿ÐµÐ¹Ð´Ð¶ÐµÑ€Ð° B<less>, как " @@ -2364,8 +2366,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "ЕÑли уÑтановлена Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ $B<BROWSER>, то её значение " "предÑтавлÑет Ñобой ÑпиÑок команд, разделÑемых двоеточием; ÐºÐ°Ð¶Ð´Ð°Ñ Ð¸Ð· них " @@ -2425,8 +2427,8 @@ msgstr "" "Ñимволы Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾Ñ‚Ð±Ñ€Ð°ÑываютÑÑ Ð´Ð»Ñ Ð¾Ð±Ð»ÐµÐ³Ñ‡ÐµÐ½Ð¸Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ€ÐµÐ·ÑƒÐ»ÑŒÑ‚Ð°Ñ‚Ð° не " "Ð¸Ð¼ÐµÑ Ñпециальных инÑтрументов. Однако, еÑли Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ " "$B<MAN_KEEP_FORMATTING> уÑтановлена в непуÑтое значение, то Ñимволы " -"Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾ÑтаютÑÑ. Ðто может быть полезно Ð´Ð»Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐµÐº вокруг B<%man" -"%>, которые раÑпознают Ñимволы форматированиÑ." +"Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¾ÑтаютÑÑ. Ðто может быть полезно Ð´Ð»Ñ Ð¾Ð±Ð¾Ð»Ð¾Ñ‡ÐµÐº вокруг " +"B<%man%>, которые раÑпознают Ñимволы форматированиÑ." #. type: Plain text #: ../../man/man1/man.man1:1228 @@ -2463,8 +2465,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" @@ -2472,8 +2474,8 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "Ð’ завиÑимоÑти от ÑиÑтемы и реализации, одна или обе переменные $B<LANG> и " @@ -2662,8 +2664,8 @@ msgid "" "I<to-code> [\\|B<-dqhV>\\|] [\\|I<filename>\\|]" msgstr "" "B<%manconv%> B<-f> [\\|I<начальнаÑ-кодировка>\\|[:I<начальнаÑ-кодировка>\\|." -"\\|.\\|.]\\|] B<-t> I<конечнаÑ-кодировка> [\\|B<-dqhV>\\|] [\\|I<имÑ-файла>" -"\\|]" +"\\|.\\|.]\\|] B<-t> I<конечнаÑ-кодировка> [\\|B<-dqhV>\\|] [\\|I<имÑ-" +"файла>\\|]" #. type: Plain text #: ../../man/man1/manconv.man1:30 @@ -2823,13 +2825,15 @@ msgstr "%whatis% - показывает одноÑтрочные опиÑÐ°Ð½Ð¸Ñ #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<ÑпиÑок>" -"\\|] [\\|B<-m> I<ÑиÑтема>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<путь>\\|] [\\|" -"B<-L> I<локаль>\\|] [\\|B<-C> I<файл>\\|] I<название> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<ÑпиÑок>\\|] [\\|B<-m> I<ÑиÑтема>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<путь>\\|] [\\|B<-L> I<локаль>\\|] [\\|B<-C> I<файл>\\|] I<название> \\&." +"\\|.\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -2858,8 +2862,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" @@ -3359,11 +3363,16 @@ msgstr "B<CATWIDTH>I<\\ ширина>" #. type: Plain text #: ../../man/man5/manpath.man5:235 +#, fuzzy +#| msgid "" +#| "If I<width> is non-zero, cat pages will always be formatted for a " +#| "terminal of the given width, regardless of the width of the terminal " +#| "actually being used. This should generally be within the range set by " +#| "B<MINCATWIDTH> and B<MAXCATWIDTH>." msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "ЕÑли значение I<ширина> не равно 0, то cat Ñтраницы будут вÑегда " "форматироватьÑÑ Ð´Ð»Ñ Ñ‚ÐµÑ€Ð¼Ð¸Ð½Ð°Ð»Ð° данной ширины, незавиÑимо от ширины терминала, " @@ -3463,9 +3472,9 @@ msgstr "" "которые должны быть отформатированы заранее. ИерархиÑми по умолчанию " "ÑчитаютÑÑ ÑиÑтемные иерархии, указанные в файле наÑтроек man-db, а разделы " "по умолчанию берутÑÑ Ð¸Ð· Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð¾Ð¹ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ $B<MANSECT> (ÑпиÑок " -"значений через двоеточие) или из значениÑ, заданного при компилÑции B<%man" -"%>, еÑли Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ $B<MANSECT> не уÑтановлена. При указании B<" -"%catman%> ÑпиÑка имён разделов через пробельный Ñимвол, он заменит оба Ñти " +"значений через двоеточие) или из значениÑ, заданного при компилÑции " +"B<%man%>, еÑли Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ $B<MANSECT> не уÑтановлена. При указании " +"B<%catman%> ÑпиÑка имён разделов через пробельный Ñимвол, он заменит оба Ñти " "Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ умолчанию." #. type: Plain text @@ -3643,8 +3652,8 @@ msgid "" msgstr "" "Типы баз данных, которые поддерживают аÑинхронные обновлениÑ, предоÑтавлÑÑŽÑ‚ " "лучшее отношение ÑкороÑти к возможноÑти Ð¿Ð¾Ð²Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð² Ñлучае неожиданного " -"Ð¿Ñ€ÐµÑ€Ñ‹Ð²Ð°Ð½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹. ЕÑли Ñто проиÑходит, может потребоватьÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑтить B<" -"%mandb%> Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ B<-c>, чтобы переÑоздать базы данных Ñ Ð½ÑƒÐ»Ñ." +"Ð¿Ñ€ÐµÑ€Ñ‹Ð²Ð°Ð½Ð¸Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹. ЕÑли Ñто проиÑходит, может потребоватьÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑтить " +"B<%mandb%> Ñ Ð¿Ð°Ñ€Ð°Ð¼ÐµÑ‚Ñ€Ð¾Ð¼ B<-c>, чтобы переÑоздать базы данных Ñ Ð½ÑƒÐ»Ñ." #. type: Plain text #: ../../man/man8/mandb.man8:81 @@ -3673,10 +3682,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" "По умолчанию, B<%mandb%> пытаетÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ любые ранее Ñозданные базы " "данных. ЕÑли база данных не ÑущеÑтвует, то она будет Ñоздана. Ðтот параметр " @@ -3869,14 +3878,14 @@ msgstr "" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> [\\|B<-C> I<файл>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<предупреждениÑ>\\|]\\|] [\\|B<-R> I<кодировка>\\|] [\\|" @@ -3886,42 +3895,42 @@ msgstr "" #~ "wildcard>\\|] [\\|B<--names-only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--" #~ "no-subpages>\\|] [\\|B<-P> I<пейджер>\\|] [\\|B<-r> I<приглашение>\\|] " #~ "[\\|B<-7>\\|] [\\|B<-E> I<кодировка>\\|] [\\|B<--no-hyphenation>\\|] [\\|" -#~ "B<--no-justification>\\|] [\\|B<-p> I<Ñтрока>\\|] [\\|B<-t>\\|] [\\|B<-T>" -#~ "\\|[\\|I<уÑтройÑтво>\\|]\\|] [\\|B<-H>\\|[\\|I<браузер>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<раздел>\\|] I<Ñтраница>[.\\|" -#~ "I<раздел>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" +#~ "B<--no-justification>\\|] [\\|B<-p> I<Ñтрока>\\|] [\\|B<-t>\\|] [\\|B<-" +#~ "T>\\|[\\|I<уÑтройÑтво>\\|]\\|] [\\|B<-H>\\|[\\|I<браузер>\\|]\\|] [\\|B<-" +#~ "X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<раздел>\\|] I<Ñтраница>[." +#~ "\\|I<раздел>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<ÑпиÑок>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<раздел>\\|] I<термин>\\ .\\|." +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<ÑпиÑок>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<раздел>\\|] I<термин>\\ .\\|." #~ "\\|.\\&" #~ msgid "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-l> [\\|B<-C> I<файл>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<предупреждениÑ>\\|]\\|] [\\|B<-R> I<кодировка>\\|] [\\|" #~ "B<-L> I<локаль>\\|] [\\|B<-P> I<пейджер>\\|] [\\|B<-r> I<приглашение>\\|] " -#~ "[\\|B<-7>\\|] [\\|B<-E> I<кодировка>\\|] [\\|B<-p> I<Ñтрока>\\|] [\\|B<-t>" -#~ "\\|] [\\|B<-T>\\|[\\|I<уÑтройÑтво>\\|]\\|] [\\|B<-H>\\|[\\|I<браузер>" -#~ "\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<файл> \\&.\\|.\\|." -#~ "\\&" +#~ "[\\|B<-7>\\|] [\\|B<-E> I<кодировка>\\|] [\\|B<-p> I<Ñтрока>\\|] [\\|B<-" +#~ "t>\\|] [\\|B<-T>\\|[\\|I<уÑтройÑтво>\\|]\\|] [\\|B<-H>\\|[\\|" +#~ "I<браузер>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<файл> " +#~ "\\&.\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<файл>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<Ñтраница> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<файл>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<Ñтраница> \\&.\\|.\\|.\\&" #~ msgid "" #~ "B<%man%> B<-c> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I<page> " @@ -3999,8 +4008,8 @@ msgstr "" #~ "B<%man%> will search for the desired manual pages within the I<index> " #~ "database caches. If the B<-u> option is given, a cache consistency check " #~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " +#~ "If this option is always given, it is not generally necessary to run " +#~ "B<%mandb%> after the caches are initially created, unless a cache becomes " #~ "corrupt. However, the cache consistency check can be slow on systems " #~ "with many manual pages installed, so it is not performed by default, and " #~ "system administrators may wish to run B<%mandb%> every week or so to keep " @@ -4064,8 +4073,8 @@ msgstr "" #~ msgstr "" #~ "Ðтот параметр заÑтавлÑет B<%man%> выполнÑÑ‚ÑŒ проверку целоÑтноÑти Ñвоих " #~ "кÑшей базы данных 'на уровне inode', чтобы убедитьÑÑ, что они точно " -#~ "предÑтавлÑÑŽÑ‚ данные из файловой ÑиÑтемы. Ðто работает только, еÑли B<%man" -#~ "%> уÑтановлена Ñ Ð²ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ñ‹Ð¼ setuid битом." +#~ "предÑтавлÑÑŽÑ‚ данные из файловой ÑиÑтемы. Ðто работает только, еÑли " +#~ "B<%man%> уÑтановлена Ñ Ð²ÐºÐ»ÑŽÑ‡Ñ‘Ð½Ð½Ñ‹Ð¼ setuid битом." #~ msgid "" #~ "The contents of $B<MANROFFOPT> are added to the command line every time " @@ -4143,8 +4152,8 @@ msgstr "" #~ "manpath~5 -E<gt> \"5 5 795981543 A - - format of the /etc/man_db.config " #~ "file\"\n" #~ "whatis -E<gt> \"1 1 795981543 A - - search the manual page names\"\n" -#~ "zsoelim -E<gt> \"1 1 795981543 A - - satisfy .so requests in roff input" -#~ "\"\n" +#~ "zsoelim -E<gt> \"1 1 795981543 A - - satisfy .so requests in roff " +#~ "input\"\n" #~ msgstr "" #~ "$mtime$ -E<gt> \"795987034\"\n" #~ "$version$ -E<gt> \"2.3.1\"\n" @@ -4162,15 +4171,15 @@ msgstr "" #~ "manpath~5 -E<gt> \"5 5 795981543 A - - format of the /etc/man_db.config " #~ "file\"\n" #~ "whatis -E<gt> \"1 1 795981543 A - - search the manual page names\"\n" -#~ "zsoelim -E<gt> \"1 1 795981543 A - - satisfy .so requests in roff input" -#~ "\"\n" +#~ "zsoelim -E<gt> \"1 1 795981543 A - - satisfy .so requests in roff " +#~ "input\"\n" #~ msgid "" #~ "If you want to override B<%man%>'s prompt string processing completely, " #~ "use the $B<MANLESS> environment variable described below." #~ msgstr "" -#~ "ЕÑли вы хотите полноÑтью заменить Ñтроку приглашениÑ, передаваемую B<%man" -#~ "%>, иÑпользуйте переменную Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ $B<MANLESS>, опиÑанную ниже." +#~ "ЕÑли вы хотите полноÑтью заменить Ñтроку приглашениÑ, передаваемую " +#~ "B<%man%>, иÑпользуйте переменную Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ $B<MANLESS>, опиÑанную ниже." #~ msgid "1" #~ msgstr "1" @@ -4245,15 +4254,15 @@ msgstr "" #~ msgstr "x\n" #~ msgid "" -#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis" -#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), " -#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), " -#~ "the man-db package manual, B<FSSTND>." +#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), " +#~ "B<%whatis%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), " +#~ "B<groff>(1), B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), " +#~ "B<latin1>(7), the man-db package manual, B<FSSTND>." #~ msgstr "" -#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), B<%whatis" -#~ "%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), B<groff>(1), " -#~ "B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), B<latin1>(7), " -#~ "Ñправочные Ñтраницы по пакету man-db, B<FSSTND>." +#~ "B<%mandb%>(8), B<%manpath%>(1), B<manpath>(5), B<%apropos%>(1), " +#~ "B<%whatis%>(1), B<%catman%>(8), B<less>(1), B<nroff>(1), B<troff>(1), " +#~ "B<groff>(1), B<%zsoelim%>(1), B<setlocale>(3), B<man>(7), B<ascii>(7), " +#~ "B<latin1>(7), Ñправочные Ñтраницы по пакету man-db, B<FSSTND>." #~ msgid "B<-s> I<section>, B<--section> I<section>" #~ msgstr "B<-s> I<раздел>, B<--section> I<раздел>" diff --git a/man/po4a/po/sr.po b/man/po4a/po/sr.po index 98d769c5..5372a41a 100644 --- a/man/po4a/po/sr.po +++ b/man/po4a/po/sr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-manpages 2.10.0-pre1\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: 2022-02-18 20:31+0200\n" "Last-Translator: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" @@ -3299,11 +3299,16 @@ msgstr "B<КÐТ_ШИРИÐÐ>I<\\ ширина>" #. type: Plain text #: ../../man/man5/manpath.man5:235 +#, fuzzy +#| msgid "" +#| "If I<width> is non-zero, cat pages will always be formatted for a " +#| "terminal of the given width, regardless of the width of the terminal " +#| "actually being used. This should generally be within the range set by " +#| "B<MINCATWIDTH> and B<MAXCATWIDTH>." msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "Ðко I<ширина> није нула, кат Ñтранице ће увек бити обликоване за терминал " "дате ширине, без обзира на ширину терминала која Ñе заправо кориÑти. Ово " diff --git a/man/po4a/po/sv.po b/man/po4a/po/sv.po index 50fee684..3f1734e7 100644 --- a/man/po4a/po/sv.po +++ b/man/po4a/po/sv.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-manpages-2.9.0-pre1\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" "PO-Revision-Date: 2019-12-25 14:57+0800\n" "Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" @@ -60,8 +60,9 @@ msgstr "SYNOPSIS" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" "s> I<lista>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " @@ -118,9 +119,10 @@ msgid "" "Depending on your installation, this may be run by a periodic cron job, or " "may need to be run manually after new manual pages have been installed." msgstr "" -"Databasen som genomsöks av B<%apropos%> uppdateras av programmet B<%mandb" -"%>. Beroende pÃ¥ din installation kan detta köras som ett periodiskt cron-" -"jobb eller mÃ¥ste köras manuellt efter att nya manualsidor har installerats." +"Databasen som genomsöks av B<%apropos%> uppdateras av programmet " +"B<%mandb%>. Beroende pÃ¥ din installation kan detta köras som ett periodiskt " +"cron-jobb eller mÃ¥ste köras manuellt efter att nya manualsidor har " +"installerats." #. type: SH #: ../../man/man1/apropos.man1:61 ../../man/man1/lexgrog.man1:45 @@ -441,9 +443,9 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" "Om $B<POSIXLY_CORRECT> är satt, även till ett null-värde, kommer " "standardsökningen för B<%apropos%> att göras som ett utökat reguljärt " @@ -513,11 +515,11 @@ msgstr "lexgrog - tolka rubrikhuvud i manualsidor" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<kodning>" -"\\|] I<fil> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<kodning>\\|] I<fil> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/lexgrog.man1:36 @@ -539,11 +541,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" "Om inmatningen är dÃ¥ligt formaterad kommer B<lexgrog> att skriva ut " "\\(lqtolkning misslyckades\\(rq; detta kan vara användbart för externa " @@ -685,13 +687,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" -"Vissa manualsidor kräver att \\(oq\\e-\\(cq anges exakt som visats; B<%mandb" -"%> är mer tolerant, men för kompatibilitet med andra system är det trots " -"detta en bra idé att behÃ¥lla bakstrecket." +"Vissa manualsidor kräver att \\(oq\\e-\\(cq anges exakt som visats; " +"B<%mandb%> är mer tolerant, men för kompatibilitet med andra system är det " +"trots detta en bra idé att behÃ¥lla bakstrecket." #. type: Plain text #: ../../man/man1/lexgrog.man1:158 @@ -758,11 +760,11 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "Det finns flera anledningar till varför whatis-tolkning misslyckas. Ibland " "ersätter upphovsmännen till manualsidorna \\(oq.SH NAMN\\(cq med \\(oq.SH " @@ -857,13 +859,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:88 msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "B<%man%> är systemets sidvisare för manualen. Varje I<sid>-argument som " @@ -1180,8 +1182,8 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "Genomsök de korta beskrivningarna och namnen pÃ¥ manualsidorna efter " "nyckelordet I<printf> som ett reguljärt uttryck. Skriv ut allt som " @@ -1234,8 +1236,8 @@ msgid "" "will allow %man% to \"forget\" about the options specified in $B<MANOPT>, " "although they must still have been valid." msgstr "" -"Om satta kommer diverse miljövariabler att studeras för att bestämma hur B<" -"%man%> ska fungera. Det är möjligt att sätta den övergripande variabeln " +"Om satta kommer diverse miljövariabler att studeras för att bestämma hur " +"B<%man%> ska fungera. Det är möjligt att sätta den övergripande variabeln " "$B<MANOPT> till vilken sträng som helst i kommandoradsformat förutom att de " "blanksteg som används som del av en flaggas argument mÃ¥ste markeras (föregÃ¥s " "av ett bakstreck). B<%man%> kommer att tolka $B<MANOPT> före att det tolkar " @@ -1336,8 +1338,8 @@ msgstr "STANDARDVÄRDEN" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" "Ordningen av avsnitten som ska genomsökas kan Ã¥sidosättas via miljövariabeln " "$B<MANSECT> eller av direktivet B<SECTION> i I<%manpath_config_file%>. Som " @@ -1431,13 +1433,13 @@ msgstr "Allmänna flaggor" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" -"Denna flagga anges normalt som den allra första flaggan och Ã¥terställer B<" -"%man%>:s beteende till standardinställningarna. Den används för att " +"Denna flagga anges normalt som den allra första flaggan och Ã¥terställer " +"B<%man%>:s beteende till standardinställningarna. Den används för att " "Ã¥terställa de flaggor som kan ha satts i $B<MANOPT>. Flaggor som följer B<-" "D> kommer att ha sin vanliga effekt." @@ -1574,8 +1576,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" "Denna flagga är inte avsedd för allmänt bruk och bör bara användas av " "programmet B<%catman%>." @@ -1714,9 +1716,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" "Vissa system införlivar stora paket med manualsidor, sÃ¥ som de som följer " "med paketet B<Tcl>, i huvudhierarkin för manualsidor. För att komma runt " @@ -1848,11 +1850,11 @@ msgid "" "overrides the $B<PAGER> environment variable. It is not used in conjunction " "with B<-f> or B<-k>." msgstr "" -"Ange vilken utmatningssidvisare som ska användas. Som standard använder B<" -"%man%> B<%pager%>, om B<%pager%> inte finns eller är körbar används B<%cat" -"%>. Denna flagga Ã¥sidosätter miljövariabeln $B<MANPAGER>, vilken i sin tur " -"Ã¥sidosätter miljövariabeln $B<PAGER>. Den används inte i samband med B<-f> " -"eller B<-k>." +"Ange vilken utmatningssidvisare som ska användas. Som standard använder " +"B<%man%> B<%pager%>, om B<%pager%> inte finns eller är körbar används " +"B<%cat%>. Denna flagga Ã¥sidosätter miljövariabeln $B<MANPAGER>, vilken i " +"sin tur Ã¥sidosätter miljövariabeln $B<PAGER>. Den används inte i samband " +"med B<-f> eller B<-k>." #. type: Plain text #: ../../man/man1/man.man1:763 ../../man/man1/man.man1:1132 @@ -2112,8 +2114,8 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "Om du skriver en manualsida och helt enkelt vill förhindra B<nroff> frÃ¥n att " @@ -2298,13 +2300,13 @@ msgstr "" msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "Om $B<MANPAGER> eller $B<PAGER> är satt ($B<MANPAGER> används i första hand) " "sÃ¥ kommer dess värde att användas som namnet pÃ¥ det program som används för " -"att visa manualsidan. Som standard kommer B<%pager%> att användas, om B<" -"%pager%> inte hittas eller är körbar används B<%cat%>." +"att visa manualsidan. Som standard kommer B<%pager%> att användas, om " +"B<%pager%> inte hittas eller är körbar används B<%cat%>." #. type: Plain text #: ../../man/man1/man.man1:1151 @@ -2313,8 +2315,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "Om $B<MANLESS> är satt kommer dess värde att användas som " "standardpromptsträngen för sidvisaren B<less>, som om den hade angetts via " @@ -2330,8 +2332,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "Om $B<BROWSER> är satt är dess värde en kolonavgränsad lista av kommandon, " "som vart och ett kommer att användas för att försöka starta en webbläsare Ã¥t " @@ -2426,8 +2428,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" @@ -2435,8 +2437,8 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "Beroende pÃ¥ system och implementation kommer endera eller bÃ¥da av $B<LANG> " @@ -2547,8 +2549,8 @@ msgstr "" "när man permanent omkodar sidor skrivna i förÃ¥ldrade teckenuppsättningar " "eller i byggsystem som mÃ¥ste koda om en uppsättning sidor till en gemensam " "kodning (vanligtvis UTF-8) för installation. När man konverterar mÃ¥nga sidor " -"är detta programmet mycket snabbare än att köra B<%man% --recode> eller B<" -"%manconv%> för varje sida." +"är detta programmet mycket snabbare än att köra B<%man% --recode> eller " +"B<%manconv%> för varje sida." #. type: Plain text #: ../../man/man1/man-recode.man1:36 @@ -2753,9 +2755,9 @@ msgid "" "include NewOS's manual page hierarchies use the option B<-m> B<NewOS>." msgstr "" "Om detta system har tillgÃ¥ng till andra operativsystems hierarkier av " -"manualsidor kan denna flagga användas för inkludera dem i utmatningen frÃ¥n B<" -"%manpath%>. För att inkludera hierarkierna av manualsidor för NyttOS använd " -"flaggan B<-m> B<NyttOS>." +"manualsidor kan denna flagga användas för inkludera dem i utmatningen frÃ¥n " +"B<%manpath%>. För att inkludera hierarkierna av manualsidor för NyttOS " +"använd flaggan B<-m> B<NyttOS>." #. type: Plain text #: ../../man/man1/manpath.man1:74 @@ -2786,13 +2788,15 @@ msgstr "%whatis% - visa en-rads-beskrivningar för manualsidor" #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<lista>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<sökväg>\\|] " -"[\\|B<-L> I<lokal>\\|] [\\|B<-C> I<fil>\\|] I<namn> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<lista>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<sökväg>\\|] [\\|B<-L> I<lokal>\\|] [\\|B<-C> I<fil>\\|] I<namn> \\&.\\|." +"\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -2820,14 +2824,14 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" msgstr "" -"B<index>-databaser används under sökningen och uppdateras av programmet B<" -"%mandb%>. Beroende pÃ¥ din installation kan detta köras som ett periodiskt " +"B<index>-databaser används under sökningen och uppdateras av programmet " +"B<%mandb%>. Beroende pÃ¥ din installation kan detta köras som ett periodiskt " "cron-jobb eller behöva köras manuellt efter att nya manualsidor har " "installerats. För att producera en B<whatis>-textdatabas av gammalt snitt " "frÃ¥n den relativa B<index>-databasen, använd kommandot:" @@ -2851,8 +2855,8 @@ msgid "" "to be somewhat slower due to the nature of database searches." msgstr "" "Tolka varje I<namn> som ett reguljärt uttryck. Om ett I<namn> matchar nÃ¥gon " -"del av ett sidnamn kommer ett matchning att lyckas. Denna flagga fÃ¥r B<" -"%whatis%> att bli nÃ¥got lÃ¥ngsammare pÃ¥ grund av databassökningarna." +"del av ett sidnamn kommer ett matchning att lyckas. Denna flagga fÃ¥r " +"B<%whatis%> att bli nÃ¥got lÃ¥ngsammare pÃ¥ grund av databassökningarna." #. type: Plain text #: ../../man/man1/whatis.man1:100 @@ -3314,11 +3318,16 @@ msgstr "B<CATWIDTH>I<\\ bredd>" #. type: Plain text #: ../../man/man5/manpath.man5:235 +#, fuzzy +#| msgid "" +#| "If I<width> is non-zero, cat pages will always be formatted for a " +#| "terminal of the given width, regardless of the width of the terminal " +#| "actually being used. This should generally be within the range set by " +#| "B<MINCATWIDTH> and B<MAXCATWIDTH>." msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "Om I<bredd> inte är noll kommer cat-sidor alltid att formateras för en " "terminal av en angivna bredden, oavsett bredden pÃ¥ terminalen som faktiskt " @@ -3626,10 +3635,10 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" "Som standard kommer B<%mandb%> att försöka uppdatera tidigare skapade " "databaser. Om en databas inte existerar kommer den att skapas. Denna " @@ -3819,20 +3828,20 @@ msgstr "" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> [\\|B<-C> I<fil>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<varningar>\\|]\\|] [\\|B<-R> I<kodning>\\|] [\\|B<-L> " #~ "I<lokal>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#~ "I<sökväg>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-e> I<ändelse>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "I<sökväg>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-e> I<ändelse>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" #~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " #~ "I<sidvisare>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " #~ "I<kodning>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " @@ -3842,35 +3851,35 @@ msgstr "" #~ "\\|]\\ .\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<avsnitt>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<lista>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<avsnitt>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgid "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-l> [\\|B<-C> I<fil>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<varningar>\\|]\\|] [\\|B<-R> I<kodning>\\|] [\\|B<-L> " -#~ "I<lokal>\\|] [\\|B<-P> I<sidvisare>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<kodning>\\|] [\\|B<-p> I<sträng>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<enhet>\\|]\\|] [\\|B<-H>\\|[\\|I<webbläsare>\\|]\\|] [\\|B<-" -#~ "X>\\|[\\|I<ppt>\\|]\\|] [\\|B<-Z>\\|] I<fil> \\&.\\|.\\|.\\&" +#~ "I<lokal>\\|] [\\|B<-P> I<sidvisare>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<kodning>\\|] [\\|B<-p> I<sträng>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<enhet>\\|]\\|] [\\|B<-H>\\|[\\|I<webbläsare>\\|]\\|] " +#~ "[\\|B<-X>\\|[\\|I<ppt>\\|]\\|] [\\|B<-Z>\\|] I<fil> \\&.\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<fil>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<sida> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<fil>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<sida> \\&.\\|.\\|.\\&" #~ msgid "" #~ "B<%man%> B<-c> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I<page> " @@ -3914,8 +3923,8 @@ msgstr "" #~ "Om B<%man%> inte kan hitta en B<%mandb%>-initierad B<index>-databas för " #~ "en viss hierarki av manualsidor kommer det fortfarande att leta efter de " #~ "begärda manualsidorna, även om filskalmönster (â€globbingâ€) kommer att " -#~ "vara nödvändigt för att leta inom den hierarkin. Om B<%whatis%> eller B<" -#~ "%apropos%> misslyckas med att hitta ett B<index> kommer de att försöka " +#~ "vara nödvändigt för att leta inom den hierarkin. Om B<%whatis%> eller " +#~ "B<%apropos%> misslyckas med att hitta ett B<index> kommer de att försöka " #~ "extrahera information frÃ¥n en traditionell I<whatis>-databas istället." #~ msgid "" @@ -3948,8 +3957,8 @@ msgstr "" #~ "B<%man%> will search for the desired manual pages within the I<index> " #~ "database caches. If the B<-u> option is given, a cache consistency check " #~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " +#~ "If this option is always given, it is not generally necessary to run " +#~ "B<%mandb%> after the caches are initially created, unless a cache becomes " #~ "corrupt. However, the cache consistency check can be slow on systems " #~ "with many manual pages installed, so it is not performed by default, and " #~ "system administrators may wish to run B<%mandb%> every week or so to keep " diff --git a/man/po4a/po/tr.po b/man/po4a/po/tr.po index 38eb4018..26f053ef 100644 --- a/man/po4a/po/tr.po +++ b/man/po4a/po/tr.po @@ -3,13 +3,15 @@ # This file is distributed under the same license as the man-db package. # # Volkan Gezer <volkangezer@gmail.com>, 2017. +# Emir SARI <emir_sari@icloud.com>, 2022. +# msgid "" msgstr "" -"Project-Id-Version: man-db-manpages 2.7.6.1\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" -"PO-Revision-Date: 2017-06-28 21:18+0000\n" -"Last-Translator: Mesutcan <mesutcank@gmail.com>\n" -"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" +"Project-Id-Version: man-db-manpages-2.11.0-pre1\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" +"PO-Revision-Date: 2022-10-05 12:00+0300\n" +"Last-Translator: Emir SARI <emir_sari@icloud.com>\n" +"Language-Team: Turkish <gnome-turk@gnome.org>\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,12 +41,12 @@ msgstr "Kılavuz sayfası yardımcıları" #: ../../man/man8/catman.man8:13 ../../man/man8/mandb.man8:15 #, no-wrap msgid "NAME" -msgstr "Ä°SÄ°M" +msgstr "AD" #. type: Plain text #: ../../man/man1/apropos.man1:15 msgid "%apropos% - search the manual page names and descriptions" -msgstr "%apropos% - kılavuz sayfası isimleri ve açıklamalarında ara" +msgstr "%apropos% - kılavuz sayfası adları ve açıklamalarında ara" #. type: SH #: ../../man/man1/apropos.man1:15 ../../man/man1/lexgrog.man1:12 @@ -61,13 +63,14 @@ msgstr "ÖZET" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<sistem>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<yol>" -"\\|] [\\|B<-L> I<dil>\\|] [\\|B<-C> I<dosya>\\|] I<anahtarsözcük> \\&.\\|." -"\\|." +"s> I<liste>\\|] [\\|B<-m> I<sistem>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<yol>\\|] [\\|B<-L> I<dil>\\|] [\\|B<-C> I<dosya>\\|] I<anahtarsözcük> \\&." +"\\|.\\|." #. type: SH #: ../../man/man1/apropos.man1:32 ../../man/man1/lexgrog.man1:20 @@ -98,7 +101,7 @@ msgid "" "special characters to stop the shell from interpreting them." msgstr "" "I<anahtarsözcük>, (B<-r>) kullanımındaki gibi genellikle bir düzenli " -"ifadedir veya özel karakterler içerebilir (B<-w>) ya da tam anahtar sözlüğü " +"ifadedir veya özel karakterler içerebilir (B<-w>) veya tam anahtar sözlüğü " "eÅŸleyebilir (B<-e>). Bu seçenekleri kullanarak, I<anahtarsözcük> anahtar " "sözcüğünü tırnak içine almak veya özel karakterlerde kaçış kullanmak (\\e), " "kabuÄŸun bunları yorumlamasını önlemek için gerekli olabilir." @@ -109,7 +112,7 @@ msgid "" "The standard matching rules allow matches to be made against the page name " "and word boundaries in the description." msgstr "" -"Standart eÅŸleÅŸme kuralları, açıklama içindeki sayfa adı ve kelime " +"Standart eÅŸleÅŸme kuralları, açıklama içindeki sayfa adı ve sözcük " "sınırlarına karşı yapılacak eÅŸleÅŸmelere izin verir." #. type: Plain text @@ -157,10 +160,10 @@ msgid "" "descriptions independently. It can match any part of either. The match is " "not limited to word boundaries." msgstr "" -"Her bir anahtar kelimeyi düzenli bir ifade olarak yorumlayın. Varsayılan " -"davranış budur. Her bir anahtar kelime sayfa adlarına ve açıklamalara " -"bağımsız olarak eÅŸleÅŸtirilir. Ya herhangi bir kısmıyla eÅŸleÅŸebilir. " -"EÅŸleÅŸme kelime sınırlarıyla sınırlı deÄŸildir." +"Her bir anahtar sözcüğü düzenli bir ifade olarak yorumlayın. Öntanımlı " +"davranış budur. Her bir anahtar sözcük sayfa adlarına ve açıklamalara " +"bağımsız olarak eÅŸleÅŸtirilir. Herhangi bir kısmıyla eÅŸleÅŸebilir. EÅŸleÅŸme " +"sözcük sınırlarıyla sınırlı deÄŸildir." #. type: Plain text #: ../../man/man1/apropos.man1:88 @@ -171,12 +174,12 @@ msgid "" "expanded keyword matches an entire description or page name. Otherwise the " "keyword is also allowed to match on word boundaries in the description." msgstr "" -"Her bir anahtar kelimeyi kabuk stili joker karakterleri içeren bir desen " -"olarak yorumlayın. Her bir anahtar kelime sayfa adlarına ve açıklamalara " -"bağımsız olarak eÅŸleÅŸtirilir. B<--exact> de kullanılırsa, yalnızca geniÅŸ " -"bir anahtar kelime tüm bir açıklama veya sayfa adıyla eÅŸleÅŸiyorsa bir " -"eÅŸleÅŸme bulunacaktır. Aksi halde, anahtar kelimenin açıklamadaki kelime " -"sınırlarıyla eÅŸleÅŸmesine izin verilir." +"Her bir anahtar sözcüğü kabuk stili joker karakterleri içeren bir dizgi " +"olarak yorumlayın. Her bir anahtar sözcük sayfa adlarına ve açıklamalara " +"bağımsız olarak eÅŸleÅŸtirilir. B<--exact> de kullanılırsa yalnızca geniÅŸ bir " +"anahtar sözcük tüm bir açıklama veya sayfa adıyla eÅŸleÅŸiyorsa bir eÅŸleÅŸme " +"bulunacaktır. Aksi halde, anahtar sözcüğün açıklamadaki sözcük sınırlarıyla " +"eÅŸleÅŸmesine izin verilir." #. type: Plain text #: ../../man/man1/apropos.man1:92 @@ -184,7 +187,7 @@ msgid "" "Each keyword will be exactly matched against the page names and the " "descriptions." msgstr "" -"Her bir anahtar kelime, sayfa adlarına ve açıklamalara karşı tam olarak " +"Her bir anahtar sözcük, sayfa adlarına ve açıklamalara karşı tam olarak " "eÅŸleÅŸtirilir." #. type: Plain text @@ -193,8 +196,8 @@ msgid "" "Only display items that match all the supplied keywords. The default is to " "display items that match any keyword." msgstr "" -"Yalnızca saÄŸlanan tüm anahtar kelimelerle eÅŸleÅŸen öğeleri görüntüleyin. " -"Varsayılan, herhangi bir anahtar kelimeyle eÅŸleÅŸen öğeleri görüntülemektir." +"Yalnızca saÄŸlanan tüm anahtar sözcüklerle eÅŸleÅŸen ögeleri görüntüleyin. " +"Öntanımlı, herhangi bir anahtar sözcükle eÅŸleÅŸen ögeleri görüntülemektir." #. type: Plain text #: ../../man/man1/apropos.man1:103 ../../man/man1/whatis.man1:107 @@ -203,16 +206,14 @@ msgid "" "truncated to the terminal width to avoid ugly results from poorly-written " "B<NAME> sections." msgstr "" -"Çıktıyı terminal geniÅŸliÄŸine kırpmayın. Normalde, çıktı, kötü yazılmış " -"B<NAME> bölümlerinden çirkin sonuçlardan kaçınmak için terminal geniÅŸliÄŸine " -"kesilir." +"Çıktıyı uçbirim geniÅŸliÄŸine kırpma. Normalde çıktı, kötü yazılmış B<AD> " +"bölümlerinden çirkin sonuçlardan kaçınmak için uçbirim geniÅŸliÄŸine kesilir." #. type: TP #: ../../man/man1/apropos.man1:103 ../../man/man1/whatis.man1:107 -#, fuzzy, no-wrap -#| msgid "B<-s> I<list>, B<--sections> I<list>, B<--section> I<list>" +#, no-wrap msgid "B<-s> I<list\\/>, B<--sections=>I<list\\/>, B<--section=>I<list>" -msgstr "B<-s> I<liste>, B<--sections> I<liste>, B<--section> I<liste>" +msgstr "B<-s> I<liste\\/>, B<--sections=>I<liste\\/>, B<--section=>I<liste>" # #. type: Plain text @@ -225,35 +226,30 @@ msgid "" "has an extension, for example \"3perl\", then the list will only include " "pages in that exact part of the manual section." msgstr "" -"Yalnızca verilen klavuz bölümlerinde arama yapın. I<list>, bölümlerin " -"virgül veya virgül ile ayrılmış bir listesidir. I<list> içindeki bir girdi, " -"örneÄŸin \"3\" gibi basit bir bölümse, görüntülenen açıklamalar listesinde " -"\"3\", \"3perl\", \"3x\" ve benzeri bölümlerdeki sayfalar bulunur; I<list> " -"içindeki bir girdi, örneÄŸin \"3perl\" gibi bir uzantıya sahipse, liste el " -"kitabının tam kısmında yalnızca sayfaları içerecektir." +"Yalnızca verilen klavuz bölümlerinde arama yapın. I<liste>, bölümlerin " +"virgül veya virgül ile ayrılmış bir listesidir. I<liste> içindeki bir " +"girdi, örneÄŸin \"3\" gibi basit bir bölümse görüntülenen açıklamalar " +"listesinde \"3\", \"3perl\", \"3x\" ve benzeri bölümlerdeki sayfalar " +"bulunur; I<liste> içindeki bir girdi, örneÄŸin \"3perl\" gibi bir uzantıya " +"sahipse liste el kitabının tam kısmında yalnızca sayfaları içerecektir." #. type: TP #: ../../man/man1/apropos.man1:118 ../../man/man1/man.man1:562 #: ../../man/man1/manpath.man1:54 ../../man/man1/whatis.man1:122 #, no-wrap msgid "B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|, B<--systems=>I<system>\\|[\\|,.\\|.\\|.\\|]" -msgstr "B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|, B<--systems=>I<system>\\|[\\|,.\\|.\\|.\\|]" +msgstr "B<-m> I<sistem>\\|[\\|,.\\|.\\|.\\|]\\|, B<--systems=>I<sistem>\\|[\\|,.\\|.\\|.\\|]" #. type: Plain text #: ../../man/man1/apropos.man1:126 -#, fuzzy -#| msgid "" -#| "If this system has access to other operating system's manual page " -#| "descriptions, they can be searched using this option. To search NewOS's " -#| "manual page descriptions, use the option B<-m> B<NewOS>." msgid "" "If this system has access to other operating systems' manual page " "descriptions, they can be searched using this option. To search NewOS's " "manual page descriptions, use the option B<-m> B<NewOS>." msgstr "" -"Bu sistemin diÄŸer iÅŸletim sisteminin kılavuz sayfa tanımlarına eriÅŸimi " -"varsa, bu seçenek kullanılarak aranabilir. NewOS'un manuel sayfa " -"açıklamalarını aramak için B<-m>B<NewOS> seçeneÄŸini kullanın." +"Bu sistemin diÄŸer iÅŸletim sisteminin kılavuz sayfa tanımlarına eriÅŸimi varsa " +"bu seçenek kullanılarak aranabilir. NewOS'un kılavuz sayfa açıklamalarını " +"aramak için B<-m> B<NewOS> seçeneÄŸini kullanın." #. type: Plain text #: ../../man/man1/apropos.man1:138 @@ -263,7 +259,7 @@ msgid "" "B<whatis> descriptions, include the system name B<man> in the argument " "string. This option will override the $B<SYSTEM> environment variable." msgstr "" -"Belirtilen I<system>, virgülle ayrılmış iÅŸletim sistemi adlarının birleÅŸimi " +"Belirtilen I<sistem>, virgülle ayrılmış iÅŸletim sistemi adlarının birleÅŸimi " "olabilir. Yerel iÅŸletim sisteminin B<whatis> açıklamalarını aramak için, " "argüman dizgesine B<man> sistem adını ekleyin. Bu seçenek, $B<SYSTEM> çevre " "deÄŸiÅŸkenini geçersiz kılacaktır." @@ -273,7 +269,7 @@ msgstr "" #: ../../man/man1/whatis.man1:142 ../../man/man8/catman.man8:59 #, no-wrap msgid "B<-M\\ >I<path>,\\ B<--manpath=>I<path>" -msgstr "B<-M\\ >I<path>,\\ B<--manpath=>I<path>" +msgstr "B<-M\\ >I<yol>,\\ B<--manpath=>I<yol>" #. type: Plain text #: ../../man/man1/apropos.man1:152 ../../man/man1/whatis.man1:156 @@ -285,8 +281,8 @@ msgid "" "the contents of $B<MANPATH>." msgstr "" "Aranacak ÅŸekilde iki nokta üst üstü ile ayrılmış kılavuz sayfa hiyerarÅŸileri " -"dizisi belirtin. Varsayılan olarak, B<%program%>, boÅŸ veya ayarlanmamışsa, " -"$B<MANPATH> ortam deÄŸiÅŸkenini kullanır; bu durumda, $B<PATH> ortam " +"dizisi belirtin. Öntanımlı olarak, B<%program%>, boÅŸ veya ayarlanmamışsa " +"$B<MANPATH> çevre deÄŸiÅŸkenini kullanır; bu durumda, $B<PATH> çevre " "deÄŸiÅŸkeninize dayalı uygun bir kılavuz yolu belirleyecektir. Bu seçenek, " "$B<MANPATH> içeriÄŸini geçersiz kılar." @@ -295,7 +291,7 @@ msgstr "" #: ../../man/man1/whatis.man1:156 #, no-wrap msgid "B<-L\\ >I<locale>,\\ B<--locale=>I<locale>" -msgstr "B<-L\\ >I<locale>,\\ B<--locale=>I<locale>" +msgstr "B<-L\\ >I<yerel>,\\ B<--locale=>I<yerel>" #. type: Plain text #: ../../man/man1/apropos.man1:169 ../../man/man1/man.man1:562 @@ -310,12 +306,12 @@ msgid "" "displayed in the initially determined locale." msgstr "" "B<%program%> normalde mevcut yerel ayarınızı, muhtemelen $B<LC_MESSAGES> ve " -"$B<LANG> öğelerini de içeren çeÅŸitli ortam deÄŸiÅŸkenlerini sorgulayan C " +"$B<LANG> ögelerini de içeren çeÅŸitli çevre deÄŸiÅŸkenlerini sorgulayan C " "iÅŸlevi B<setlocale> (3) çaÄŸrısı ile belirleyecektir. Belirlenen deÄŸeri " -"geçici olarak geçersiz kılmak için doÄŸrudan bir I<locale> dizesini B<%program" -"%> 'a sunmak için bu seçeneÄŸi kullanın. Sayfalar için arama gerçekten " -"baÅŸlayıncaya kadar etkili olmayacağını unutmayın. Yardım mesajı gibi çıktı " -"her zaman baÅŸlangıçta belirlenen yerel ayraçta görüntülenir." +"geçici olarak geçersiz kılmak için doÄŸrudan bir I<locale> dizesini " +"B<%program%> 'a sunmak için bu seçeneÄŸi kullanın. Sayfalar için arama " +"gerçekten baÅŸlayıncaya kadar etkili olmayacağını unutmayın. Yardım iletisi " +"gibi çıktı her zaman baÅŸlangıçta belirlenen yerel ayraçta görüntülenir." #. type: TP #: ../../man/man1/apropos.man1:169 ../../man/man1/man.man1:413 @@ -323,7 +319,7 @@ msgstr "" #: ../../man/man8/catman.man8:64 ../../man/man8/mandb.man8:125 #, no-wrap msgid "B<-C\\ >I<file>,\\ B<--config-file=>I<file>" -msgstr "B<-C\\ >I<file>,\\ B<--config-file=>I<file>" +msgstr "B<-C\\ >I<dosya>,\\ B<--config-file=>I<dosya>" #. type: Plain text #: ../../man/man1/apropos.man1:173 ../../man/man1/man.man1:417 @@ -332,7 +328,7 @@ msgstr "B<-C\\ >I<file>,\\ B<--config-file=>I<file>" msgid "" "Use this user configuration file rather than the default of I<~/.manpath>." msgstr "" -"I<~/.manpath> varsayılanı yerine bu kullanıcı yapılandırma dosyasını " +"I<~/.manpath> öntanımlısı yerine bu kullanıcı yapılandırma dosyasını " "kullanın." #. type: Plain text @@ -380,7 +376,7 @@ msgstr "BaÅŸarılı program çalıştırma." #: ../../man/man1/apropos.man1:189 ../../man/man1/man.man1:1055 #: ../../man/man1/whatis.man1:193 msgid "Usage, syntax or configuration file error." -msgstr "Kullanım, sözdizimi ve yapılandırma dosya hatası." +msgstr "Kullanım, sözdizim ve yapılandırma dosya hatası." #. type: Plain text #: ../../man/man1/apropos.man1:192 ../../man/man1/man.man1:1058 @@ -399,7 +395,7 @@ msgstr "Belirtilen kriterle eÅŸleÅŸen hiçbir ÅŸey bulunamadı." #: ../../man/man8/catman.man8:77 #, no-wrap msgid "ENVIRONMENT" -msgstr "ORTAM" +msgstr "ÇEVRE" #. type: Plain text #: ../../man/man1/apropos.man1:204 ../../man/man1/man.man1:1175 @@ -408,7 +404,7 @@ msgid "" "If $B<SYSTEM> is set, it will have the same effect as if it had been " "specified as the argument to the B<-m> option." msgstr "" -"$B<SÄ°STEM> ayarlanmışsa, B<-m> seçeneÄŸine argüman olarak belirtilmişçesine " +"$B<SYSTEM> ayarlanmışsa B<-m> seçeneÄŸine argüman olarak belirtilmişçesine " "aynı etkiyi verecektir." #. type: Plain text @@ -418,8 +414,8 @@ msgid "" "If $B<MANPATH> is set, its value is interpreted as the colon-delimited " "manual page hierarchy search path to use." msgstr "" -"$B<MANYOLU> ayarlanmışsa, deÄŸeri, iki nokta üstüste ile ayrılmış " -"kullanılacak kılavuz sayfa arama yolu olarak yorumlanır." +"$B<MANPATH> ayarlanmışsa deÄŸeri iki nokta ile ayrılmış kullanılacak kılavuz " +"sayfa arama yolu olarak yorumlanır." #. type: Plain text #: ../../man/man1/apropos.man1:217 ../../man/man1/man.man1:1078 @@ -429,36 +425,32 @@ msgid "" "See the B<SEARCH PATH> section of B<manpath>(5) for the default behaviour " "and details of how this environment variable is handled." msgstr "" +"Bu çevre deÄŸiÅŸkeninin nice iÅŸlendiÄŸinin ayrıntılarına ve öntanımlı " +"davranışına bakmak için B<manpath>(5)'in B<SEARCH PATH> bölümüne bakın." #. type: Plain text #: ../../man/man1/apropos.man1:229 ../../man/man1/whatis.man1:233 -#, fuzzy -#| msgid "" -#| "If $B<MANWIDTH> is set, its value is used as the terminal width (see the " -#| "B<--long> option). If it is not set, the terminal width will be " -#| "calculated using the value of $B<COLUMNS>, an B<ioctl>(2) if available, " -#| "or falling back to 80 characters if all else fails." msgid "" "If $B<MANWIDTH> is set, its value is used as the terminal width (see the B<--" "long> option). If it is not set, the terminal width will be calculated " "using the value of $B<COLUMNS>, and B<ioctl>(2) if available, or falling " "back to 80 characters if all else fails." msgstr "" -"$B<MANWIDTH> ayarlanmışsa, deÄŸeri terminal geniÅŸliÄŸi olarak kullanılır (bkz. " -"B<--long> seçeneÄŸi). Belirlenmezse, terminal geniÅŸliÄŸi $B<COLUMNS> " -"deÄŸerini, varsa bir B<ioctl> (2) deÄŸerini kullanarak veya baÅŸka herhangi " -"bir ÅŸey baÅŸarısız olursa 80 karaktere geri düşerek hesaplanır." +"$B<MANWIDTH> ayarlanmışsa deÄŸeri uçbirim geniÅŸliÄŸi olarak kullanılır (bkz. " +"B<--long> seçeneÄŸi). BelirlenmemiÅŸse uçbirim geniÅŸliÄŸi $B<COLUMNS> ve " +"B<ioctl> (2) deÄŸerini kullanarak veya baÅŸka herhangi bir ÅŸey baÅŸarısız " +"olursa 80 karaktere geri düşerek hesaplanır." #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" -"$B<POSIXLY_CORRECT>, boÅŸ bir deÄŸere bile ayarlanmışsa, varsayılan B<%apropos" -"%> araması, geniÅŸletilmiÅŸ bir normal ifade (B<-r>) olacaktır. Günümüzde " -"varsayılan davranış budur." +"$B<POSIXLY_CORRECT>, boÅŸ bir deÄŸere bile ayarlanmışsa öntanımlı B<%apropos%> " +"araması, geniÅŸletilmiÅŸ bir normal ifade (B<-r>) olacaktır. Günümüzde " +"öntanımlı davranış budur." #. type: SH #: ../../man/man1/apropos.man1:238 ../../man/man1/man.man1:1260 @@ -472,13 +464,13 @@ msgstr "DOSYALAR" #: ../../man/man1/apropos.man1:244 ../../man/man1/whatis.man1:239 #: ../../man/man8/catman.man8:110 ../../man/man8/mandb.man8:201 msgid "A traditional global I<index> database cache." -msgstr "Geleneksel bir evrensel I<index> veritabanı önbelleÄŸi." +msgstr "Geleneksel bir global I<indeks> veritabanı önbelleÄŸi." #. type: Plain text #: ../../man/man1/apropos.man1:250 ../../man/man1/whatis.man1:245 #: ../../man/man8/mandb.man8:194 msgid "An FHS compliant global I<index> database cache." -msgstr "FHS uyumlu bir evrensel I<index> veritabanı önbelleÄŸi." +msgstr "FHS uyumlu bir global I<indeks> veritabanı önbelleÄŸi." #. type: Plain text #: ../../man/man1/apropos.man1:255 ../../man/man1/whatis.man1:250 @@ -519,16 +511,16 @@ msgstr "HATALAR" #. type: Plain text #: ../../man/man1/lexgrog.man1:12 msgid "lexgrog - parse header information in man pages" -msgstr "lexgrog - man sayfalarında baÅŸlık bilgisini ayıkla" +msgstr "lexgrog - man sayfalarında baÅŸlık bilgisini ayrıştır" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<kodlama>" -"\\|] I<dosya> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<kodlama>\\|] I<dosya> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/lexgrog.man1:36 @@ -545,22 +537,22 @@ msgstr "" "önceden biçimlendirilmiÅŸ \\(lqcat\\(rq sayfaları olarak dosyaların listesini " "okur ve adını ve açıklamasını B<apropos> ve B<whatis> tarafından kullanılan " "biçimde görüntüler, kılavuz sayfası tarafından gerekli öniÅŸleme " -"filtrelerinin listesi B<nroff> veya B<troff> ya da her ikisine geçmeden önce." +"süzgeçlerinin listesi B<nroff> veya B<troff> ya da her ikisine geçmeden önce." #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" -"EÄŸer giriÅŸi kötü biçimlendirilmiÅŸse, B<lexgrog> \\(lqayrıştırma baÅŸarısız" -"\\(rq yazdıracaktır; bu, kılavuz sayfalarının doÄŸru olup olmadığını kontrol " +"EÄŸer girdi kötü biçimlendirilmiÅŸse B<lexgrog> \\(lqayrıştırma baÅŸarısız\\(rq " +"yazdıracaktır; bu, kılavuz sayfalarının doÄŸru olup olmadığını kontrol " "etmeniz gereken harici programlar için yararlı olabilir. B<lexgrog>'un " -"girdi dosyalardan biri \\(lq-\\(rq ise, standart girdiden okunur; herhangi " -"bir giriÅŸ dosyası sıkıştırılırsa, sıkıştırılmış bir sürüm otomatik olarak " +"girdi dosyalardan biri \\(lq-\\(rq ise standart girdiden okunur; herhangi " +"bir girdi dosyası sıkıştırılırsa sıkıştırılmış bir sürüm otomatik olarak " "okunacaktır." #. type: Plain text @@ -578,7 +570,7 @@ msgid "" "Parse input as preformatted man pages (\\(lqcat pages\\(rq). B<--man> and " "B<--cat> may not be given simultaneously." msgstr "" -"GiriÅŸi önceden biçimlendirilmiÅŸ kılavuz sayfaları (\\(lqcat sayfaları\\(rq) " +"Girdiyi önceden biçimlendirilmiÅŸ kılavuz sayfaları (\\(lqcat sayfaları\\(rq) " "olarak ayrıştır. B<--man> ve B<--cat> aynı anda verilemez." #. type: Plain text @@ -605,13 +597,13 @@ msgstr "" #: ../../man/man1/lexgrog.man1:82 #, no-wrap msgid "B<-E> I<encoding>, B<--encoding> I<encoding>" -msgstr "B<-E> I<encoding>, B<--encoding> I<encoding>" +msgstr "B<-E> I<kodlama>, B<--encoding> I<kodlama>" #. type: Plain text #: ../../man/man1/lexgrog.man1:86 msgid "Override the guessed character set for the page to I<encoding>." msgstr "" -"Sayfa için tahmin edilen karakter kümesini I<encoding> olarak deÄŸiÅŸtirin." +"Sayfa için tahmin edilen karakter kümesini I<kodlama> olarak deÄŸiÅŸtirin." #. type: Plain text #: ../../man/man1/lexgrog.man1:102 @@ -631,16 +623,7 @@ msgstr "ÖRNEKLER" #. type: Plain text #: ../../man/man1/lexgrog.man1:116 -#, fuzzy, no-wrap -#| msgid "" -#| " $ lexgrog man.1\n" -#| " man.1: \"man - an interface to the on-line reference manuals\"\n" -#| " $ lexgrog -fw man.1\n" -#| " man.1 (t): \"man - an interface to the on-line reference manuals\"\n" -#| " $ lexgrog -c whatis.cat1 \n" -#| " whatis.cat1: \"whatis - display manual page descriptions\"\n" -#| " $ lexgrog broken.1\n" -#| " broken.1: parse failed\n" +#, no-wrap msgid "" " $ lexgrog man.1\n" " man.1: \"man - an interface to the system reference manuals\"\n" @@ -652,10 +635,10 @@ msgid "" " broken.1: parse failed\n" msgstr "" " $ lexgrog man.1\n" -" man.1: \"man - çevrimiçi referans kılavuzları için bir arayüz\"\n" +" man.1: \"man - sistem baÅŸvuru kılavuzları için bir arayüz\"\n" " $ lexgrog -fw man.1\n" -" man.1 (t): \"man - On-line referans kılavuzlarına bir arayüz\"\n" -" $ lexgrog -c whatis.cat1 \n" +" man.1 (t): \"man - sistem baÅŸvuru kılavuzları için bir arayüz\"\n" +" $ lexgrog -c whatis.cat1\n" " whatis.cat1: \"whatis - kılavuz sayfa açıklamalarını görüntüle\"\n" " $ lexgrog broken.1\n" " broken.1: ayrıştırma baÅŸarısız\n" @@ -675,11 +658,11 @@ msgid "" "has to cope with a number of different forms that have historically been " "used, it may sometimes fail to extract the required information." msgstr "" -"B<%mandb%> (B<lexgrog> ile aynı kodu kullanır) her bir kılavuz sayfanın " -"üstündeki B<NAME> bölümünü, belgelenen özelliklerin adlarını ve " -"açıklamalarını ayrıştırır. Ayrıştırıcı oldukça toleranslı olsa da, tarihsel " -"olarak kullanılan çeÅŸitli formlarla baÅŸ etmek zorundaysa, bazen gerekli " -"bilgileri elde etmek baÅŸarısız olabilir." +"B<%mandb%> (B<lexgrog> ile aynı kodu kullanır) her bir kılavuz sayfanın " +"üstündeki B<AD> bölümünü, belgelenen özelliklerin adlarını ve açıklamalarını " +"ayrıştırır. Ayrıştırıcı oldukça toleranslı olsa da, tarihsel olarak " +"kullanılan çeÅŸitli formlarla baÅŸ etmek zorundaysa bazen gerekli bilgileri " +"elde etmek baÅŸarısız olabilir." #. type: Plain text #: ../../man/man1/lexgrog.man1:134 @@ -687,7 +670,7 @@ msgid "" "When using the traditional I<man> macro set, a correct B<NAME> section looks " "something like this:" msgstr "" -"Geleneksel I<man> makro setini kullanırken, doÄŸru bir B<NAME> bölümü ÅŸu " +"Geleneksel I<man> makro setini kullanırken, doÄŸru bir B<AD> bölümü ÅŸu " "ÅŸekilde görünür:" #. type: Plain text @@ -703,12 +686,12 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" "Bazı kılavuz sayfalayıcıları, \\(oq\\e-\\(cq'nin tam olarak gösterildiÄŸi " -"gibi olmasını gerektirir; B<%mandb%> daha hoÅŸgörülüdür, ancak diÄŸer " +"gibi olmasını gerektirir; B<%mandb%> daha hoÅŸgörülüdür; ancak diÄŸer " "sistemlerle uyumluluk için ters eÄŸik çizgiyi korumak iyi bir fikirdir." #. type: Plain text @@ -721,11 +704,11 @@ msgid "" "different descriptions are being documented in the same manual page, the " "following form is therefore used:" msgstr "" -"Sol tarafta virgülle ayrılmış birkaç isim olabilir. BoÅŸ alan içeren " -"isimler, bazı kötü biçimli B<NAME> bölümlerinde patolojik davranışlardan " -"kaçınmak için göz ardı edilir. SaÄŸdaki metin serbest formdadır ve birden " -"fazla satıra yayılabilir. Aynı kılavuz sayfasında farklı açıklamalara sahip " -"çeÅŸitli özellikler belgeleniyorsa, aÅŸağıdaki form kullanılır:" +"Sol tarafta virgülle ayrılmış birkaç ad olabilir. BoÅŸ alan içeren adlar, " +"bazı kötü biçimli B<AD> bölümlerinde patolojik davranışlardan kaçınmak için " +"göz ardı edilir. SaÄŸdaki metin serbest biçimdedir ve birden fazla satıra " +"yayılabilir. Aynı kılavuz sayfasında farklı açıklamalara sahip çeÅŸitli " +"özellikler belgeleniyorsa aÅŸağıdaki biçim kullanılır:" #. type: Plain text #: ../../man/man1/lexgrog.man1:166 @@ -756,7 +739,7 @@ msgid "" "When using the BSD-derived I<mdoc> macro set, a correct B<NAME> section " "looks something like this:" msgstr "" -"BSD türevi I<mdoc> makro setini kullanırken, doÄŸru bir B<NAME> bölümü ÅŸu " +"BSD türevi I<mdoc> makro setini kullanırken, doÄŸru bir B<AD> bölümü ÅŸu " "ÅŸekilde görünür:" #. type: Plain text @@ -767,7 +750,7 @@ msgid "" "\\&.Nm foo\n" "\\&.Nd program to do something>\n" msgstr "" -"CW<\\&.Sh NAME\n" +"CW<\\&.Sh AD\n" "\\&.Nm foo\n" "\\&.Nd biÅŸeyler yapan program >\n" @@ -775,18 +758,18 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "Ayrıştırmanın baÅŸarısız olmasının birkaç ortak nedeni vardır. Bazen kılavuz " "sayfalarının yazarları, \\(oq.SH NAME\\(cq'yi \\(oq.SH MYPROGRAM\\(cq ile " "deÄŸiÅŸtirir ve B<%mandb%>, ihtiyaç duyduÄŸu bilgiyi çıkaracağı bölümü " -"bulamaz. Bazen yazarlar bir NAME bölümü ekliyor ancak \\(oqisim \\e- " -"açıklama\\(cq yerine, serbest formlu metin yerleÅŸtiriyorlar. Bununla " -"birlikte, yukarıdaki gibi herhangi bir sözdizimi kabul edilmelidir." +"bulamaz. Bazen yazarlar bir AD bölümü ekler; ancak \\(oqad \\e- " +"açıklama\\(cq yerine, serbest biçimli metin yerleÅŸtirirler. Bununla " +"birlikte, yukarıdaki gibi herhangi bir sözdizim kabul edilmelidir." #. type: SH #: ../../man/man1/lexgrog.man1:202 @@ -801,7 +784,7 @@ msgid "" "able to do so correctly if the files are properly installed in a manual page " "hierarchy." msgstr "" -"B<lexgrog>, .so isteklerini içeren dosyaları ayrıştırmaya çalışır, ancak " +"B<lexgrog>, .so isteklerini içeren dosyaları ayrıştırmaya çalışır; ancak " "yalnızca dosyalar el ile bir sayfa hiyerarÅŸisinde düzgün bir ÅŸekilde " "yüklenirse bu iÅŸlemi doÄŸru yapabilir." @@ -823,101 +806,78 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:18 -#, fuzzy -#| msgid "%man% - an interface to the on-line reference manuals" msgid "%man% - an interface to the system reference manuals" -msgstr "%man% - çevrimiçi baÅŸvuru kılavuzlarına bir arayüz" +msgstr "%man% - sistem baÅŸvuru kılavuzları için bir arayüz" #. The general command line #. The apropos command line #. type: Plain text #: ../../man/man1/man.man1:25 -#, fuzzy -#| msgid "B<%man%> B<-f> [\\|I<whatis> I<options>\\|] I<page> \\&.\\|.\\|.\\&" msgid "" "B<%man%> [\\|I<man options>\\|] [\\|[\\|I<section>\\|] I<page>\\ \\|.\\|.\\|." "\\|]\\ .\\|.\\|.\\&" msgstr "" -"B<%man%> B<-f> [\\|I<whatis> I<seçenekleri>\\|] I<sayfa> \\&.\\|.\\|.\\&" +"B<%man%> [\\|I<man seçenekleri>\\|] [\\|[\\|I<bölüm>\\|] I<sayfa>\\ \\|.\\|." +"\\|.\\|]\\ .\\|.\\|.\\&" #. The --global-apropos command line #. type: Plain text #: ../../man/man1/man.man1:32 -#, fuzzy -#| msgid "" -#| "B<%man%> B<-k> [\\|I<apropos> I<options>\\|] I<regexp> \\&.\\|.\\|.\\&" msgid "B<%man%> B<-k> [\\|I<apropos options>\\|] I<regexp> \\&.\\|.\\|.\\&" msgstr "" -"B<%man%> B<-k> [\\|I<apropos> I<seçenekleri>\\|] I<düzifd> \\&.\\|.\\|.\\&" +"B<%man%> B<-k> [\\|I<apropos seçenekleri>\\|] I<düzenliifade> \\&.\\|.\\|.\\&" #. The whatis command line #. type: Plain text #: ../../man/man1/man.man1:39 -#, fuzzy -#| msgid "B<%man%> B<-f> [\\|I<whatis> I<options>\\|] I<page> \\&.\\|.\\|.\\&" msgid "" "B<%man%> B<-K> [\\|I<man options>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." "\\&" msgstr "" -"B<%man%> B<-f> [\\|I<whatis> I<seçenekleri>\\|] I<sayfa> \\&.\\|.\\|.\\&" +"B<%man%> B<-K> [\\|I<man seçenekleri>\\|] [\\|I<bölüm>\\|] I<uçbirim>\\ .\\|." +"\\|.\\&" #. The --local command line #. type: Plain text #: ../../man/man1/man.man1:47 msgid "B<%man%> B<-f> [\\|I<whatis> I<options>\\|] I<page> \\&.\\|.\\|.\\&" msgstr "" -"B<%man%> B<-f> [\\|I<whatis> I<seçenekleri>\\|] I<sayfa> \\&.\\|.\\|.\\&" +"B<%man%> B<-f> [\\|I<whatis> I<seçenekler>\\|] I<sayfa> \\&.\\|.\\|.\\&" #. The --where/--where-cat command line #. type: Plain text #: ../../man/man1/man.man1:54 -#, fuzzy -#| msgid "B<%man%> B<-f> [\\|I<whatis> I<options>\\|] I<page> \\&.\\|.\\|.\\&" msgid "B<%man%> B<-l> [\\|I<man options>\\|] I<file> \\&.\\|.\\|.\\&" -msgstr "" -"B<%man%> B<-f> [\\|I<whatis> I<seçenekleri>\\|] I<sayfa> \\&.\\|.\\|.\\&" +msgstr "B<%man%> B<-l> [\\|I<man seçenekleri>\\|] I<dosya> \\&.\\|.\\|.\\&" #. type: Plain text #: ../../man/man1/man.man1:60 -#, fuzzy -#| msgid "B<%man%> B<-f> [\\|I<whatis> I<options>\\|] I<page> \\&.\\|.\\|.\\&" msgid "" "B<%man%> B<-w>\\||\\|B<-W> [\\|I<man options>\\|] I<page> \\&.\\|.\\|.\\&" msgstr "" -"B<%man%> B<-f> [\\|I<whatis> I<seçenekleri>\\|] I<sayfa> \\&.\\|.\\|.\\&" +"B<%man%> B<-w>\\||\\|B<-W> [\\|I<man seçenekleri>\\|] I<sayfa> \\&.\\|.\\|." +"\\&" #. type: Plain text #: ../../man/man1/man.man1:88 -#, fuzzy -#| msgid "" -#| "B<%man%> is the system's manual pager. Each I<page> argument given to B<" -#| "%man%> is normally the name of a program, utility or function. The " -#| "I<manual page> associated with each of these arguments is then found and " -#| "displayed. A I<section>, if provided, will direct B<%man%> to look only " -#| "in that I<section> of the manual. The default action is to search in all " -#| "of the available I<sections> following a pre-defined order (\"%sections%" -#| "\" by default, unless overridden by the B<SECTION> directive in I<" -#| "%manpath_config_file%>), and to show only the first I<page> found, even " -#| "if I<page> exists in several I<sections>." -msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +msgid "" +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" -"B<%man%> sistemin kılavuz sayfalayıcısıdır. B<%man%> komutuna verilen her " -"I<sayfa> argümanı genellikle programın, yardımcının veya bir iÅŸlevin adıdır. " -"Ardından bu argümanlar ile iliÅŸkili I<kılavuz sayfası> bulunup görüntülenir. " -"Bir I<bölüm>, saÄŸlanmışsa, B<%man%> uygulamasının kılavuz içinde sadece " -"ilgili I<bölümde> aramasını saÄŸlar. Öntanımlı eylem önceden tanımlanmış " -"sıralamayı takip ederek (I<%manpath_config_file%> içindeki B<SECTION> " -"yönergesi ile üzerine yazılmadığı takdirde, öntanımlı olarak \"%sections%\") " -"tüm kullanılabilir I<bölümler> içinde aramak ve birden fazla I<sayfa> " -"bulunsa bile, bulunan ilk I<sayfayı> göstermektir." +"B<%man%>, sistemin kılavuz sayfalayıcısıdır. B<%man%> komutuna verilen her " +"I<sayfa> argümanı genellikle programın, yardımcının veya bir iÅŸlevin " +"adıdır. Bir I<bölüm>'ü, saÄŸlanmışsa B<%man%> uygulamasının kılavuz içinde " +"yalnızca ilgili I<bölüm>'de aramasını saÄŸlar. Öntanımlı eylem önceden " +"tanımlanmış sıralamayı takip ederek (I<%manpath_config_file%> içindeki " +"B<SECTION> yönergesi ile üzerine yazılmadığı takdirde, öntanımlı olarak " +"\"%sections%\") tüm kullanılabilir I<bölümler> içinde aramak ve birden fazla " +"I<sayfa> bulunsa bile bulunan ilk I<sayfa>'yı göstermektir." #. type: Plain text #: ../../man/man1/man.man1:92 @@ -932,7 +892,7 @@ msgstr "" #: ../../man/man1/man.man1:98 #, no-wrap msgid "Executable programs or shell commands" -msgstr "Çalıştırılabilir programlar veya kabul komutları" +msgstr "Çalıştırılabilir programlar veya kabuk komutları" #. type: tbl table #: ../../man/man1/man.man1:101 @@ -944,7 +904,7 @@ msgstr "Sistem çaÄŸrıları (çekirdek tarafından saÄŸlanmış iÅŸlevler)" #: ../../man/man1/man.man1:104 #, no-wrap msgid "Library calls (functions within program libraries)" -msgstr "Kütüphane çaÄŸrıları (program kütüphaneleri içindeki iÅŸlevler)" +msgstr "Kitaplık çaÄŸrıları (program kitaplıkları içindeki iÅŸlevler)" #. type: tbl table #: ../../man/man1/man.man1:107 @@ -954,10 +914,9 @@ msgstr "Özel dosyalar (genellikle I</dev\\/> içinde bulunur)" #. type: tbl table #: ../../man/man1/man.man1:110 -#, fuzzy, no-wrap -#| msgid "File formats and conventions eg I</etc/passwd>" +#, no-wrap msgid "File formats and conventions, e.g.\\& I</etc/passwd>" -msgstr "Dosya biçimi ve düzenler, örn. I</etc/passwd>" +msgstr "Dosya biçimi ve düzenler; örn.\\& I</etc/passwd>" #. type: tbl table #: ../../man/man1/man.man1:113 @@ -967,22 +926,19 @@ msgstr "Oyunlar" #. type: tbl table #: ../../man/man1/man.man1:117 -#, fuzzy, no-wrap -#| msgid "" -#| "Miscellaneous (including macro packages and conventions),\n" -#| "e.g.\\& B<man>(7), B<groff>(7)" +#, no-wrap msgid "" "Miscellaneous (including macro packages and conventions),\n" "e.g.\\& B<man>(7), B<groff>(7), B<man-pages>(7)" msgstr "" -"ÇeÅŸitli (makro paketleri ve eÄŸilimler),\n" -"örn.\\& B<man>(7), B<groff>(7)" +"ÇeÅŸitli (makro paketleri ve düzenler dahil olmak üzere),\n" +"örn.\\& B<man>(7), B<groff>(7), B<man-pages>(7)" #. type: tbl table #: ../../man/man1/man.man1:120 #, no-wrap msgid "System administration commands (usually only for root)" -msgstr "Sistem yönetim komutları (genellikle sadece root (yönetici) için)" +msgstr "Sistem yönetim komutları (genellikle yalnızca kök kullanıcı için)" #. type: tbl table #: ../../man/man1/man.man1:123 @@ -993,7 +949,7 @@ msgstr "Çekirdek yordamları [\\ Standart olmayan\\|]" #. type: Plain text #: ../../man/man1/man.man1:129 msgid "A manual I<page> consists of several sections." -msgstr "Bir kılavuz I<sayfası> birkaç bölüm içerir." +msgstr "Bir kılavuz I<sayfa>'sı birkaç bölüm içerir." #. type: Plain text #: ../../man/man1/man.man1:149 @@ -1003,7 +959,7 @@ msgid "" "B<ENVIRONMENT>, B<FILES>, B<VERSIONS>, B<CONFORMING\\ TO>, B<NOTES>, " "B<BUGS>, B<EXAMPLE>, B<AUTHORS>, and B<SEE\\ ALSO>." msgstr "" -"Muhtemel bölüm adları ÅŸunlar olabilir: B<Ä°SÄ°M>, B<ÖZET>, B<YAPILANDIRMA>, " +"Muhtemel bölüm adları ÅŸunlar olabilir: B<AD>, B<ÖZET>, B<YAPILANDIRMA>, " "B<AÇIKLAMA>, B<SEÇENEKLER>, B<ÇIKIÅž\\ DURUMU>, B<DÖNÜŞ\\ DEÄžERÄ°>, " "B<HATALAR>, B<ORTAM>, B<DOSYALAR>, B<SÃœRÃœMLER>, B<UYDUÄžU>, B<NOTLAR>, " "B<HATALAR>, B<ÖRNEK>, B<YAZARLAR>, and B<AYRICA\\ BAKINIZ>." @@ -1108,7 +1064,7 @@ msgid "" "exclusive invocations as is shown in the B<SYNOPSIS> section of this manual " "page." msgstr "" -"Komut veya iÅŸlev gösterimi tüm muhtemel çaÄŸrımlar ile eÅŸleÅŸmesi gereken bir " +"Komut veya iÅŸlev gösterimi tüm olası çaÄŸrımlar ile eÅŸleÅŸmesi gereken bir " "ÅŸablondur. Bazı durumlarda, bu kılavuz sayfasının B<ÖZET> kısmında " "gösterilen çeÅŸitli özel çaÄŸrımları göstermek önerilir." @@ -1121,30 +1077,28 @@ msgstr "B<%man%>I<\\ ls>" #. type: Plain text #: ../../man/man1/man.man1:194 msgid "Display the manual page for the I<item> (program) I<ls>." -msgstr "I<öge> (program) I<ls> için kılavuz sayfasını göster." +msgstr "I<öge> (program) I<ls> için kılavuz sayfasını göster." #. type: TP #: ../../man/man1/man.man1:194 -#, fuzzy, no-wrap -#| msgid "B<%man% >I<man>.I<7>" +#, no-wrap msgid "B<%man%> I<man>.I<7>" -msgstr "B<%man% >I<man>.I<7>" +msgstr "B<%man%> I<man>.I<7>" #. type: Plain text #: ../../man/man1/man.man1:202 -#, fuzzy -#| msgid "Display the manual page for macro package I<man> from section I<7>." msgid "" "Display the manual page for macro package I<man> from section I<7>. (This " "is an alternative spelling of \"B<%man%> I<7 man>\".)" -msgstr "Bölüm I<7>'den makro paketi I<man> için kılavuz sayfasını göster." +msgstr "" +"Bölüm I<7>'den makro paketi I<man> için kılavuz sayfasını göster. (Bu, " +"\"B<%man%> I<7 man>\"ın deÄŸiÅŸik baÅŸka bir yazımıdır.)" #. type: TP #: ../../man/man1/man.man1:202 -#, fuzzy, no-wrap -#| msgid "B<%man% >I<man>.I<7>" +#, no-wrap msgid "B<%man% '>I<man>(I<7>)'" -msgstr "B<%man% >I<man>.I<7>" +msgstr "B<%man% '>I<man>(I<7>)'" #. type: Plain text #: ../../man/man1/man.man1:214 @@ -1154,12 +1108,17 @@ msgid "" "convenient when copying and pasting cross-references to manual pages. Note " "that the parentheses must normally be quoted to protect them from the shell.)" msgstr "" +"I<man> makro paketi için I<7> bölümünden kılavuz sayfasını görüntüle. (Bu, " +"\"B<%man%> I<7 man>\"in alternatif bir yazımıdır. Kılavuz sayfalarına " +"çapraz baÅŸvuruları kopyalama ve yapıştırmadan daha kolay olabilir. " +"Parantezlerin, onları kabuktan korumak için tırnak içine alınması " +"gerektiÄŸine dikkat edin.)" #. type: TP #: ../../man/man1/man.man1:214 #, no-wrap msgid "B<%man%\\ -a>I<\\ intro>" -msgstr "B<%man%\\ -a>I<\\ intro>" +msgstr "B<%man%\\ -a>I<\\ giriÅŸ>" #. type: Plain text #: ../../man/man1/man.man1:220 @@ -1169,36 +1128,27 @@ msgid "" "skip any of them." msgstr "" "Kılavuzda yer alan mevcut tüm I<intro> kılavuz sayfalarını arka arkaya " -"görüntüle. Ardışık görüntüler arasında çıkmak veya herhangi birini atlamak " -"mümkündür." +"görüntüle. Ardışık görüntüler arasında çıkmak veya herhangi birini atlamak " +"olanaklıdır." #. type: TP #: ../../man/man1/man.man1:220 -#, fuzzy, no-wrap -#| msgid "B<%man% -t >I<alias >|I< lpr -Pps>" +#, no-wrap msgid "B<%man% -t >I<bash >|I< lpr -Pps>" -msgstr "B<%man% -t >I<alias >|I< lpr -Pps>" +msgstr "B<%man% -t >I<bash >|I< lpr -Pps>" #. type: Plain text #: ../../man/man1/man.man1:237 -#, fuzzy -#| msgid "" -#| "Format the manual page referenced by `I<alias>', usually a shell manual " -#| "page, into the default B<troff> or B<groff> format and pipe it to the " -#| "printer named I<ps>. The default output for B<groff> is usually " -#| "PostScript. B<%man% --help> should advise as to which processor is bound " -#| "to the B<-t> option." msgid "" "Format the manual page for I<bash> into the default B<troff> or B<groff> " "format and pipe it to the printer named I<ps>. The default output for " "B<groff> is usually PostScript. B<%man% --help> should advise as to which " "processor is bound to the B<-t> option." msgstr "" -"`I<alias>' tarafından baÅŸvurulmuÅŸ kılavuz sayfasını biçimlendir (Genellikle " -"bir kabul kılavuz sayfasını öntanımlı B<troff> veya B<groff> biçimine) ve " -"I<ps> adındaki yazıcıya yolla. B<groff> için öntanımlı çıktı genellikle " -"PostScript'tir. B<%man% --help>, B<-t> seçeneÄŸine hangi iÅŸlemcinin baÄŸlı " -"olduÄŸunu göstermelidir." +"I<bash>'ın kılavuz sayfasını öntanımlı B<troff> veya B<groff> biçiminde yap " +"ve I<ps> adlı yazıcıya veriyolu ile gönder. B<groff>'un öntanımlı çıktısı " +"genelde PostScript'tir. B<%man% --help>, hangi iÅŸlemcinin B<-t> seçeneÄŸine " +"bağımlı olduÄŸunu genelde anlatır." #. type: TP #: ../../man/man1/man.man1:237 @@ -1208,13 +1158,6 @@ msgstr "B<%man% -l -T>I<dvi ./foo.1x.gz>B< E<gt> >I<./foo.1x.dvi>" #. type: Plain text #: ../../man/man1/man.man1:253 -#, fuzzy -#| msgid "" -#| "This command will decompress and format the nroff source manual page I<./" -#| "foo.1x.gz> into a B<device independent (dvi)> file. The redirection is " -#| "necessary as the B<-T> flag causes output to be directed to B<stdout> " -#| "with no pager. The output could be viewed with a program such as B<xdvi> " -#| "or further processed into PostScript using a program such as B<dvips.>" msgid "" "This command will decompress and format the nroff source manual page I<./" "foo.1x.gz> into a B<device independent (dvi)> file. The redirection is " @@ -1222,11 +1165,12 @@ msgid "" "no pager. The output could be viewed with a program such as B<xdvi> or " "further processed into PostScript using a program such as B<dvips>." msgstr "" -"Bu komut, nroff I<./foo.1x.gz> kaynak kılavuz sayfasını B<aygıttan bağımsız " -"(dvi)> dosyasına sıkıştırıp açacaktır. Yönlendirme, çıkışın sayfalayıcı " -"olmadan B<stdout> yöneltilmesine neden olduÄŸu için B<-T> bayrağı gereklidir. " -"Çıktı, B<xdvi> gibi bir programla görüntülenebilir veya B<dvips.> gibi bir " -"programı kullanarak PostScript içine iÅŸlenebilir." +"Bu komut, nroff I<./foo.1x.gz> kaynak kılavuz sayfası sıkıştırmasını açacak " +"ve bir B<aygıttan bağımsız (dvi)> dosyasına biçimlendirecektir. Yeniden " +"yönlendirme, B<-T> bayrağı çıktının bir sayfalayıcı olmadan B<stdout>'a " +"yönlendirilmesine neden olduÄŸundan gereklidir. Çıktı, B<xdvi> gibi bir " +"programla görüntülenebilir veya B<dvips> gibi bir programla PostScript " +"olarak iÅŸlenebilir." #. type: TP #: ../../man/man1/man.man1:253 @@ -1238,12 +1182,12 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "I<printf> anahtar sözcüğünün kısa açıklamalarını ve kılavuz sayfa adlarını " -"normal ifade olarak arayın. Herhangi bir eÅŸleÅŸme olduÄŸunda çıktı verir. B<" -"%apropos%>I<\\ printf>B<.> ile eÅŸdeÄŸerdir" +"normal ifade olarak arayın. Herhangi bir eÅŸleÅŸme olduÄŸunda çıktı verir. " +"B<%apropos%>I<\\ printf>B<.> ile eÅŸdeÄŸerdir" #. type: TP #: ../../man/man1/man.man1:261 @@ -1258,7 +1202,7 @@ msgid "" "descriptions of any found. Equivalent to B<%whatis%>I<\\ smail>B<.>" msgstr "" "I<smail> tarafından atıf yapılan kılavuz sayfalarını ara ve bulunan herhangi " -"bir öğenin kısa açıklamalarını yazdır. B<%whatis%>I<\\ smail>B<.> ile " +"bir ögenin kısa açıklamalarını yazdır. B<%whatis%>I<\\ smail>B<.> ile " "eÅŸdeÄŸerdir." #. type: SH @@ -1281,18 +1225,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:296 -#, fuzzy -#| msgid "" -#| "If set, various environment variables are interrogated to determine the " -#| "operation of B<%man%>. It is possible to set the `catch all' variable " -#| "$B<MANOPT> to any string in command line format with the exception that " -#| "any spaces used as part of an option's argument must be escaped (preceded " -#| "by a backslash). B<%man%> will parse $B<MANOPT> prior to parsing its own " -#| "command line. Those options requiring an argument will be overridden by " -#| "the same options found on the command line. To reset all of the options " -#| "set in $B<MANOPT>, B<-D> can be specified as the initial command line " -#| "option. This will allow %man% to `forget' about the options specified in " -#| "$B<MANOPT> although they must still have been valid." msgid "" "If set, various environment variables are interrogated to determine the " "operation of B<%man%>. It is possible to set the \"catch-all\" variable " @@ -1305,17 +1237,16 @@ msgid "" "will allow %man% to \"forget\" about the options specified in $B<MANOPT>, " "although they must still have been valid." msgstr "" -"Ayarlandıysa, B<%man%> iÅŸlemini belirlemek için çeÅŸitli ortam deÄŸiÅŸkenleri " -"sorgulanır. Bir seçeneÄŸin argümanının bir parçası olarak kullanılan " -"boÅŸluklardan kaçınılması koÅŸuluyla (önce bir ters eÄŸik çizgi ile yazılması " -"gerekir), `catch all' deÄŸiÅŸkenini $B<MANOPT> komut satırı biçimindeki " -"herhangi bir dizgeye ayarlamak mümkündür. B<%man%> kendi komut satırını " -"ayrıştırmadan önce $B<MANOPT> deÄŸerini ayrıştırır. Bir bağımsız deÄŸiÅŸken " -"gerektiren seçenekler, komut satırında bulunan seçeneklerle geçersiz " -"kılınır. $B<MANOPT>'ta ayarlanan tüm seçenekleri sıfırlamak için ilk komut " -"satırı seçeneÄŸi olarak B<-D> belirtilebilir. Bu, %man% komutunun hala " -"geçerli olmalarına raÄŸmen $B<MANOPT> ile belirtilen seçeneklerin " -"`unutmasını' saÄŸlayacaktır." +"Ayarlanmışsa B<%man%> iÅŸlemini belirlemek için çeÅŸitli çevre deÄŸiÅŸkenleri " +"sorgulanır. \"catch-all\" deÄŸiÅŸkeni $B<MANOPT>'un komut satırı biçiminde " +"herhangi bir diziye ayarlamak olanaklıdır; ancak seçeneÄŸin argümanındaki her " +"bir kullanılan boÅŸluÄŸun kaçırılması gerekmektedir (öncesinde ters eÄŸik çizgi " +"getirerek). B<%man%>, $B<MANOPT>'u kendi komut satırını ayrıştırmadan önce " +"ayrıştıracaktır. Bir argüman gerektiren seçenekler, komut satırında bulunan " +"aynı argümanlar tarafından geçersiz kılınacaktır. $B<MANOPT> içinde ayarlı " +"tüm seçenekleri sıfırlamak için, ilk komut satırı seçeneÄŸi olarak " +"belirtilebilir. Bu, %man%'ın $B<MANOPT> içinde tanımlı seçenekleri " +"\"unutmasına\" izin verir; ancak yine de geçerli olmalıdırlar." #. type: Plain text #: ../../man/man1/man.man1:307 @@ -1325,17 +1256,13 @@ msgid "" "preformatted I<cat pages> to improve performance. See B<manpath>(5) for " "details of where these files are stored." msgstr "" +"Kılavuz sayfaları normalde B<nroff>(1) biçiminde I</usr/share/man> gibi bir " +"dizin içinde depolanırlar. Bazı kurulumlarda baÅŸarımı artırmak için " +"önbiçimlendirilmiÅŸ I<cat sayfaları> olabilir. Bu dosyaların nerede " +"depolandığı hakkında ayrıntılar için bkz. B<manpath>(5)." #. type: Plain text #: ../../man/man1/man.man1:318 -#, fuzzy -#| msgid "" -#| "International support is available with this package. Native language " -#| "manual pages are accessible (if available on your system) via use of " -#| "I<locale> functions. To activate such support, it is necessary to set " -#| "either $B<LC_MESSAGES>, $B<LANG> or another system dependent environment " -#| "variable to your language locale, usually specified in the B<POSIX " -#| "1003.1> based format:" msgid "" "This package supports manual pages in multiple languages, controlled by your " "I<locale>. If your system did not set this up for you automatically, then " @@ -1343,11 +1270,11 @@ msgid "" "environment variable to indicate your preferred locale, usually specified in " "the B<POSIX> format:" msgstr "" -"Bu paketin uluslararası desteÄŸi vardır. Yerel dil kılavuz sayfalarına I<dil> " -"iÅŸlevleri kullanarak eriÅŸilebilirsiniz (sisteminizde varsa). Böyle bir " -"desteÄŸi etkinleÅŸtirmek için, genelde B<POSIX 1003.1> tabanlı biçimde " -"belirtilen, dil yerel ayarınıza $B<LC_MESSAGES>, $B<DÄ°L> veya baÅŸka bir " -"sisteme baÄŸlı çevre deÄŸiÅŸkeni ayarlamanız gereklidir:" +"Bu paket, I<locale> tarafından denetlenen bir biçimde birden çok dilde " +"kılavuz sayfalarını destekler. EÄŸer sisteminiz bunu kendiliÄŸinden " +"ayarlamamışsa $B<LC_MESSAGES>, $B<LANG> veya baÅŸka sisteme bağımlı çevre " +"deÄŸiÅŸkenini B<POSIX> biçiminde belirtildiÄŸi üzere yeÄŸlediÄŸiniz yerel ayara " +"deÄŸiÅŸtirmeniz gerekebilir:" # #. type: Plain text @@ -1365,29 +1292,19 @@ msgid "" "If the desired page is available in your I<locale>, it will be displayed in " "lieu of the standard (usually American English) page." msgstr "" -"Ä°stediÄŸiniz sayfa kendi I<dil> sayfanızda bulunuyorsa, standart (genellikle " +"Ä°stediÄŸiniz sayfa kendi I<dil> sayfanızda bulunuyorsa standart (genellikle " "Amerikan Ä°ngilizcesi) sayfasının yerine görüntülenir." #. type: Plain text #: ../../man/man1/man.man1:332 -#, fuzzy -#| msgid "" -#| "Support for international message catalogues is also featured in this " -#| "package and can be activated in the same way, again if available. If you " -#| "find that the manual pages and message catalogues supplied with this " -#| "package are not available in your native language and you would like to " -#| "supply them, please contact the maintainer who will be coordinating such " -#| "activity." msgid "" "If you find that the translations supplied with this package are not " "available in your native language and you would like to supply them, please " "contact the maintainer who will be coordinating such activity." msgstr "" -"Uluslararası mesaj katalogları için destek de bu pakette sunulmuÅŸtur ve " -"mevcutsa, yine aynı ÅŸekilde etkinleÅŸtirilebilir. Bu pakette verilen kılavuz " -"sayfalarının ve mesaj kataloglarının ana dilde bulunmadığını ve bunları " -"saÄŸlamak isterseniz, lütfen bu tür etkinlikleri koordine eden olan bakımcıya " -"baÅŸvurun." +"Bu paketle birlikte saÄŸlanan çeviriler ana dilinizde yoksa ve onları " +"çevirmek isterseniz lütfen bu etkinlikleri koordine eden proje sorumlusu ile " +"iletiÅŸime geçin." #. type: Plain text #: ../../man/man1/man.man1:338 @@ -1398,6 +1315,10 @@ msgid "" "missing or inadequate, please report that to the maintainers of the package " "in question." msgstr "" +"Bireysel kılavuz sayfaları genelde programın, iÅŸlevin veya diÄŸer konunun " +"bakımcıları tarafından yazılır ve güncellenir. EÄŸer bir kılavuz sayfasının " +"eksik veya yetersiz olduÄŸunu düşünüyorsanız o paketin geliÅŸtiricilerine/" +"bakımcılarına rapor edin." #. type: Plain text #: ../../man/man1/man.man1:341 @@ -1412,15 +1333,18 @@ msgstr "" #: ../../man/man1/man.man1:341 #, no-wrap msgid "DEFAULTS" -msgstr "VARSAYILANLAR" +msgstr "ÖNTANIMLILAR" #. type: Plain text #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" +"Aranacak bölümlerin sırası $B<MANSECT> çevre deÄŸiÅŸkeni tarafından veya " +"I<%manpath_config_file%> içindeki B<SECTION> direktifi tarafından geçersiz " +"kılınabilir. Öntanımlı olarak şöyledir:" #. type: Plain text #: ../../man/man1/man.man1:361 @@ -1429,6 +1353,9 @@ msgid "" "specified in a number of ways, or else will fall back to a default (see " "option B<-P> for details)." msgstr "" +"Biçimlendirilen kılavuz sayfaları bir I<sayfalayıcı> kullanarak " +"görüntülenir. Bu, birkaç biçimde belirtilebilir veya bir öntanımlıya geri " +"dönecektir (Ayrıntılar için B<-P> seçeneÄŸine bakın)." #. type: Plain text #: ../../man/man1/man.man1:373 @@ -1439,11 +1366,11 @@ msgid "" "line of the nroff file is parsed for a preprocessor string. To contain a " "valid preprocessor string, the first line must resemble" msgstr "" -"Filtreler çeÅŸitli yöntemlerle deÅŸifre edildi. Öncelikle, komut satırı " +"Süzgeçler çeÅŸitli yöntemlerle deÅŸifre edilir. Öncelikle, komut satırı " "seçeneÄŸi B<-p> veya çevre deÄŸiÅŸkeni $B<MANROFFSEQ> sorgulanır. B<-p> " -"kullanılmıyor ve ortam deÄŸiÅŸkeni ayarlanmamışsa, bir öniÅŸlemci karakter " -"katarı için nroff dosyasının ilk satırı ayrıştırılır. Geçerli bir öniÅŸlemci " -"karakter katarı içermek için, ilk satır benzemek zorundadır" +"kullanılmıyor ve çevre deÄŸiÅŸkeni ayarlanmamışsa bir öniÅŸlemci karakter " +"dizisi için nroff dosyasının ilk satırı ayrıştırılır. Geçerli bir öniÅŸlemci " +"karakter dizisi içermek için, ilk satır benzemek zorundadır" #. type: Plain text #: ../../man/man1/man.man1:376 @@ -1456,8 +1383,8 @@ msgid "" "where B<string> can be any combination of letters described by option B<-p> " "below." msgstr "" -"burada B<string> aÅŸağıdaki B<--p> seçeneÄŸi tarafından tanımlanan herhangi " -"bir harf kombinasyonu olabilir." +"burada B<dizi> aÅŸağıdaki B<--p> seçeneÄŸi tarafından tanımlanan herhangi bir " +"harf kombinasyonu olabilir." #. type: Plain text #: ../../man/man1/man.man1:385 @@ -1465,7 +1392,7 @@ msgid "" "If none of the above methods provide any filter information, a default set " "is used." msgstr "" -"Yukarıdaki yöntemlerden hiçbiri süzgeç bilgisi saÄŸlamıyorsa, varsayılan bir " +"Yukarıdaki yöntemlerden hiçbiri süzgeç bilgisi saÄŸlamıyorsa öntanımlı bir " "küme kullanılır." #. ******************************************************************** @@ -1481,27 +1408,21 @@ msgid "" msgstr "" "Süzgeçlerden ve birincil biçimlendiriciden (B<nroff> veya [B<tg>]B<roff>, B<-" "t> ile) bir biçimlendirme hattı oluÅŸturuldu ve çalıştırıldı. Alternatif " -"olarak, çalıştırılabilir bir program I<mandb_nfmt> (veya B<-t> içeren " -"I<mandb_tfmt>) klavuz aÄŸacı kökünde varsa, bunun yerine çalıştırılır. " +"olarak, çalıştırılabilir bir program I<mandb_nfmt> (veya B<-t> içeren " +"I<mandb_tfmt>) kılavuz aÄŸacı kökünde varsa bunun yerine çalıştırılır. " "Kılavuz kaynak dosyası, öniÅŸlemci dizesi ve isteÄŸe baÄŸlı olarak B<-T> veya " -"B<-E> ile argüman olarak belirtilen cihazdan geçilir." +"B<-E> ile argüman olarak belirtilen aygıttan geçilir." #. type: Plain text #: ../../man/man1/man.man1:412 -#, fuzzy -#| msgid "" -#| "Non argument options that are duplicated either on the command line, in " -#| "$B<MANOPT>, or both, are not harmful. For options that require an " -#| "argument, each duplication will override the previous argument value." msgid "" "Non-argument options that are duplicated either on the command line, in " "$B<MANOPT>, or both, are not harmful. For options that require an argument, " "each duplication will override the previous argument value." msgstr "" -"Komut satırında, $B<MANOPT>'da ya da her ikisinde birden çiftlenen " -"argümansız seçenekler zararlı deÄŸildir. Bir bağımsız deÄŸiÅŸken gerektiren " -"seçenekler için, her çoÄŸaltma önceki bağımsız deÄŸiÅŸken deÄŸerini geçersiz " -"kılacaktır." +"Komut satırında veya $B<MANOPT> içinde yinelenen argüman olmayan seçenekleri " +"zararlı deÄŸildir. Bir argüman gerektiren seçenekler için, her bir yineleme " +"bir önceki argüman deÄŸerini geçersiz kılacaktır." #. type: SS #: ../../man/man1/man.man1:412 @@ -1512,21 +1433,21 @@ msgstr "Genel seçenekler" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "Bu seçenek normalde ilk seçenek olarak verilir ve B<%man%'s> davranışını " -"varsayılan deÄŸerine sıfırlar. Kullanımı, $B<MANOPT>'da ayarlanmış " -"olabilecek seçenekleri sıfırlamaktır. B<-D>'yi takip eden tüm seçenekler " -"normal etkiye sahiptir." +"öntanımlı deÄŸerine sıfırlar. Kullanımı, $B<MANOPT>'da ayarlanmış olabilecek " +"seçenekleri sıfırlamaktır. B<-D>'yi takip eden tüm seçenekler normal etkiye " +"sahiptir." #. type: TP #: ../../man/man1/man.man1:430 #, no-wrap msgid "B<--warnings>[=I<warnings\\/>]" -msgstr "B<--warnings>[=I<warnings\\/>]" +msgstr "B<--warnings>[=I<uyarılar\\/>]" #. type: Plain text #: ../../man/man1/man.man1:442 @@ -1539,9 +1460,9 @@ msgid "" msgstr "" "I<groff> 'dan uyarıları etkinleÅŸtirin. Bu, kılavuz sayfalarının kaynak " "metninde saÄŸlama yapmak için kullanılabilir. I<warnings>, virgülle ayrılmış " -"uyarı adları listesidir; saÄŸlanmazsa varsayılan \"mac\" olur. " -"Kullanılabilir uyarı adlarının bir listesi için B<info groff>'daki " -"\\(lqUyarılar\\(rq düğümüne bakın." +"uyarı adları listesidir; saÄŸlanmazsa öntanımlı \"mac\" olur. Kullanılabilir " +"uyarı adlarının bir listesi için B<info groff>'daki \\(lqUyarılar\\(rq " +"düğümüne bakın." #. type: SS #: ../../man/man1/man.man1:442 @@ -1555,8 +1476,8 @@ msgid "" "Equivalent to B<%whatis%>. Display a short description from the manual " "page, if available. See B<%whatis%>(1) for details." msgstr "" -"B<%whatis%>'e eÅŸdeÄŸerdir. Varsa, kılavuz sayfasından kısa bir açıklama " -"görüntüle. Ayrıntılar için B<%whatis%>(1)'e bakın." +"B<%whatis%>'e eÅŸdeÄŸerdir. Varsa kılavuz sayfasından kısa bir açıklama " +"görüntüle. Ayrıntılar için B<%whatis%>(1)'e bakın." #. type: Plain text #: ../../man/man1/man.man1:460 @@ -1564,9 +1485,9 @@ msgid "" "Equivalent to B<%apropos%>. Search the short manual page descriptions for " "keywords and display any matches. See B<%apropos%>(1) for details." msgstr "" -"B<% apropos%> ile aynı. Anahtar kelimeler için kısa kılavuz sayfa " -"açıklamalarını arayın ve tüm eÅŸleÅŸmeleri görüntüleyin. Ayrıntılar için B<" -"%apropos%> (1) bölümüne bakın." +"B<% apropos%> ile aynı. Anahtar sözcükler için kısa kılavuz sayfa " +"açıklamalarını arayın ve tüm eÅŸleÅŸmeleri görüntüleyin. Ayrıntılar için " +"B<%apropos%> (1) bölümüne bakın." #. type: Plain text #: ../../man/man1/man.man1:470 @@ -1578,9 +1499,9 @@ msgid "" "used." msgstr "" "Tüm kılavuz sayfalarında metin arayın. Bu kaba kuvvet araması ve muhtemelen " -"biraz zaman alır; yapabiliyorsanız, aranması gereken sayfa sayısını azaltmak " -"için bir bölüm belirtmelisiniz. Arama terimleri basit karakter katarları " -"(varsayılan) veya B<--regex> seçeneÄŸi kullanılıyorsa düzenli ifadeler " +"biraz zaman alır; yapabiliyorsanız aranması gereken sayfa sayısını azaltmak " +"için bir bölüm belirtmelisiniz. Arama terimleri basit karakter dizileri " +"(öntanımlı) veya B<--regex> seçeneÄŸi kullanılıyorsa düzenli ifadeler " "olabilir." #. type: Plain text @@ -1599,16 +1520,6 @@ msgstr "" #. usual filters. #. type: Plain text #: ../../man/man1/man.man1:492 -#, fuzzy -#| msgid "" -#| "Activate `local' mode. Format and display local manual files instead of " -#| "searching through the system's manual collection. Each manual page " -#| "argument will be interpreted as an nroff source file in the correct " -#| "format. No cat file is produced. If '-' is listed as one of the " -#| "arguments, input will be taken from stdin. When this option is not used, " -#| "and man fails to find the page required, before displaying the error " -#| "message, it attempts to act as if this option was supplied, using the " -#| "name as a filename and looking for an exact match." msgid "" "Activate \"local\" mode. Format and display local manual files instead of " "searching through the system's manual collection. Each manual page argument " @@ -1619,48 +1530,39 @@ msgid "" "this option was supplied, using the name as a filename and looking for an " "exact match." msgstr "" -"`local' kipini etkinleÅŸtirin. Sistemin kılavuz koleksiyonu üzerinden arama " -"yapmak yerine yerel kılavuz dosyalarını biçimlendirin ve gösterin. Her " -"kılavuz sayfası bağımsız deÄŸiÅŸkeni, doÄŸru biçimde bir nroff kaynak dosyası " -"olarak yorumlanacaktır. Hiçbir cat dosyası üretilmez. EÄŸer '-' " -"argümanlardan biri olarak listeleniyorsa, girdi stdin'den alınacaktır. Bu " -"seçenek kullanılmadığında ve man gereken sayfayı bulamazsa, hata mesajını " -"görüntülemeden önce, bu seçeneÄŸi saÄŸlanmış gibi davranmaya çalışır, adı " -"dosya adı olarak kullanarak tam bir eÅŸleÅŸme arar." +"\"local\" kipini etkinleÅŸtirin. Sistemin kılavuz koleksiyonunda arama " +"yapmak yerine yerel kılavuz dosyalarını biçimlendirin ve görüntüleyin. Her " +"kılavuz sayfası argümanı doÄŸru biçimde bir nroff kaynak dosyası olarak " +"yorumlanacaklardır. Bir cat dosyası üretilmez. EÄŸer '-' argümanlardan biri " +"olarak listelenmiÅŸse girdi stdin'den alınır. Bu seçenek kullanılmadığında " +"ve man gereken sayfayı bulamazsa hata iletisini görüntülemeden önce adı " +"dosya adı gibi kullanarak ve tam bir eÅŸleÅŸme arayarak bu seçenek verilmiÅŸ " +"gibi davranır." #. type: Plain text #: ../../man/man1/man.man1:500 -#, fuzzy -#| msgid "" -#| "Don't actually display the manual pages, but do print the location(s) of " -#| "the cat files that would be displayed. If -w and -W are both specified, " -#| "print both separated by a space." msgid "" "Don't actually display the manual page, but do print the location of the " "source nroff file that would be formatted. If the B<-a> option is also " "used, then print the locations of all source files that match the search " "criteria." msgstr "" -"Kılavuz sayfaları gerçekten gösterme, ancak görüntülenen cat dosyalarının " -"yerini/yerlerini yazdırabilirsin. -w ve -W her ikisi de belirtilmiÅŸse, her " -"ikisi de boÅŸluklarla ayrılmış olarak verilmelidir." +"Kılavuz sayfasını özünde görüntüleme; ancak biçimlendirilecek nroff " +"dosyasının konumunu yazdır. EÄŸer B<-a> seçeneÄŸi de kullanılmışsa o zaman " +"arama kriteri ile eÅŸleÅŸen tüm kaynak dosyaların konumlarını yazdır." #. type: Plain text #: ../../man/man1/man.man1:508 -#, fuzzy -#| msgid "" -#| "Don't actually display the manual pages, but do print the location(s) of " -#| "the cat files that would be displayed. If -w and -W are both specified, " -#| "print both separated by a space." msgid "" "Don't actually display the manual page, but do print the location of the " "preformatted cat file that would be displayed. If the B<-a> option is also " "used, then print the locations of all preformatted cat files that match the " "search criteria." msgstr "" -"Kılavuz sayfaları gerçekten gösterme, ancak görüntülenen cat dosyalarının " -"yerini/yerlerini yazdırabilirsin. -w ve -W her ikisi de belirtilmiÅŸse, her " -"ikisi de boÅŸluklarla ayrılmış olarak verilmelidir." +"Kılavuz sayfasını özünde görüntüleme; ancak görüntülenecek " +"önbiçimlendirilmiÅŸ cat dosyasının konumunu yazdır. EÄŸer B<-a> seçeneÄŸi de " +"kullanılmışsa o zaman arama kriteri ile eÅŸleÅŸen tüm önbiçimlendirilmiÅŸ cat " +"dosyalarının konumunu yazdır." #. type: Plain text #: ../../man/man1/man.man1:522 @@ -1669,12 +1571,15 @@ msgid "" "separated by a space. If all of B<-w>, B<-W>, and B<-a> are used, then do " "this for each possible match." msgstr "" +"Hem B<-w> ve hem B<-W> kullanılıyorsa o zaman kaynak dosyası ve cat " +"dosyasını bir boÅŸlukla ayırarak yazdır. EÄŸer B<-w>, B<-W> ve B<-a>'nın " +"hepsi kullanılıyorsa bunu her olası eÅŸleÅŸme için yap." #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "" "Bu seçenek genel kullanım amaçlı deÄŸildir ve yalnızca B<%catman%> programı " "tarafından kullanılmalıdır." @@ -1697,7 +1602,7 @@ msgid "" msgstr "" "Elle sayfayı her zamanki gibi biçimlendirmek yerine, kaynaklarını belirtilen " "I<encoding>'ya dönüştürülmüş olarak çıktıla. Kaynak dosyanın kodlamasını " -"zaten biliyorsanız, doÄŸrudan B<%manconv%>(1) deÄŸerini kullanabilirsiniz. " +"zaten biliyorsanız doÄŸrudan B<%manconv%>(1) deÄŸerini kullanabilirsiniz. " "Bununla birlikte, bu seçenek, el ile bir sayfa hiyerarÅŸisine benzer bir " "yapıya zaten kurulmuÅŸ olmaları koÅŸuluyla, birkaç kılavuz sayfasını tek bir " "kodlamaya dönüştürmenizi saÄŸlar; bu kodlamaların her ikisini de açıkça " @@ -1710,6 +1615,8 @@ msgid "" "pages, since it has an interface designed for bulk conversion and so can be " "much faster." msgstr "" +"Birden çok kılavuz sayfasını dönüştürmek yerine B<%man_recode%> kullanın; " +"çünkü toplu dönüştürme için bir arayüzü vardır ve çok daha hızlı olabilir." #. type: SS #: ../../man/man1/man.man1:544 @@ -1719,19 +1626,15 @@ msgstr "Kılavuz sayfalarında arama" #. type: Plain text #: ../../man/man1/man.man1:571 -#, fuzzy -#| msgid "" -#| "If this system has access to other operating system's manual pages, they " -#| "can be accessed using this option. To search for a manual page from " -#| "NewOS's manual page collection, use the option B<-m> B<NewOS>." msgid "" "If this system has access to other operating systems' manual pages, they can " "be accessed using this option. To search for a manual page from NewOS's " "manual page collection, use the option B<-m> B<NewOS>." msgstr "" -"Bu sistemin diÄŸer iÅŸletim sisteminin kılavuz sayfalarına eriÅŸimi varsa, bu " -"seçenek kullanılarak eriÅŸilebilir. NewOS'un kılavuz sayfa koleksiyonundaki " -"bir kılavuz sayfasını aramak için B<-m> B<NewOS> seçeneÄŸini kullanın." +"EÄŸer bu sistemin diÄŸer iÅŸletim sistemlerinin kılavuz sayfalarına eriÅŸimi " +"varsa bu seçeneÄŸi kullanarak eriÅŸebilir. NewOS'in kılavuz sayfası " +"koleksiyonunda bir kılavuz sayfası aramak için B<-m> B<NewOS> seçeneÄŸini " +"kullanın." #. type: Plain text #: ../../man/man1/man.man1:582 @@ -1743,7 +1646,7 @@ msgid "" msgstr "" "Belirtilen I<system>, virgülle sınırlandırılmış iÅŸletim sistemi adlarının " "birleÅŸimi olabilir. Yerel iÅŸletim sisteminin kılavuz sayfalarını aramak " -"için, argüman karakter katarına B<man> sistem adını ekleyin. Bu seçenek, " +"için, argüman karakter dizisine B<man> sistem adını ekleyin. Bu seçenek, " "$B<SYSTEM> çevre deÄŸiÅŸkeninin üzerine yazacaktır." #. type: Plain text @@ -1753,9 +1656,9 @@ msgid "" "derived code to determine the path to search. This option overrides the " "$B<MANPATH> environment variable and causes option B<-m> to be ignored." msgstr "" -"Kullanmak için alternatif bir kılavuz yolu belirtin. Varsayılan olarak, B<" -"%man%>, arama yolunu belirlemek için B<%manpath%> türetilmiÅŸ kodunu " -"kullanır. Bu seçenek $B<MANPATH> ortam deÄŸiÅŸkenini geçersiz kılar ve B<-m> " +"Kullanmak için alternatif bir kılavuz yolu belirtin. Öntanımlı olarak, " +"B<%man%>, arama yolunu belirlemek için B<%manpath%> türetilmiÅŸ kodunu " +"kullanır. Bu seçenek $B<MANPATH> çevre deÄŸiÅŸkenini geçersiz kılar ve B<-m> " "seçeneÄŸinin yoksayılmasına neden olur." #. type: Plain text @@ -1773,27 +1676,22 @@ msgstr "" #. type: TP #: ../../man/man1/man.man1:602 -#, fuzzy, no-wrap -#| msgid "B<-S\\ >I<list>,\\ B<-s\\ >I<list>,\\ B<--sections=>I<list>" +#, no-wrap msgid "B<-S> I<list\\/>, B<-s> I<list\\/>, B<--sections=>I<list\\/>" -msgstr "B<-S\\ >I<list>,\\ B<-s\\ >I<list>,\\ B<--sections=>I<list>" +msgstr "B<-S> I<liste\\/>, B<-s> I<liste\\/>, B<--sections=>I<liste\\/>" #. type: Plain text #: ../../man/man1/man.man1:616 -#, fuzzy -#| msgid "" -#| "List is a colon- or comma-separated list of `order specific' manual " -#| "sections to search. This option overrides the $B<MANSECT> environment " -#| "variable. (The B<-s> spelling is for compatibility with System V.)" msgid "" "The given I<list> is a colon- or comma-separated list of sections, used to " "determine which manual sections to search and in what order. This option " "overrides the $B<MANSECT> environment variable. (The B<-s> spelling is for " "compatibility with System V.)" msgstr "" -"Liste, aranacak `sıralama özel' kılavuz bölümlerin iki nokta üst üste veya " -"virgülle ayrılmış bir listesidir. Bu seçenek, $B<MANSECT> çevre deÄŸiÅŸkenini " -"geçersiz kılar. (B<-s> yazım denetimi System V ile uyumluluk içindir.)" +"Verilen I<liste>, bölümlerin iki nokta veya virgülle ayrılmış, hangi kılavuz " +"bölümlerinin hangi sırada aranacağını belirlemek için kullanılır. Bu " +"seçenek $B<MANSECT> çevre deÄŸiÅŸkenini geçersiz kılar. (B<-s> yazımı System " +"V uyumluluÄŸu içindir.)" #. type: TP #: ../../man/man1/man.man1:616 @@ -1803,21 +1701,6 @@ msgstr "B<-e\\ >I<sub-extension>,\\ B<--extension=>I<sub-extension>" #. type: Plain text #: ../../man/man1/man.man1:650 -#, fuzzy -#| msgid "" -#| "Some systems incorporate large packages of manual pages, such as those " -#| "that accompany the B<Tcl> package, into the main manual page hierarchy. " -#| "To get around the problem of having two manual pages with the same name " -#| "such as B<exit>(3), the B<Tcl> pages were usually all assigned to section " -#| "B<l>. As this is unfortunate, it is now possible to put the pages in the " -#| "correct section, and to assign a specific `extension' to them, in this " -#| "case, B<exit>(3tcl). Under normal operation, B<%man%> will display " -#| "B<exit>(3) in preference to B<exit>(3tcl). To negotiate this situation " -#| "and to avoid having to know which section the page you require resides " -#| "in, it is now possible to give B<%man%> a I<sub-extension> string " -#| "indicating which package the page must belong to. Using the above " -#| "example, supplying the option B<-e\\ tcl> to B<%man%> will restrict the " -#| "search to pages having an extension of B<*tcl>." msgid "" "Some systems incorporate large packages of manual pages, such as those that " "accompany the B<Tcl> package, into the main manual page hierarchy. To get " @@ -1829,33 +1712,34 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." -msgstr "" -"Bazı sistemler, B<Tcl> paketine eÅŸlik edenler gibi, kılavuz sayfalarının " -"büyük paketlerini ana kılavuz sayfa hiyerarÅŸisine dahil eder. B<exit>(3) " -"gibi aynı ada sahip iki kılavuz sayfasına sahip olma sorununu ortadan " -"kaldırmak için, B<Tcl> sayfaları genelde bölüm B<l>'e atanır. Bu talihsiz " -"olduÄŸu için sayfaları doÄŸru bölüme koymak ve onlara belirli bir `uzantı' " -"atamak mümkündür, bu durumda B<exit>(3tcl). Normal çalışma durumunda, B<%man" -"%>, B<exit>(3tcl) yerine B<exit>(3) görüntüleyecektir. Bu durumu müzakere " -"etmek ve hangi bölümün bulunduÄŸunu bilmek zorunda kalmamak için sayfanın " -"hangi pakete ait olduÄŸunu gösteren B<%man%> bir I<sub-extension> karakter " -"dizisi vermek artık mümkün. Yukarıdaki örneÄŸi kullanarak B<%man%> " -"seçeneÄŸine B<-e\\tcl> seçeneÄŸi saÄŸlanırsa, arama B<*tcl> uzantılı sayfalara " -"sınırlanır." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." +msgstr "" +"Bazı sistemler çok fazla sayıda kılavuz sayfası sunarlar; örneÄŸin ana " +"kılavuz sayfası hiyerarÅŸisi ile tümleÅŸen B<Tcl> paketine eÅŸlik edenler " +"gibi. Aynı ada iye iki kılavuz sayfası (örn. B<exit>(3)) sorununu aÅŸmak " +"için, B<Tcl> sayfaları genelde bölüm B<l>'ye atanmışlardır. Artık sayfaları " +"doÄŸru bölüme koymak ve onlara belirli bir \"uzantı\" atamak olanaklıdır; " +"örneÄŸin bu durumda B<exit>(3tcl) olur. OlaÄŸan iÅŸlemde, B<%man%>, " +"B<exit>(3tcl) yerine B<exit>(3) görüntülemeyi tercih eder. Bu sorunun " +"üstesinden gelmek için ve gerek duyduÄŸunuz kılavuz sayfasının hangi bölümde " +"konakladığını bilmeye gerek kalmaması için artık B<%man%>'a sayfanın hangi " +"pakete ait olduÄŸunu belirten bir I<alt-uzantı> vermek olanaklıdır. " +"Yukarıdaki örneÄŸi kullanarak, B<-e\\ tcl> seçeneÄŸini B<%man%>'a vermek sayfa " +"aramasını B<*tcl>'ye sınırlar." #. type: Plain text #: ../../man/man1/man.man1:654 msgid "Ignore case when searching for manual pages. This is the default." msgstr "" -"Kılavuz sayfalarında ararken büyük/küçük harfi önemseme. Varsayılan budur." +"Kılavuz sayfaları ararken BÃœYÃœK/küçük harf duyarsız arama yap. Bu ayar " +"öntanımlıdır." #. type: Plain text #: ../../man/man1/man.man1:657 msgid "Search for manual pages case-sensitively." -msgstr "Kılavuz sayfalarını büyük/küçük harf duyarlı ara." +msgstr "Kılavuz sayfalarını BÃœYÃœK/küçük harf duyarlı ara." #. type: Plain text #: ../../man/man1/man.man1:667 @@ -1865,11 +1749,10 @@ msgid "" "B<apropos>(1). Since there is usually no reasonable way to pick a \"best\" " "page when searching for a regular expression, this option implies B<-a>." msgstr "" -"B<apropos>(1)'de olduÄŸu gibi, tüm sayfaları isimlerinin ya da " -"açıklamalarının herhangi bir parçası olan her I<page> argümanına eÅŸleÅŸen " -"düzenli ifadeler olarak gösterin. Normal bir ifade ararken \"en iyi\" " -"sayfayı seçmek için genellikle makul bir yol bulunmadığından, bu seçenek B<-" -"a> anlamına gelir." +"B<apropos>(1)'de olduÄŸu gibi, tüm sayfaları adlarının ya da açıklamalarının " +"herhangi bir parçası olan her I<page> argümanına eÅŸleÅŸen düzenli ifadeler " +"olarak gösterin. Normal bir ifade ararken \"en iyi\" sayfayı seçmek için " +"genellikle makul bir yol bulunmadığından, bu seçenek B<-a> anlamına gelir." #. type: Plain text #: ../../man/man1/man.man1:682 @@ -1885,7 +1768,7 @@ msgstr "" "kullanarak her sayfanın herhangi bir kısmıyla ya da açıklamaların her " "birinin I<page> argümanıyla eÅŸleÅŸen tüm sayfaları gösterin. I<page> " "bağımsız deÄŸiÅŸkeni tüm ad veya açıklama ile eÅŸleÅŸmeli veya açıklamadaki " -"kelime sınırlarıyla eÅŸleÅŸmelidir. Bir joker karakter ararken bir \"en iyi\" " +"sözcük sınırlarıyla eÅŸleÅŸmelidir. Bir joker karakter ararken bir \"en iyi\" " "sayfa seçmenin makul bir yolu genellikle bulunmadığından, bu seçenek B<-a> " "anlamına gelir." @@ -1895,9 +1778,9 @@ msgid "" "If the B<--regex> or B<--wildcard> option is used, match only page names, " "not page descriptions, as with B<whatis>(1). Otherwise, no effect." msgstr "" -"B<--regex> veya B<--wildcard> seçeneÄŸi kullanılıyorsa, B<whatis>(1)'de " -"olduÄŸu gibi sadece sayfa tanımlarıyla deÄŸil sayfa adlarıyla eÅŸleÅŸir. Aksi " -"takdirde etki yaratmaz." +"B<--regex> veya B<--wildcard> seçeneÄŸi kullanılıyorsa B<whatis>(1)'de olduÄŸu " +"gibi sadece sayfa tanımlarıyla deÄŸil sayfa adlarıyla eÅŸleÅŸir. Aksi takdirde " +"etki yaratmaz." #. type: Plain text #: ../../man/man1/man.man1:699 @@ -1906,8 +1789,8 @@ msgid "" "page it finds. Using this option forces B<%man%> to display all the manual " "pages with names that match the search criteria." msgstr "" -"Varsayılan olarak, bulduÄŸu en uygun kılavuz sayfası görüntüledikten sonra B<" -"%man%> çıkacaktır. Bu seçeneÄŸi kullanmak B<%man%> ögesini, arama " +"Öntanımlı olarak, bulduÄŸu en uygun kılavuz sayfası görüntüledikten sonra " +"B<%man%> çıkacaktır. Bu seçeneÄŸi kullanmak B<%man%> ögesini, arama " "ölçütleriyle eÅŸleÅŸen tüm kılavuz sayfalarını görüntülemeye zorlar." #. type: Plain text @@ -1917,6 +1800,9 @@ msgid "" "manual pages. This is only needed in rare situations, and it is normally " "better to run B<%mandb%>(8) instead." msgstr "" +"Bu seçenek B<%man%>'ın kurulu kılavuz sayfalarının veritabanı önbelleÄŸini " +"güncellemesini saÄŸlar. Bu yalnızca nadir görülen durumlarda gereklidir ve " +"bunun yerine B<%mandb%> kullanmak daha iyidir." #. type: Plain text #: ../../man/man1/man.man1:719 @@ -1928,7 +1814,7 @@ msgid "" "each that can be accessed using similar syntax as would be used to invoke " "the subcommands themselves. For example:" msgstr "" -"Varsayılan olarak, B<%man%>, komut satırında verilen kılavuz sayfa adlarının " +"Öntanımlı olarak, B<%man%>, komut satırında verilen kılavuz sayfa adlarının " "çiftlerini, kısa çizgi veya alt çizgi içeren tek bir kılavuz sayfası adına " "eÅŸdeÄŸer olarak yorumlamaya çalışacaktır. Bu, alt komutların kendilerini " "çağırmak için kullanılacak benzer sözdizimini kullanarak eriÅŸilebilen her " @@ -1951,16 +1837,10 @@ msgstr "BiçimlendirilmiÅŸ çıktı denetleniyor" #: ../../man/man1/man.man1:736 #, no-wrap msgid "B<-P\\ >I<pager>,\\ B<--pager=>I<pager>" -msgstr "B<-P\\ >I<pager>,\\ B<--pager=>I<pager>" +msgstr "B<-P\\ >I<sayfalayıcı>,\\ B<--pager=>I<sayfalayıcı>" #. type: Plain text #: ../../man/man1/man.man1:757 -#, fuzzy -#| msgid "" -#| "Specify which output pager to use. By default, B<%man%> uses B<%pager" -#| "%>. This option overrides the $B<MANPAGER> environment variable, which " -#| "in turn overrides the $B<PAGER> environment variable. It is not used in " -#| "conjunction with B<-f> or B<-k>." msgid "" "Specify which output pager to use. By default, B<%man%> uses B<%pager%>, " "falling back to B<%cat%> if B<%pager%> is not found or is not executable. " @@ -1968,10 +1848,10 @@ msgid "" "overrides the $B<PAGER> environment variable. It is not used in conjunction " "with B<-f> or B<-k>." msgstr "" -"Hangi çıktı sayfalayıcının kullanacağınızı belirtin. Varsayılan olarak, B<" -"%man%>, B<%pager%> kullanıyor. Bu seçenek, ortam deÄŸiÅŸkeni $B<PAGER>'nin " -"üzerine yazılan $B<MANPAGER> ortam deÄŸiÅŸkeninin üzerine yazılır. B<-f> veya " -"B<-k> ile birlikte kullanılmaz." +"Hangi çıktı sayfalayıcısının kullanılacağını belirt. Öntanımlı olarak, " +"B<%man%>, B<%pager%> kullanır ve bulunamazsa veya çalıştırılabilir deÄŸilse " +"B<%cat%>'i yedekte tutar. Bu seçenek, $B<MANPAGER> çevre deÄŸiÅŸkenini " +"geçersiz kılar. B<-f> veya B<-k> ile birlikte kullanılmaz." #. type: Plain text #: ../../man/man1/man.man1:763 ../../man/man1/man.man1:1132 @@ -1984,16 +1864,15 @@ msgid "" msgstr "" "DeÄŸer, basit bir komut adı veya bağımsız deÄŸiÅŸkenler içeren bir komut " "olabilir ve kabuk alıntılama (ters eÄŸik çizgi, tek tırnak veya çift tırnak " -"iÅŸareti) kullanabilir. Birden fazla komutu baÄŸlamak için boruları " -"kullanamaz; buna ihtiyaç duyarsanız, dosyayı bir bağımsız deÄŸiÅŸken olarak " -"veya standart girdi olarak görüntülemek üzere alabilecek bir sarıcı komut " -"dosyası kullanın." +"imi) kullanabilir. Birden fazla komutu baÄŸlamak için boruları kullanamaz; " +"buna ihtiyaç duyarsanız dosyayı bir bağımsız deÄŸiÅŸken olarak veya standart " +"girdi olarak görüntülemek üzere alabilecek bir sarıcı komut dosyası kullanın." #. type: TP #: ../../man/man1/man.man1:763 #, no-wrap msgid "B<-r\\ >I<prompt>,\\ B<--prompt=>I<prompt>" -msgstr "B<-r\\ >I<prompt>,\\ B<--prompt=>I<prompt>" +msgstr "B<-r\\ >I<istem>,\\ B<--prompt=>I<istem>" #. type: Plain text #: ../../man/man1/man.man1:771 @@ -2001,14 +1880,14 @@ msgid "" "If a recent version of B<less> is used as the pager, B<%man%> will attempt " "to set its prompt and some sensible options. The default prompt looks like" msgstr "" -"Sayfalayıcı olarak B<less>in bir son sürümü kullanılıyorsa, B<%man%> " -"istemini ve mantıklı bazı seçeneklerini belirlemeye çalışacaktır. " -"Varsayılan komut istemi şöyle" +"Sayfalayıcı olarak B<less>in bir son sürümü kullanılıyorsa B<%man%> istemini " +"ve mantıklı bazı seçeneklerini belirlemeye çalışacaktır. Öntanımlı komut " +"istemi şöyle" #. type: Plain text #: ../../man/man1/man.man1:773 msgid "B< Manual page>I< name>B<(>I<sec>B<) line>I< x>" -msgstr "B< Manual page>I< name>B<(>I<sec>B<) line>I< x>" +msgstr "B< Kılavuz sayfası>I< ad>B<(>I<saniye>B<) satır>I< x>" #. The default options are #. .BR \-six8 . @@ -2021,7 +1900,7 @@ msgid "" "was found under and I<x> the current line number. This is achieved by using " "the $B<LESS> environment variable." msgstr "" -"burada I<name> klavuz sayfa adını belirtir, I<sec> altındaki bölümü ve I<x> " +"burada I<ad> klavuz sayfa adını belirtir, I<bölüm> altındaki bölümü ve I<x> " "geçerli satır numarasını gösterir. Bu, $B<LESS> çevre deÄŸiÅŸkenini " "kullanarak gerçekleÅŸtirilir." @@ -2031,38 +1910,32 @@ msgstr "" #. rejects the default options or if you prefer a different prompt. #. type: Plain text #: ../../man/man1/man.man1:801 -#, fuzzy -#| msgid "" -#| "Supplying B<-r> with a string will override this default. The string may " -#| "contain the text B<$MAN_PN> which will be expanded to the name of the " -#| "current manual page and its section name surrounded by `(' and `)'. The " -#| "string used to produce the default could be expressed as" msgid "" "Supplying B<-r> with a string will override this default. The string may " "contain the text B<$MAN_PN> which will be expanded to the name of the " "current manual page and its section name surrounded by \"(\" and \")\". The " "string used to produce the default could be expressed as" msgstr "" -"Bir karakter katarı ile B<-r>'nın saÄŸlanması bu varsayılanı geçersiz " -"kılacaktır. Karakter katarı, mevcut kılavuz sayfasının adına geniÅŸletilecek " -"ve bölüm adı da `(' ve `)' ile çevrilecek olan B<$MAN_PN> metnini " -"içerebilir. Varsayılanı üretmek için kullanılan karakter katarı ÅŸu ÅŸekilde " -"ifade edilebilir" +"B<-r>'ı bir dizi ile birlikte vermek bu öntanımlıyı geçersiz kılar. Dizi, " +"geçerli kılavuz sayfasının adına ve \"(\" ve \")\" ile çevrili bölüm adına " +"geniÅŸletilecek B<$MAN_PN> metnini içerebilir. Öntanımlı üretmek için " +"kullanılan dizi ÅŸu ÅŸekilde ifade edilebilir" #. type: Plain text #: ../../man/man1/man.man1:803 msgid "B<\\e\\ Manual\\e\\ page\\e\\ \\e$MAN_PN\\e\\ ?ltline\\e\\ %lt?L/%L.:>" -msgstr "B<\\e\\ Manual\\e\\ page\\e\\ \\e$MAN_PN\\e\\ ?ltline\\e\\ %lt?L/%L.:>" +msgstr "" +"B<\\e\\ Kılavuz\\e\\ sayfası\\e\\ \\e$MAN_PN\\e\\ ?ltsatır\\e\\ %lt?L/%L.:>" #. type: Plain text #: ../../man/man1/man.man1:805 msgid "B<byte\\e\\ %bB?s/%s..?\\e\\ (END):?pB\\e\\ %pB\\e\\e%..>" -msgstr "B<byte\\e\\ %bB?s/%s..?\\e\\ (END):?pB\\e\\ %pB\\e\\e%..>" +msgstr "B<bayt\\e\\ %bB?s/%s..?\\e\\ (END):?pB\\e\\ %pB\\e\\e%..>" #. type: Plain text #: ../../man/man1/man.man1:807 msgid "B<(press h for help or q to quit)>" -msgstr "B<(yardım için h veya çıkmak için q)>" +msgstr "B<(yardım için h'ye veya çıkmak için q'ya basın)>" #. type: Plain text #: ../../man/man1/man.man1:822 @@ -2079,8 +1952,8 @@ msgstr "" "tarafından deÄŸerlendirilir. Komut satırındaki tüm çift tırnak iÅŸaretleri, " "geri tırnak iÅŸaretleri ve ters eÄŸik çizgiler bir önceki ters eÄŸik çizgi ile " "öne çıkartılmalıdır. Komut istemi karakter katarı, less için daha fazla " -"seçenek izleyebilen kaçışlı bir $ ile bitebilir. Varsayılan olarak B<%man" -"%>, B<-ix8> seçeneklerini ayarlar." +"seçenek izleyebilen kaçışlı bir $ ile bitebilir. Öntanımlı olarak B<%man%>, " +"B<-ix8> seçeneklerini ayarlar." #. type: Plain text #: ../../man/man1/man.man1:827 @@ -2088,8 +1961,8 @@ msgid "" "The $B<MANLESS> environment variable described below may be used to set a " "default prompt string if none is supplied on the command line." msgstr "" -"AÅŸağıda açıklanan $B<MANLESS> ortam deÄŸiÅŸkeni, komut satırında hiçbiri " -"saÄŸlanmazsa, bir varsayılan istem karakter katarını ayarlamak için " +"AÅŸağıda açıklanan $B<MANLESS> çevre deÄŸiÅŸkeni, komut satırında hiçbiri " +"saÄŸlanmazsa bir öntanımlı istem karakter katarını ayarlamak için " "kullanılabilir." #. type: Plain text @@ -2104,7 +1977,7 @@ msgid "" "properly when using B<GNU> B<nroff>'s I<latin1>(7) device." msgstr "" "7 bit terminal veya terminal emülatöründe saf bir I<ascii>(7) kılavuz " -"sayfasını görüntülerken, B<GNU> B<nroff> ile I<latin1>(7) cihaz açıklaması " +"sayfasını görüntülerken, B<GNU> B<nroff> ile I<latin1>(7) aygıt açıklaması " "kullanılırken bazı karakterler doÄŸru görüntülenmeyebilir. Bu seçenek saf " "I<ascii> kılavuz sayfalarının I<ascii>'de I<latin1> aygıtıyla " "görüntülenmesine izin verir. Herhangi bir I<latin1> metnini tercüme etmez. " @@ -2146,7 +2019,7 @@ msgstr "tiz vurgu" #: ../../man/man1/man.man1:875 #, no-wrap msgid "multiplication sign" -msgstr "çarpma iÅŸareti" +msgstr "çarpma imi" #. type: Plain text #: ../../man/man1/man.man1:897 @@ -2158,11 +2031,11 @@ msgid "" "description. If the I<latin1> column is missing or corrupt, you may need to " "view manual pages with this option." msgstr "" -"I<latin1> sütun doÄŸru görüntülenirse, terminaliniz I<latin1> karakterleri " +"I<latin1> sütun doÄŸru görüntülenirse terminaliniz I<latin1> karakterleri " "için ayarlanmış olabilir ve bu seçenek gerekli deÄŸildir. I<latin1> ve " -"I<ascii> sütunları aynı ise, bu seçeneÄŸi kullanarak bu sayfayı okuyorsunuz " +"I<ascii> sütunları aynı ise bu seçeneÄŸi kullanarak bu sayfayı okuyorsunuz " "veya B<%man%> bu sayfayı I<latin1> aygıt açıklamasıyla biçimlendirmedi. " -"I<latin1> sütun eksik veya bozuksa, bu seçenekle kılavuz sayfaları " +"I<latin1> sütun eksik veya bozuksa bu seçenekle kılavuz sayfaları " "görüntülemeniz gerekebilir." #. type: Plain text @@ -2178,7 +2051,7 @@ msgstr "" #: ../../man/man1/man.man1:908 #, no-wrap msgid "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>" -msgstr "B<-E\\ >I<encoding>,\\ B<--encoding>=I<encoding>" +msgstr "B<-E\\ >I<kodlama>,\\ B<--encoding>=I<kodlama>" #. type: Plain text #: ../../man/man1/man.man1:919 @@ -2188,8 +2061,8 @@ msgid "" "B<ascii>, B<latin1>, or B<utf8> as well as a true character encoding such as " "B<UTF-8>." msgstr "" -"Varsayılandan farklı bir karakter kodlaması çıktısı oluÅŸturun. Geriye dönük " -"uyumluluk için, I<encoding>, B<ASCII>, B<latin1> veya B<utf8> gibi B<nroff> " +"Öntanımlıdan farklı bir karakter kodlaması çıktısı oluÅŸturun. Geriye dönük " +"uyumluluk için, I<kodlama>, B<ASCII>, B<latin1> veya B<utf8> gibi B<nroff> " "aygıtlarının yanı sıra B<UTF-8> gibi gerçek bir karakter kodlaması olabilir." #. type: Plain text @@ -2201,9 +2074,9 @@ msgid "" "hyphenation, so words will only be hyphenated if they already contain " "hyphens." msgstr "" -"Normalde, B<nroff> satır aralarında, kısa çizgiler içermeyen kelimelerde " +"Normalde, B<nroff> satır aralarında, kısa çizgiler içermeyen sözcüklerde " "bile metinleri otomatik olarak tirelendirir; bunu, aşırı boÅŸluk bırakmadan " -"bir satıra kelimeler yerleÅŸtirmek için yapmak gerekliyse yapar. Bu seçenek " +"bir satıra sözcükler yerleÅŸtirmek için yapmak gerekliyse yapar. Bu seçenek " "otomatik tirelemeyi devre dışı bırakır, bu nedenle sözcükler yalnızca " "tireler içeriyorsa tireleme yapılır." @@ -2217,10 +2090,10 @@ msgid "" "\"\\e%\" at the start of a word to prevent it from being hyphenated." msgstr "" "Kılavuz sayfası yazıyorsanız ve B<nroff>'un uygun olmayan bir noktadaki " -"tirelemesini engellemek istiyorsanız, bu seçeneÄŸi kullanmayın, bunun yerine " +"tirelemesini engellemek istiyorsanız bu seçeneÄŸi kullanmayın, bunun yerine " "B<nroff> belgelerine bakın; örneÄŸin, o noktada tireleyebileceÄŸini belirtmek " -"için bir kelimenin içine \"\\e%\" koyabilir veya tirelenmemesi için bir " -"kelimenin baÅŸlangıcına \"\\e%\" koyabilirsiniz." +"için bir sözcüğün içine \"\\e%\" koyabilir veya tirelenmemesi için bir " +"sözcüğün baÅŸlangıcına \"\\e%\" koyabilirsiniz." #. type: Plain text #: ../../man/man1/man.man1:944 @@ -2239,12 +2112,12 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "Kılavuz sayfası yazıyorsanız ve sadece B<nroff>'un belirli paragraflarının " -"haklı çıkmasını önlemek istiyorsanız, bu seçeneÄŸi kullanmayın, bunun yerine " +"haklı çıkmasını önlemek istiyorsanız bu seçeneÄŸi kullanmayın, bunun yerine " "B<nroff> belgelerine bakın; örneÄŸin, \".na\", \".nf\", \".fi\" ve \".ad\" " "isteklerini geçici olarak ayarlamayı ve doldurmayı devre dışı bırakmak için " "kullanabilirsiniz." @@ -2253,7 +2126,7 @@ msgstr "" #: ../../man/man1/man.man1:951 #, no-wrap msgid "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>" -msgstr "B<-p\\ >I<string>,\\ B<--preprocessor=>I<string>" +msgstr "B<-p\\ >I<dizi>,\\ B<--preprocessor=>I<dizi>" #. type: Plain text #: ../../man/man1/man.man1:970 @@ -2269,7 +2142,7 @@ msgstr "" "sırasını belirtin. Tüm kurulumlar tam öniÅŸlemci setine sahip olmaz. " "ÖniÅŸlemcilerden bazıları ve bunları belirlemek için kullanılan harfler " "ÅŸunlardır: B<eqn> (B<e>), B<grap> (B<g>), B<pic> (B<p>), B<tbl> (B<t>), " -"B<vgrind> (B<v>), B<refer> (B<r>). Bu seçenek, $B<MANROFFSEQ> ortam " +"B<vgrind> (B<v>), B<refer> (B<r>). Bu seçenek, $B<MANROFFSEQ> çevre " "deÄŸiÅŸkeninin üzerine yazılır. B<%zsoelim%> her zaman ilk öniÅŸlemci olarak " "çalıştırılır." @@ -2296,8 +2169,8 @@ msgid "" "Examples (provided with Groff-1.17) include B<dvi>, B<latin1>, B<ps>, " "B<utf8>, B<X75> and B<X100>." msgstr "" -"Bu seçenek, B<groff> (veya muhtemelen B<troff's>) çıktısını, varsayılan " -"dışında bir cihaz için uygun olacak ÅŸekilde deÄŸiÅŸtirmek için kullanılır. " +"Bu seçenek, B<groff> (veya muhtemelen B<troff's>) çıktısını, öntanımlı " +"dışında bir aygıt için uygun olacak ÅŸekilde deÄŸiÅŸtirmek için kullanılır. " "Bu, B<-t> ima eder. Örnekler (Groff-1.17 ile saÄŸlanır) B<dvi>, B<latin1>, " "B<ps>, B<utf8>, B<X75> ve B<X100>'i içerir." @@ -2305,7 +2178,7 @@ msgstr "" #: ../../man/man1/man.man1:992 #, no-wrap msgid "B<-H>[I<browser\\/>], B<--html>[=I<browser\\/>]" -msgstr "B<-H>[I<browser\\/>], B<--html>[=I<browser\\/>]" +msgstr "B<-H>[I<tarayıcı\\/>], B<--html>[=I<tarayıcı\\/>]" #. type: Plain text #: ../../man/man1/man.man1:1008 @@ -2319,8 +2192,8 @@ msgid "" msgstr "" "Bu seçenek B<groff>'un HTML çıktısı üretmesine neden olur ve bu çıktıyı bir " "web tarayıcısında görüntüler. Tarayıcı seçimi, isteÄŸe baÄŸlı bir I<browser> " -"argümanı varsa, $B<BROWSER> ortam deÄŸiÅŸkeni tarafından belirlenir veya " -"ayarlanmamışsa derleme zamanı varsayılanı (genellikle B<lynx>) ile " +"argümanı varsa $B<BROWSER> çevre deÄŸiÅŸkeni tarafından belirlenir veya " +"ayarlanmamışsa derleme zamanı öntanımlıyı (genellikle B<lynx>) ile " "belirlenir. Bu seçenek B<-t> ima eder ve yalnızca B<GNU> B<troff> ile " "çalışır." @@ -2341,9 +2214,9 @@ msgid "" msgstr "" "Bu seçenek B<groff> programının çıktısını grafiksel bir pencerede " "B<gxditview> programıyla gösterir. I<dpi> (inç başına nokta) 75, 75-12, 100 " -"veya 100-12 olabilir, varsayılan olarak 75 olur; -12 varyantları 12 punto " -"baz font kullanır. Bu seçenek, sırasıyla X75, X75-12, X100 veya X100-12 " -"cihazında B<-T> anlamına gelmektedir." +"veya 100-12 olabilir, öntanımlı olarak 75 olur; -12 varyantları 12 punto baz " +"font kullanır. Bu seçenek, sırasıyla X75, X75-12, X100 veya X100-12 " +"aygıtında B<-T> anlamına gelmektedir." #. type: Plain text #: ../../man/man1/man.man1:1038 @@ -2355,7 +2228,7 @@ msgid "" msgstr "" "B<groff>, B<troff> komutunu çalıştırıp seçilen aygıt için uygun çıktı " "üretmek için uygun bir post-iÅŸlemci kullanacaktır. EÄŸer I<%troff%>, " -"B<groff> ise, bu seçenek B<groff>'e geçirilir ve bir post-iÅŸlemcinin " +"B<groff> ise bu seçenek B<groff>'e geçirilir ve bir post-iÅŸlemcinin " "kullanımını bastırır. Bu, B<-t> ima eder." #. type: SS @@ -2374,7 +2247,7 @@ msgstr "Bir alt süreç sıfır-olmayan bir çıkış durumu döndü." msgid "" "At least one of the pages/files/keywords didn't exist or wasn't matched." msgstr "" -"Sayfalar/dosyalar/anahtar kelimelerden en az bir tanesi yok veya uyuÅŸmadı." +"Sayfalar/dosyalar/anahtar sözcüklerden en az bir tanesi yok veya uyuÅŸmadı." #. type: Plain text #: ../../man/man1/man.man1:1071 @@ -2382,7 +2255,7 @@ msgid "" "If $B<MANPATH> is set, its value is used as the path to search for manual " "pages." msgstr "" -"EÄŸer $B<MANPATH> ayarlanmışsa, yolu kılavuz sayfalarını aramak için " +"EÄŸer $B<MANPATH> ayarlanmışsa yolu kılavuz sayfalarını aramak için " "kullanılır." #. type: Plain text @@ -2391,6 +2264,9 @@ msgid "" "Every time B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>), " "it adds the contents of $B<MANROFFOPT> to the formatter's command line." msgstr "" +"B<man>'ın biçimlendiriciyi çağırdığı her zaman (B<nroff>, B<troff> veya " +"B<groff>), $B<MANROFFOPT>'un içeriÄŸini biçimlendiricinin komut satırına " +"ekler." #. type: Plain text #: ../../man/man1/man.man1:1097 @@ -2399,8 +2275,8 @@ msgid "" "preprocessors to pass each manual page through. The default preprocessor " "list is system dependent." msgstr "" -"$B<MANROFFSEQ> ayarlanmışsa, deÄŸeri her kılavuz sayfasını geçmek için " -"öniÅŸlemci kümesini belirlemede kullanılır. Varsayılan öniÅŸlemci listesi " +"$B<MANROFFSEQ> ayarlanmışsa deÄŸeri her kılavuz sayfasını geçmek için " +"öniÅŸlemci kümesini belirlemede kullanılır. Öntanımlı öniÅŸlemci listesi " "sisteme baÄŸlıdır." #. type: Plain text @@ -2411,27 +2287,23 @@ msgid "" "The default is \"%sections%\", unless overridden by the B<SECTION> directive " "in I<%manpath_config_file%>." msgstr "" -"$B<MANSECT> ayarlandıysa, deÄŸeri kolonlarla ayrılmış bir bölüm listesidir ve " +"$B<MANSECT> ayarlandıysa deÄŸeri kolonlarla ayrılmış bir bölüm listesidir ve " "hangi kılavuz bölümlerin hangi sırada bulunacağını belirlemek için " "kullanılır. I<%manpath_config_file%> içindeki B<SECTION> yönergesi " "tarafından geçersiz kılınmadıkça öntanımlı \"% sections%\"dir." #. type: Plain text #: ../../man/man1/man.man1:1126 -#, fuzzy -#| msgid "" -#| "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " -#| "its value is used as the name of the program used to display the manual " -#| "page. By default, B<%pager%> is used." msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" -"$B<MANPAGER> veya $B<PAGER> ayarlanmışsa ($B<MANPAGER> tercihlerde " -"kullanıldı), deÄŸeri kılavız sayfayı görüntülemek için kullanılan programın " -"adı olarak kullanılır. Varsayılan olarak, B<%pager%> kullanılır." +"$B<MANPAGER> veya $B<PAGER> ayarlanmışsa ($B<MANPAGER> yeÄŸlenir) deÄŸeri " +"kılavız sayfayı görüntülemek için kullanılan programın adı olarak " +"kullanılır. Öntanımlı olarak B<%pager%> kullanılır; bulunamazsa veya " +"çalıştırılabilir deÄŸilse B<%cat%> yedekte tutulur." #. type: Plain text #: ../../man/man1/man.man1:1151 @@ -2440,16 +2312,16 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" -"$B<MANLESS> ayarlanırsa, deÄŸeri B<less> sayfalayıcı için varsayılan istem " +"$B<MANLESS> ayarlanırsa deÄŸeri B<less> sayfalayıcı için öntanımlı istem " "karakter katarı olarak kullanılır, sanki B<-r> seçeneÄŸini kullanarak " "geçirilmiÅŸ gibi olur (böylece B<$ MAN_PN> aynı ÅŸekilde geniÅŸletilecektir). " "ÖrneÄŸin, istem karakter katarını koÅŸulsuz olarak \\(lqbenim istem karater " -"katarım\\(rq olarak ayarlamak istiyorsanız, $B<MANLESS>'i \\(oqB<-Psbenim\\ " +"katarım\\(rq olarak ayarlamak istiyorsanız $B<MANLESS>'i \\(oqB<-Psbenim\\ " "istem\\ karakter katarım>\\(cq olarak ayarlayın. B<-r> seçeneÄŸini kullanmak " -"bu ortam deÄŸiÅŸkenini geçersiz kılar." +"bu çevre deÄŸiÅŸkenini geçersiz kılar." #. type: Plain text #: ../../man/man1/man.man1:1167 @@ -2457,15 +2329,15 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" -"$B<BROWSER> deÄŸeri ayarlanmışsa, deÄŸeri her biri iki nokta üst üste ile " +"$B<BROWSER> deÄŸeri ayarlanmışsa deÄŸeri her biri iki nokta üst üste ile " "ayrılmış komut listesidir ve bunların her biri sırasıyla B<man> B<--html> " -"için bir web tarayıcısı baÅŸlatmaya çalışmak için kullanılır. Her komutta, I<" -"%s>, B<groff>'dan HTML çıktısını içeren bir dosya adı ile deÄŸiÅŸtirilir; I<%" -"%> yerine tek bir yüzde iÅŸareti (%) gelir ve I<%c>, bir kolon (:) tarafından " -"deÄŸiÅŸtirilir." +"için bir web tarayıcısı baÅŸlatmaya çalışmak için kullanılır. Her komutta, " +"I<%s>, B<groff>'dan HTML çıktısını içeren bir dosya adı ile deÄŸiÅŸtirilir; I<%" +"%> yerine tek bir yüzde iÅŸareti (%) gelir ve I<%c>, bir iki nokta (:) " +"tarafından deÄŸiÅŸtirilir." #. type: Plain text #: ../../man/man1/man.man1:1190 @@ -2477,7 +2349,7 @@ msgid "" "they will become obsolete. N.B. All spaces that should be interpreted as " "part of an option's argument must be escaped." msgstr "" -"$B<MANOPT> ayarlanmışsa, B<%man%'s> komut satırından önce ayrıştırılır ve " +"$B<MANOPT> ayarlanmışsa B<%man%'s> komut satırından önce ayrıştırılır ve " "benzer bir biçimde olması beklenir. DiÄŸer B<%man%> özgül çevre deÄŸiÅŸkenleri " "komut satırı seçenekleri olarak ifade edilebilir ve bu nedenle $B<MANOPT>'ye " "dahil olmanın adayları oldukları için bunların geçersiz sayılacakları " @@ -2486,15 +2358,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1204 -#, fuzzy -#| msgid "" -#| "If $B<MANWIDTH> is set, its value is used as the line length for which " -#| "manual pages should be formatted. If it is not set, manual pages will be " -#| "formatted with a line length appropriate to the current terminal (using " -#| "the value of $B<COLUMNS>, an B<ioctl>(2) if available, or falling back " -#| "to 80 characters if neither is available). Cat pages will only be saved " -#| "when the default formatting can be used, that is when the terminal line " -#| "length is between 66 and 80 characters." msgid "" "If $B<MANWIDTH> is set, its value is used as the line length for which " "manual pages should be formatted. If it is not set, manual pages will be " @@ -2504,13 +2367,12 @@ msgid "" "default formatting can be used, that is when the terminal line length is " "between 66 and 80 characters." msgstr "" -"$B<MANWIDTH> ayarlıysa, deÄŸeri kılavuz sayfalarının biçimlendirilmesi " -"gereken satır uzunluÄŸu olarak kullanılır. Ayarlanmazsa, kılavuz sayfaları " -"mevcut terminale uygun bir satır uzunluÄŸuyla biçimlendirilir (mevcutsa, " -"$B<COLUMNS> deÄŸerini kullanarak, bir B<ioctl>(2) kullanabilir veya ikisi de " -"yoksa 80 karaktere geri düşecektir). Cat sayfaları yalnızca, varsayılan " -"biçimlendirme kullanılabilir olduÄŸunda, yani terminal çizgisi uzunluÄŸu 66 " -"ile 80 karakter arasında olduÄŸunda kaydedilir." +"$B<MANWIDTH> ayarlıysa deÄŸeri kılavuz sayfalarının biçimlendirilmesi gereken " +"satır uzunluÄŸu olarak kullanılır. Ayarlanmamışsa kılavuz sayfaları mevcut " +"uçbirime uygun bir satır uzunluÄŸuyla biçimlendirilir (varsa $B<COLUMNS> veya " +"B<ioctl>(2) kullanabilir; ikisi de yoksa 80 karaktere geri düşecektir). Cat " +"sayfaları yalnızca, öntanımlı biçimlendirme kullanılabilir olduÄŸunda, yani " +"uçbirim çizgisi uzunluÄŸu 66 ile 80 karakter arasında olduÄŸunda kaydedilir." #. type: Plain text #: ../../man/man1/man.man1:1215 @@ -2525,7 +2387,7 @@ msgstr "" "Normalde, çıktı bir terminale yönlendirilmediÄŸinde (dosya ya da boru gibi), " "biçimlendirme karakterleri, özel araçlar olmadan sonucu okumayı " "kolaylaÅŸtırmak için atılır. Bununla birlikte, $B<MAN_KEEP_FORMATTING> boÅŸ " -"olmayan herhangi bir deÄŸere ayarlanırsa, bu biçimlendirme karakterleri " +"olmayan herhangi bir deÄŸere ayarlanırsa bu biçimlendirme karakterleri " "korunur. Bu, biçimlendirme karakterlerini yorumlayabilen B<%man%> " "çevresindeki sarmalayıcılar için yararlı olabilir." @@ -2547,9 +2409,9 @@ msgstr "" "ekranına müdahale etmekten kaçınmak için atılır. B<groff> gibi programlar " "genellikle, kılavuz sayfası ile birlikte görüntülendiÄŸinde, çirkin olan ve " "genel olarak kafa karıştırıcı olan zayıf hizalama gibi tipografik sorunlar " -"hakkında nispeten küçük hata mesajları üretir. Bununla birlikte, bazı " +"hakkında nispeten küçük hata iletileri üretir. Bununla birlikte, bazı " "kullanıcılar bunları yine de görmek istiyor, bu nedenle, $B<MAN_KEEP_STDERR> " -"boÅŸ olmayan herhangi bir deÄŸere ayarlanırsa, hata çıkışı her zamanki gibi " +"boÅŸ olmayan herhangi bir deÄŸere ayarlanırsa hata çıkışı her zamanki gibi " "görüntülenir." #. type: Plain text @@ -2561,21 +2423,30 @@ msgid "" "unrelated to the content of the page being displayed, you can set " "$B<MAN_DISABLE_SECCOMP> to any non-empty value to disable the sandbox." msgstr "" +"Linux üzerinde, B<%man%> normalde güvenilmeyen veriyi iÅŸleyen alt süreçleri " +"bir B<seccomp>(2) kum havuzu kullanarak sınırlar. Bu, karmaşık ayrıştırma " +"kodunu geliÅŸigüzel kılavuz sayfaları üzerinde çalıştırmayı daha güvenli " +"yapar. EÄŸer bu, görüntülenen kılavuz sayfasının içeriÄŸinden bağımsız bir " +"biçimde yanlış giderse kum havuzunu devre dışı bırakmak için " +"$B<MAN_DISABLE_SECCOMP>'u ayarlayabilirsiniz." #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" +"EÄŸer $B<PIPELINE_DEBUG> çevre deÄŸiÅŸkeni \"1\"e ayarlanırsa o halde B<%man%>, " +"çalıştırdığı her alt süreci standart hata'ya hata ayıklama iletileri " +"yazdıracaktır." #. type: Plain text #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "Sisteme ve uygulamaya baÄŸlı olarak, $B<LANG> ve $B<LC_MESSAGES> " @@ -2600,6 +2471,8 @@ msgid "" "Documentation for some packages may be available in other formats, such as " "B<info>(1) or HTML." msgstr "" +"Kimi paketlerin belgelendirmesi baÅŸka biçimlerde kullanılabilir olabilir; " +"örneÄŸin B<info>(1) veya HTML." #. type: SH #: ../../man/man1/man.man1:1284 @@ -2626,18 +2499,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1293 -#, fuzzy -#| msgid "" -#| "30th April 1994 \\(en 23rd February 2000: Wilf. (G.Wilford@ee.surrey.ac." -#| "uk) has been developing and maintaining this package with the help of a " -#| "few dedicated people." msgid "" "30th April 1994 \\(en 23rd February 2000: Wilf.\\& (G.Wilford@ee.surrey.ac." "uk) has been developing and maintaining this package with the help of a few " "dedicated people." msgstr "" -"30 Nisan 1994 \\(en 23 Åžubat 2000: Wilf. (G.Wilford@ee.surrey.ac.uk) bu " -"paketi bir kaç gönüllü kiÅŸinin yardımı ile geliÅŸtiriyor ve sürdürüyor." +"30 Nisan 1994 \\(en 23 Åžubat 2000: Wilf.\\& (G.Wilford@ee.surrey.ac.uk), bu " +"paketi birkaç kendini adamış kiÅŸiyle birlikte geliÅŸtiriyor ve ayakta tutuyor." #. type: Plain text #: ../../man/man1/man.man1:1297 @@ -2647,8 +2515,8 @@ msgid "" "Debian project, with the help of all the community." msgstr "" "30 Ekim 1996 \\(en 30 Mart 2001: Fabrizio Polacco E<lt>fpolacco@debian." -"orgE<gt>) bu paketi Debian projesi için bütün topluluÄŸun yardımıyla sürdürdü " -"ve geliÅŸtirdi." +"orgE<gt>), bu paketi Debian projesi için bütün topluluÄŸun yardımıyla " +"sürdürdü ve geliÅŸtirdi." #. type: Plain text #: ../../man/man1/man.man1:1300 @@ -2656,28 +2524,22 @@ msgid "" "31st March 2001 \\(en present day: Colin Watson E<lt>cjwatson@debian." "orgE<gt> is now developing and maintaining man-db." msgstr "" -"31 Mart 2001 \\(en bugünkü gün: Colin Watson E<lt>cjwatson@debian.orgE<gt> " +"31 Mart 2001 \\(en bugünkü gün: Colin Watson E<lt>cjwatson@debian.orgE<gt>, " "ÅŸimdi man-db'yi geliÅŸtiriyor ve sürdürüyor." #. type: Plain text #: ../../man/man1/man-recode.man1:12 -#, fuzzy -#| msgid "%manconv% - convert manual page from one encoding to another" msgid "%man_recode% - convert manual pages to another encoding" -msgstr "%manconv% - kılavuz sayfasını bir kodlamadan diÄŸerine dönüştürü" +msgstr "%man_recode% - kılavuz sayfalarını baÅŸka bir kodlamaya dönüştür" #. type: Plain text #: ../../man/man1/man-recode.man1:20 -#, fuzzy -#| msgid "" -#| "B<%manconv%> B<-f> I<from-code>\\|[:I<from-code>\\|.\\|.\\|.] B<-t> I<to-" -#| "code> [\\|B<-dqhV>\\|] [\\|I<filename>\\|]" msgid "" "B<%man_recode%> B<-t> I<to-code> {\\|B<--suffix=>I<suffix\\/>\\||\\|B<--in-" "place>\\|} [\\|B<-dqhV>\\|] [\\|I<filename>\\|]" msgstr "" -"B<%manconv%> B<-f> I<from-code>\\|[:I<from-code>\\|.\\|.\\|.] B<-t> I<to-" -"code> [\\|B<-dqhV>\\|] [\\|I<filename>\\|]" +"B<%man_recode%> B<-t> I<to-code> {\\|B<--suffix=>I<sonek\\/>\\||\\|B<--in-" +"place>\\|} [\\|B<-dqhV>\\|] [\\|I<dosyaadı>\\|]" #. type: Plain text #: ../../man/man1/man-recode.man1:32 @@ -2690,27 +2552,29 @@ msgid "" "program is much faster than running B<%man% --recode> or B<%manconv%> on " "each page." msgstr "" +"B<%man_recode%>, çoklu kılavuz sayfalarını bir kodlamadan baÅŸkasına herbiri " +"için uygun girdi kodlamasını tahmin ederek dönüştürür. Eski bir karakter " +"kümesinde kodlanmış sayfaları yeniden kodlarken veya bir sayfa kümesini tek " +"bir ortak kodlamaya (genellikle UTF-8) kurulum için kodlaması gereken yapı " +"sistemlerinde yararlıdır. Bu program, çok sayıda kılavuz sayfasını " +"dönüştürürken her bir sayfada B<%man% --recode> veya B<%manconv%> " +"çalıştırılırsa çok daha hızlı iÅŸler." #. type: Plain text #: ../../man/man1/man-recode.man1:36 -#, fuzzy -#| msgid "" -#| "If an encoding declaration is found on the first line of the manual page, " -#| "that declaration overrides any input encodings specified on B<%manconv" -#| "%>'s command line. Encoding declarations have the following form:" msgid "" "If an encoding declaration is found on the first line of a manual page, then " "that declaration is used as the input encoding for that page. Failing that, " "the input encoding is guessed based on the file name." msgstr "" -"Kılavuz sayfasının ilk satırında bir kodlama bildirimi bulunursa, bu " -"bildirim B<%manconv%> komut satırında belirtilen tüm kodlamaları geçersiz " -"kılar. Kodlama bildirimleri ÅŸu ÅŸekildedir:" +"Kılavuz sayfasının ilk satırında bir kodlama beyanı bulunursa o beyan o " +"sayfa için girdi kodlaması olarak kullanılır. Yapılamazsa girdi kodlaması " +"dosya adına bakılarak tahmin edilmeye çalışılır." #. type: Plain text #: ../../man/man1/man-recode.man1:38 msgid "Encoding declarations have the following form:" -msgstr "" +msgstr "Kodlama beyanları ÅŸu biçimlidir:" #. type: Plain text #: ../../man/man1/man-recode.man1:46 ../../man/man1/manconv.man1:44 @@ -2719,23 +2583,20 @@ msgstr "veya (kılavuz sayfası öniÅŸlemcileri de bildirilecekse):" #. type: TP #: ../../man/man1/man-recode.man1:53 -#, fuzzy, no-wrap -#| msgid "B<-t> I<encoding>, B<--to-code> I<encoding>" +#, no-wrap msgid "B<-t> I<encoding\\/>, B<--to-code=>I<encoding>" -msgstr "B<-t> I<encoding>, B<--to-code> I<encoding>" +msgstr "B<-t> I<kodlama\\/>, B<--to-code=>I<kodlama>" #. type: Plain text #: ../../man/man1/man-recode.man1:57 -#, fuzzy -#| msgid "Convert the manual page to I<encoding>." msgid "Convert manual pages to I<encoding>." -msgstr "Kılavız sayfasını I<encoding>'a dönüştür." +msgstr "Kılavuz sayfalarını I<kodlama>'ya dönüştür." #. type: TP #: ../../man/man1/man-recode.man1:57 #, no-wrap msgid "B<--suffix=>I<suffix>" -msgstr "" +msgstr "B<--suffix=>I<sonek>" #. type: Plain text #: ../../man/man1/man-recode.man1:62 @@ -2743,6 +2604,8 @@ msgid "" "Form each output file name by appending I<suffix> to the input file name, " "after removing any compression extension." msgstr "" +"Her bir çıktı satırını girdi dosyası adına herhangi bir sıkıştırma " +"uzantısını kaldırdıktan sonra I<sonek> iliÅŸtirerek oluÅŸtur." #. type: Plain text #: ../../man/man1/man-recode.man1:66 @@ -2750,11 +2613,13 @@ msgid "" "Overwrite each input file with the output, after removing any compression " "extension." msgstr "" +"Herhangi bir sıkıştırma uzantısını kaldırdıktan sonra her girdi dosyasının " +"üzerine çıktıyı yaz." #. type: Plain text #: ../../man/man1/man-recode.man1:69 ../../man/man1/manconv.man1:64 msgid "Do not issue error messages when the page cannot be converted." -msgstr "Sayfa dönüştürülemediÄŸinde hata mesajları verme." +msgstr "Sayfa dönüştürülemediÄŸinde hata iletileri verme." #. type: Plain text #: ../../man/man1/manconv.man1:12 @@ -2763,16 +2628,12 @@ msgstr "%manconv% - kılavuz sayfasını bir kodlamadan diÄŸerine dönüştürü #. type: Plain text #: ../../man/man1/manconv.man1:20 -#, fuzzy -#| msgid "" -#| "B<%manconv%> B<-f> I<from-code>\\|[:I<from-code>\\|.\\|.\\|.] B<-t> I<to-" -#| "code> [\\|B<-dqhV>\\|] [\\|I<filename>\\|]" msgid "" "B<%manconv%> B<-f> [\\|I<from-code>\\|[:I<from-code>\\|.\\|.\\|.]\\|] B<-t> " "I<to-code> [\\|B<-dqhV>\\|] [\\|I<filename>\\|]" msgstr "" -"B<%manconv%> B<-f> I<from-code>\\|[:I<from-code>\\|.\\|.\\|.] B<-t> I<to-" -"code> [\\|B<-dqhV>\\|] [\\|I<filename>\\|]" +"B<%manconv%> B<-f> [\\|I<koddan>\\|[:I<koddan>\\|.\\|.\\|.]\\|] B<-t> " +"I<koda> [\\|B<-dqhV>\\|] [\\|I<dosyaadı>\\|]" #. type: Plain text #: ../../man/man1/manconv.man1:30 @@ -2796,40 +2657,37 @@ msgid "" "that declaration overrides any input encodings specified on B<%manconv%>'s " "command line. Encoding declarations have the following form:" msgstr "" -"Kılavuz sayfasının ilk satırında bir kodlama bildirimi bulunursa, bu " -"bildirim B<%manconv%> komut satırında belirtilen tüm kodlamaları geçersiz " -"kılar. Kodlama bildirimleri ÅŸu ÅŸekildedir:" +"Kılavuz sayfasının ilk satırında bir kodlama bildirimi bulunursa bu bildirim " +"B<%manconv%> komut satırında belirtilen tüm kodlamaları geçersiz kılar. " +"Kodlama bildirimleri ÅŸu ÅŸekildedir:" #. type: TP #: ../../man/man1/manconv.man1:51 #, no-wrap msgid "B<-f> I<encodings>, B<--from-code> I<encodings>" -msgstr "B<-f> I<encodings>, B<--from-code> I<encodings>" +msgstr "B<-f> I<kodlamalar>, B<--from-code> I<kodlamalar>" #. type: Plain text #: ../../man/man1/manconv.man1:57 -#, fuzzy -#| msgid "" -#| "Try each of I<encodings> (a colon-separated list) in sequence as the " -#| "input encoding." msgid "" "Try each of I<encodings> (a colon-separated list) in sequence as the input " "encoding. The default is to guess likely input encodings based on the file " "name." msgstr "" -"Her bir I<encodings>'yı (iki nokta üst üstlıkla ayrılmış bir liste) giriÅŸ " -"kodlaması olarak sırayla deneyin." +"Her bir I<encodings>'yı (iki nokta ile ayrılmış bir liste) girdi kodlaması " +"olarak sırayla deneyin. Öntanımlı ayar, kodlamayı dosya adına bakarak " +"tahmin etmektir." #. type: TP #: ../../man/man1/manconv.man1:57 #, no-wrap msgid "B<-t> I<encoding>, B<--to-code> I<encoding>" -msgstr "B<-t> I<encoding>, B<--to-code> I<encoding>" +msgstr "B<-t> I<kodlama>, B<--to-code> I<kodlama>" #. type: Plain text #: ../../man/man1/manconv.man1:61 msgid "Convert the manual page to I<encoding>." -msgstr "Kılavız sayfasını I<encoding>'a dönüştür." +msgstr "Kılavız sayfasını I<kodlama>'ya dönüştür." #. type: Plain text #: ../../man/man1/manpath.man1:16 @@ -2842,7 +2700,7 @@ msgid "" "B<%manpath%> [\\|B<-qgdc?V>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] " "[\\|B<-C> I<file>\\|]" msgstr "" -"B<%manpath%> [\\|B<-qgdc?V>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] " +"B<%manpath%> [\\|B<-qgdc?V>\\|] [\\|B<-m> I<sistem>\\|[\\|,.\\|.\\|.\\|]\\|] " "[\\|B<-C> I<file>\\|]" #. type: Plain text @@ -2852,25 +2710,20 @@ msgid "" "issue a warning. If not, B<%manpath%> will determine a suitable manual page " "hierarchy search path and display the results." msgstr "" -"$B<MANPATH> ayarlıysa, B<%manpath%> yalnızca içeriÄŸini görüntüler ve bir " -"uyarı yayınlar. DeÄŸilse, B<%manpath%> uygun bir kılavuz sayfa hiyerarÅŸisi " +"$B<MANPATH> ayarlıysa B<%manpath%> yalnızca içeriÄŸini görüntüler ve bir " +"uyarı yayınlar. DeÄŸilse B<%manpath%> uygun bir kılavuz sayfa hiyerarÅŸisi " "arama yolunu belirleyecek ve sonuçları gösterecektir." #. type: Plain text #: ../../man/man1/manpath.man1:38 -#, fuzzy -#| msgid "" -#| "The colon-delimited path is determined using information gained from the " -#| "man-db configuration file - (I<%manpath_config_file%>) and the user's " -#| "environment." msgid "" "The colon-delimited path is determined using information gained from the man-" "db configuration file \\(en (I<%manpath_config_file%>) and the user's " "environment." msgstr "" -"Ä°ki nokta üstüste ile ayrılmış yol, man-db yapılandırma dosyasından - (I<" -"%manpath_config_file%>) elde edilen bilgiler ve kullanıcının ortamı " -"kullanılarak belirlenir." +"Ä°ki nokta üstüste ile sınırlandırılmış yol, man-db yapılandırma dosyasından " +"\\(en (I<%manpath_config_file%>) elde edilen bilgiler ve kullanıcının " +"çevresi kullanılarak belirlenir." #. type: Plain text #: ../../man/man1/manpath.man1:42 @@ -2889,30 +2742,21 @@ msgstr "" # #. type: Plain text #: ../../man/man1/manpath.man1:54 -#, fuzzy -#| msgid "" -#| "Produce a manpath consisting of all paths named as `global' within the " -#| "man-db configuration file." msgid "" "Produce a manpath consisting of all paths named as \"global\" within the man-" "db configuration file." msgstr "" -"Man-db yapılandırma dosyası içerisinde `global' olarak adlandırılan tüm " -"yollardan oluÅŸan bir kılavuz yolu üretin." +"man-db yapılandırma dosyasındaki tüm \"global\" adlı yolların tümünden " +"oluÅŸturulmuÅŸ bir manpath oluÅŸtur." #. type: Plain text #: ../../man/man1/manpath.man1:63 -#, fuzzy -#| msgid "" -#| "If this system has access to other operating system's manual hierarchies, " -#| "this option can be used to include them in the output of B<%manpath%>. " -#| "To include NewOS's manual page hierarchies use the option B<-m> B<NewOS>." msgid "" "If this system has access to other operating systems' manual hierarchies, " "this option can be used to include them in the output of B<%manpath%>. To " "include NewOS's manual page hierarchies use the option B<-m> B<NewOS>." msgstr "" -"Bu sistemin diÄŸer iÅŸletim sisteminin kılavuz hiyerarÅŸilerine eriÅŸimi varsa, " +"Bu sistemin diÄŸer iÅŸletim sisteminin kılavuz hiyerarÅŸilerine eriÅŸimi varsa " "bu seçenek B<%manpath%>'in çıktısına dahil etmek için kullanılabilir. " "NewOS'un kılavuz sayfası hiyerarÅŸilerini eklemek için B<-m> B<NewOS> " "seçeneÄŸini kullanın." @@ -2928,7 +2772,7 @@ msgstr "" "Belirtilen I<system>, virgülle sınırlandırılmış iÅŸletim sistemi adlarının " "birleÅŸimi olabilir. Yerel iÅŸletim sisteminin kılavuz sayfası " "hiyerarÅŸilerini eklemek için, sistem adı B<man>, argüman karakter katarına " -"eklenmelidir. Bu seçenek, $B<SYSTEM> ortam deÄŸiÅŸkenini geçersiz kılacaktır." +"eklenmelidir. Bu seçenek, $B<SYSTEM> çevre deÄŸiÅŸkenini geçersiz kılacaktır." #. type: Plain text #: ../../man/man1/manpath.man1:95 @@ -2936,6 +2780,8 @@ msgid "" "If $B<MANPATH> is set, B<%manpath%> displays its value rather than " "determining it on the fly." msgstr "" +"$B<MANPATH> ayarlanmışsa B<%manpath%> deÄŸerini yolda giderken belirlemek " +"yerine olan deÄŸerini görüntüler." #. type: Plain text #: ../../man/man1/whatis.man1:15 @@ -2945,13 +2791,14 @@ msgstr "%whatis% - tek satır kılavuz sayfası tanımı görüntüler" #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<liste>\\|] [\\|B<-m> I<sistem>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<yol>\\|] [\\|B<-L> I<yerel>\\|] [\\|B<-C> I<dosya>\\|] I<ad> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -2971,24 +2818,24 @@ msgid "" "Using these options, it may be necessary to quote the I<name> or escape " "(\\e) the special characters to stop the shell from interpreting them." msgstr "" -"I<name>, joker karakterler (B<-w>) içerebilir veya düzenli bir ifade " +"I<ad>, joker karakterler (B<-w>) içerebilir veya düzenli bir ifade " "olabilir (B<-r>). Bu seçenekleri kullanarak, kabuÄŸun yorumlanmasını " -"durdurmak için I<name>'i tırnaklamak veya özel karakterlerden kaçırmak (\\e) " +"durdurmak için I<ad>'ı tırnaklamak veya özel karakterlerden kaçırmak (\\e) " "gerekebilir." #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" msgstr "" -"B<index> veritabanları arama sırasında kullanılır ve B<%mandb%> programı " +"B<indeks> veritabanları arama sırasında kullanılır ve B<%mandb%> programı " "tarafından güncellenir. Yüklemenize baÄŸlı olarak bu, periyodik bir cron iÅŸi " "ile çalıştırılabilir veya yeni kılavuz sayfaları yüklendikten sonra elle " -"çalıştırılması gerekebilir. Göreceli B<index> veritabanından eski bir stil " +"çalıştırılması gerekebilir. Göreceli B<indeks> veritabanından eski bir stil " "metin B<whatis> veritabanını üretmek için ÅŸu komutu çalıştırın:" #. type: Plain text @@ -3009,10 +2856,10 @@ msgid "" "part of a page name, a match will be made. This option causes B<%whatis%> " "to be somewhat slower due to the nature of database searches." msgstr "" -"Her I<name> ögesini düzenli bir ifade olarak yorumla. Bir I<name>, bir " -"sayfa adının herhangi bir bölümüyle eÅŸleÅŸirse, bir eÅŸleÅŸme yapılır. Bu " -"seçenek, veritabanı aramalarının niteliÄŸinden dolayı B<%whatis%>'in biraz " -"daha yavaÅŸ olmasına neden olur." +"Her I<ad> ögesini düzenli bir ifade olarak yorumla. Bir I<ad>, bir sayfa " +"adının herhangi bir bölümüyle eÅŸleÅŸirse bir eÅŸleÅŸme yapılır. Bu seçenek, " +"veritabanı aramalarının niteliÄŸinden dolayı B<%whatis%>'in biraz daha yavaÅŸ " +"olmasına neden olur." #. type: Plain text #: ../../man/man1/whatis.man1:100 @@ -3022,26 +2869,21 @@ msgid "" "option causes B<%whatis%> to be somewhat slower due to the nature of " "database searches." msgstr "" -"Her I<name> ögesini kabuk stili joker karakterlerini içeren bir desen olarak " -"yorumla. Bir eÅŸleÅŸme için, geniÅŸletilmiÅŸ bir I<name> tüm sayfa adıyla " -"eÅŸleÅŸmelidir. Bu seçenek, veritabanı aramalarının niteliÄŸinden dolayı B<" -"%whatis%>'in biraz daha yavaÅŸ olmasına neden olur." +"Her I<ad> ögesini kabuk stili joker karakterlerini içeren bir desen olarak " +"yorumla. Bir eÅŸleÅŸme için, geniÅŸletilmiÅŸ bir I<ad> tüm sayfa adıyla " +"eÅŸleÅŸmelidir. Bu seçenek, veritabanı aramalarının niteliÄŸinden dolayı " +"B<%whatis%>'in biraz daha yavaÅŸ olmasına neden olur." #. type: Plain text #: ../../man/man1/whatis.man1:131 -#, fuzzy -#| msgid "" -#| "If this system has access to other operating system's manual page names, " -#| "they can be accessed using this option. To search NewOS's manual page " -#| "names, use the option B<-m> B<NewOS>." msgid "" "If this system has access to other operating systems' manual page names, " "they can be accessed using this option. To search NewOS's manual page " "names, use the option B<-m> B<NewOS>." msgstr "" -"Bu sistemin diÄŸer iÅŸletim sisteminin kılavuz sayfa adlarına eriÅŸimi varsa, " -"bu seçenek kullanılarak eriÅŸilebilir. NewOS'un kılavuz sayfa adlarını " -"aramak için B<-m> B<NewOS> seçeneÄŸini kullanın." +"Bu sistemin diÄŸer iÅŸletim sisteminin kılavuz sayfa adlarına eriÅŸimi varsa bu " +"seçenek kullanılarak eriÅŸilebilir. NewOS'un kılavuz sayfa adlarını aramak " +"için B<-m> B<NewOS> seçeneÄŸini kullanın." #. type: Plain text #: ../../man/man1/whatis.man1:142 @@ -3051,10 +2893,10 @@ msgid "" "page names, include the system name B<man> in the argument string. This " "option will override the $B<SYSTEM> environment variable." msgstr "" -"Belirtilen I<system>, virgülle ayrılmış iÅŸletim sistemi adlarının birleÅŸimi " +"Belirtilen I<sistem>, virgülle ayrılmış iÅŸletim sistemi adlarının birleÅŸimi " "olabilir. Yerel iÅŸletim sisteminin kılavuz sayfa adlarını aramak için, " "argüman karakter katarına B<man> sistem adını ekleyin. Bu seçenek, " -"$B<SYSTEM> ortam deÄŸiÅŸkeninin üzerine yazılır." +"$B<SYSTEM> çevre deÄŸiÅŸkeninin üzerine yazılır." #. type: Plain text #: ../../man/man1/zsoelim.man1:15 @@ -3064,7 +2906,7 @@ msgstr "%zsoelim% - roff girdisindeki .so istekleri yerine getir" #. type: Plain text #: ../../man/man1/zsoelim.man1:20 msgid "B<%zsoelim%> [\\|B<-CVh>\\|] [\\|I<file> \\&.\\|.\\|.\\|]" -msgstr "B<%zsoelim%> [\\|B<-CVh>\\|] [\\|I<file> \\&.\\|.\\|.\\|]" +msgstr "B<%zsoelim%> [\\|B<-CVh>\\|] [\\|I<dosya> \\&.\\|.\\|.\\|]" #. type: Plain text #: ../../man/man1/zsoelim.man1:26 @@ -3072,13 +2914,13 @@ msgid "" "B<%zsoelim%> parses I<file> arguments, or if none are specified, its " "standard input for lines of the form:" msgstr "" -"B<%zsoelim%>, I<file> bağımsız deÄŸiÅŸkenlerini ayrıştırır veya hiçbiri " -"belirtilmezse, formun satırları için standart girdisini alır:" +"B<%zsoelim%>, I<dosya> bağımsız deÄŸiÅŸkenlerini ayrıştırır veya hiçbiri " +"belirtilmezse formun satırları için standart girdisini alır:" #. type: Plain text #: ../../man/man1/zsoelim.man1:29 msgid "B<.so> E<lt>\\|I<filename>\\|E<gt>" -msgstr "B<.so> E<lt>\\|I<filename>\\|E<gt>" +msgstr "B<.so> E<lt>\\|I<dosyaadı>\\|E<gt>" #. type: Plain text #: ../../man/man1/zsoelim.man1:48 @@ -3090,11 +2932,11 @@ msgid "" "a compressed file, this file is decompressed using an appropriate " "decompressor and its output is used to satisfy the request." msgstr "" -"Bu isteklerin yerini, belirtilen I<filename> içeriÄŸi alır. Ä°stek " -"karşılanamazsa, B<%zsoelim%> I<filename.ext> arar; burada I<.ext>, B<.gz>, " +"Bu isteklerin yerini, belirtilen I<dosyaadı> içeriÄŸi alır. Ä°stek " +"karşılanamazsa B<%zsoelim%> I<dosyaadı.uzantı> arar; burada I<.ext>, B<.gz>, " "B<.Z> veya B<.z> olabilir. DiÄŸer uzantı türleri, derleme süresi " "seçeneklerine baÄŸlı olarak desteklenebilir. Ä°stek bir sıkıştırılmış dosya " -"tarafından karşılanabiliyorsa, bu dosya uygun bir açıcı kullanılarak açılır " +"tarafından karşılanabiliyorsa bu dosya uygun bir açıcı kullanılarak açılır " "ve çıktıyı isteÄŸi karşılamak için kullanılır." #. type: Plain text @@ -3119,12 +2961,12 @@ msgid "" msgstr "" "Bu bayrak, diÄŸer B<soelim> programlarıyla uyumluluk için kullanılabilir. " "Kullanımı, .so isteklerini boÅŸluk haricinde baÅŸka bir ÅŸey izleyerek " -"etkinleÅŸtirmektir. Bu zaten varsayılan davranış olduÄŸundan, yok sayılır." +"etkinleÅŸtirmektir. Bu zaten öntanımlı davranış olduÄŸundan, yok sayılır." #. type: Plain text #: ../../man/man5/manpath.man5:16 msgid "manpath - format of the %manpath_config_file% file" -msgstr "manpath - %manpath_config_file% dosya biçimi" +msgstr "manpath - %manpath_config_file% dosyasının biçimi" #. type: Plain text #: ../../man/man5/manpath.man5:21 @@ -3146,14 +2988,14 @@ msgid "" "If the environment variable $B<MANPATH> is already set, the information " "contained within %manpath_config_file% will not override it." msgstr "" -"EÄŸer ortam deÄŸiÅŸkeni $B<MANPATH> zaten ayarlıysa, %manpath_config_file% " +"Çevre deÄŸiÅŸkeni $B<MANPATH> önceden ayarlanmışsa %manpath_config_file% " "içindeki bilgi onun üzerine yazılmaz." #. type: SH #: ../../man/man5/manpath.man5:26 #, no-wrap msgid "SEARCH PATH" -msgstr "" +msgstr "ARAMA YOLU" #. type: Plain text #: ../../man/man5/manpath.man5:35 @@ -3161,6 +3003,8 @@ msgid "" "By default, man-db examines the user's $B<PATH>. For each I<path_element> " "found there, it adds I<manpath_element> to the search path." msgstr "" +"Öntanımlı olarak, man-db kullanıcının $B<PATH>'ini inceler. Orada bulunan " +"her I<path_element> için arama yoluna I<manpath_element> ekler." #. type: Plain text #: ../../man/man5/manpath.man5:47 @@ -3170,6 +3014,10 @@ msgid "" "man>, I<path_element/../share/man>, and I<path_element/share/man> that exist " "as directories to the search path." msgstr "" +"Verilen bir I<yol_ögesi> için yapılandırma dosyasında bir B<MANPATH_MAP> " +"yoksa arama yoluna bir dizin olarak var olan tüm I<yol_ögesi/../man>, " +"I<yol_ögesi/man>, I<yol_ögesi/../share/man> ve I<yol_ögesi/share/man> " +"yollarını ekler." #. type: Plain text #: ../../man/man5/manpath.man5:51 @@ -3177,6 +3025,8 @@ msgid "" "It then adds any B<MANDATORY_MANPATH> entries from the configuration file to " "the search path." msgstr "" +"Sonrasında arama yoluna yapılandırma dosyasından tüm B<MANDATORY_MANPATH> " +"girdilerini ekler." #. type: Plain text #: ../../man/man5/manpath.man5:73 @@ -3193,6 +3043,17 @@ msgid "" "then the final search path will be I</usr/share/man/newOS:/usr/share/man:/" "usr/local/man/newOS:/usr/local/man>." msgstr "" +"Son olarak, B<--systems> seçeneÄŸi kullanılmışsa veya $B<SYSTEM> çevre " +"deÄŸiÅŸkeni ayarlıysa virgülle veya iki nokta ile ayrılan bir iÅŸletim sistemi " +"adları sıralamasından oluÅŸmalıdır. Bu, arama yolunu diÄŸer iÅŸletim " +"sistemlerinin kılavuz sayfalarına eriÅŸime izin vermek için geniÅŸleten bir " +"ÅŸablon olarak davranır: Her ber sistem adı için, man-db o adı arama " +"yolundaki her bir girdinin alt girdisi olarak arar ve eÄŸer varsa final arama " +"yoluna ekler. B<man>'in bir sistem adı, normal arama yolunu alt dizinler " +"olmadan ekler. ÖrneÄŸin, arama yolu baÅŸka bir durumda I</usr/share/man:/usr/" +"local/man> olsaydı ve $B<SYSTEM>, I<newOS:man> olarak ayarlı olsaydı final " +"arama yolu I</usr/share/man/newOS:/usr/share/man:/usr/local/man/newOS:/usr/" +"local/man> olurdu." #. type: Plain text #: ../../man/man5/manpath.man5:83 @@ -3203,19 +3064,14 @@ msgid "" "names separated by colons. It overrides the default search path described " "above." msgstr "" +"$B<MANPATH> çevre deÄŸiÅŸkeni man-db'nin öntanımlı kılavuz sayfası arama " +"yollarını geçersiz kılar. ÇoÄŸu kullanıcının bunu ayarlamasına gerek " +"yoktur. Sözdizimi $B<PATH> çevre deÄŸiÅŸkenininkine benzerdir: Ä°ki nokta ile " +"ayrılan bir dizin adları sıralamasıdır. Yukarıda açıklanan öntanımlı arama " +"yolunu geçersiz kılar." #. type: Plain text #: ../../man/man5/manpath.man5:96 -#, fuzzy -#| msgid "" -#| "If $B<MANPATH> is set, B<%manpath%> displays its value rather than " -#| "determining it on the fly. If $B<MANPATH> is prefixed by a colon, then " -#| "the value of the variable is appended to the list determined from the " -#| "content of the configuration files. If the colon comes at the end of the " -#| "value in the variable, then the determined list is appended to the " -#| "content of the variable. If the value of the variable contains a double " -#| "colon (B<::>), then the determined list is inserted in the middle of the " -#| "value, between the two colons." msgid "" "If the value of $B<MANPATH> starts with a colon, then the default search " "path is added at its start. If the value of $B<MANPATH> ends with a colon, " @@ -3223,19 +3079,17 @@ msgid "" "$B<MANPATH> contains a double colon (B<::>), then the default search path is " "inserted in the middle of the value, between the two colons." msgstr "" -"$B<MANPATH> ayarlanmışsa, B<%manpath%> anında belirlemek yerine deÄŸerini " -"görüntüler. EÄŸer $B<MANPATH> öneki iki nokta üst üste gelirse, deÄŸiÅŸken " -"deÄŸerini konfigürasyon dosyalarının içeriÄŸinden belirlenen listeye ekler. " -"Ä°ki nokta üst üste deÄŸiÅŸkendeki deÄŸerin sonunda gelirse, belirlenen liste " -"deÄŸiÅŸkenin içeriÄŸine eklenir. DeÄŸiÅŸken deÄŸeri çift iki nokta üst üste (B<::" -">) içeriyorsa, belirlenen liste iki üst üste iki nokta üst üste arasındaki " -"deÄŸerin ortasına eklenir." +"$B<MANPATH>'in deÄŸeri bir iki nokta ile baÅŸlıyorsa öntanımlı arama yolu " +"baÅŸlangıcına eklenir. $B<MANPATH>'in deÄŸeri bir iki nokta ile bitiyorsa " +"öntanımlı arama yolu bitiÅŸine eklenir. $B<MANPATH>'in deÄŸeri iki tane iki " +"nokta içeriyorsa (B<::>) öntanımlı arama yolu iki iki noktanın arasına, " +"deÄŸerin ortasında eklenir." #. type: SH #: ../../man/man5/manpath.man5:96 #, no-wrap msgid "FORMAT" -msgstr "FORMAT" +msgstr "BİÇİM" #. type: Plain text #: ../../man/man5/manpath.man5:98 @@ -3246,7 +3100,7 @@ msgstr "AÅŸağıdaki alan türleri mevcut olarak tanınmaktadır:" #: ../../man/man5/manpath.man5:98 #, no-wrap msgid "B<#>I<\\ comment>" -msgstr "B<#>I<\\ comment>" +msgstr "B<#>I<\\ yorum>" #. type: Plain text #: ../../man/man5/manpath.man5:103 @@ -3307,7 +3161,7 @@ msgid "" msgstr "" "Bu formun satırları hangi kılavuz yollarına sistem kılavuz yolları olarak " "muamele edileceÄŸini ve isteÄŸe baÄŸlı olarak cat dosyalarının nerede " -"saklanacağını belirtir. EÄŸer B<man> bir setuid uygulama ise, (kullanıcıya " +"saklanacağını belirtir. EÄŸer B<man> bir setuid uygulama ise (kullanıcıya " "özel yapılandırma dosyası .manpath yerine sistem yapılandırma dosyasında " "%manpath_config_file%da olduÄŸunda) hangi kılavuz hiyerarÅŸilerine setuid " "kullanıcısı olarak eriÅŸileceÄŸini ve hangilerine çağıran kullanıcı olarak " @@ -3330,27 +3184,20 @@ msgid "" "omitted." msgstr "" "Belirli bir I<manpath_element>'ten cat sayfaları depolanmayacak veya " -"geleneksel konumda saklanacaksa, I<catpath_element> iptal edilebilir." +"geleneksel konumda saklanacaksa I<catpath_element> iptal edilebilir." #. type: Plain text #: ../../man/man5/manpath.man5:157 -#, fuzzy -#| msgid "" -#| "Traditional cat placement would be impossible for read only mounted " -#| "manual page hierarchies and because of this it is possible to specify any " -#| "valid directory hierarchy for their storage. To observe the B<Linux " -#| "FSSTND> the keyword `B<FSSTND> can be used in place of an actual " -#| "directory." msgid "" "Traditional cat placement would be impossible for read only mounted manual " "page hierarchies and because of this it is possible to specify any valid " "directory hierarchy for their storage. To observe the B<Linux FSSTND> the " "keyword B<FSSTND> can be used in place of an actual directory." msgstr "" -"Geleneksel cat yerleÅŸtirme, salt okunur kılavuz sayfası hiyerarÅŸileri için " -"imkansız olur ve bu nedenle depolama için geçerli bir dizin hiyerarÅŸisini " -"belirtmek mümkündür. B<Linux FSSTND>'yi gözlemlemek için, gerçek bir dizin " -"yerine `B<FSSTND> anahtar sözcüğü kullanılabilir." +"Geleneksel cat yerleÅŸtirmesi, saltokunur baÄŸlı kılavuz sayfası hiyerarÅŸileri " +"için olanaksızdır ve bundan dolayı onların depolamaları için herhangi bir " +"geçerli dizin hiyerarÅŸisi belirtilebilir. B<Linux FSSTND>'yi gözlemlemek " +"için, gerçek bir dizinin yerine B<FSSTND> anahtar sözcüğü kullanılabilir." #. type: Plain text #: ../../man/man5/manpath.man5:166 @@ -3359,9 +3206,9 @@ msgid "" "including alternate operating system paths such as I</usr/man/sun> and any " "B<NLS locale> paths such as I</usr/man/de_DE.88591>." msgstr "" -"Maalesef, I</usr/man/sun> ve I</usr/man/de_DE.88591> gibi herhangi bir B<NLS " -"locale> yerel ayarı yolu gibi alternatif iÅŸletim sistemi yolları da dahil " -"olmak üzere B<all> sistem adam aÄŸaç yollarını belirtmek gereklidir." +"Ne yazık ki I</usr/man/sun> ve I</usr/man/de_DE.88591> gibi herhangi bir " +"B<NLS yereli> yerel ayarı yolu gibi alternatif iÅŸletim sistemi yolları da " +"dahil olmak üzere B<all> sistem adam aÄŸaç yollarını belirtmek gereklidir." #. type: Plain text #: ../../man/man5/manpath.man5:174 @@ -3380,7 +3227,7 @@ msgstr "" #: ../../man/man5/manpath.man5:174 #, no-wrap msgid "B<DEFINE>I<\\ key\\ value>" -msgstr "B<DEFINE>I<\\ key\\ value>" +msgstr "B<DEFINE>I<\\ anahtar\\ deÄŸer>" #. type: Plain text #: ../../man/man5/manpath.man5:184 @@ -3392,15 +3239,15 @@ msgid "" msgstr "" "Bu formun satırları, çeÅŸitli yapılandırma deÄŸiÅŸkenlerini tanımlar; kılavuz " "sayfalayıcı yardımcı programları tarafından kullanılan bu deÄŸiÅŸkenler için " -"varsayılan yapılandırma dosyasına bakın. ÇeÅŸitli programlara (I<grep> ve " -"I<tbl> gibi) varsayılan yollar ve bu programlara varsayılan argümanlar " +"öntanımlı yapılandırma dosyasına bakın. ÇeÅŸitli programlara (I<grep> ve " +"I<tbl> gibi) öntanımlı yollar ve bu programlara öntanımlı argümanlar " "kümeleri içerirler." #. type: TP #: ../../man/man5/manpath.man5:184 #, no-wrap msgid "B<SECTION> I<section> .\\|.\\|." -msgstr "B<SECTION> I<section> .\\|.\\|." +msgstr "B<SECTION> I<bölüm> .\\|.\\|." #. type: Plain text #: ../../man/man5/manpath.man5:192 @@ -3410,7 +3257,7 @@ msgid "" "the default is:" msgstr "" "Bu formun satırları, kılavuz bölümlerinin arama sırasını tanımlar. " -"Yapılandırma dosyasında B<SECTION> yönergesi yoksa varsayılan deÄŸer ÅŸudur:" +"Yapılandırma dosyasında B<SECTION> yönergesi yoksa öntanımlı deÄŸer ÅŸudur:" #. type: Plain text #: ../../man/man5/manpath.man5:202 @@ -3418,7 +3265,7 @@ msgid "" "If multiple B<SECTION> directives are given, their section lists will be " "concatenated." msgstr "" -"Birden fazla B<SECTION> yönergesi verilirse, bölüm listeleri birleÅŸtirilir." +"Birden fazla B<SECTION> yönergesi verilirse bölüm listeleri birleÅŸtirilir." #. type: Plain text #: ../../man/man5/manpath.man5:209 @@ -3439,13 +3286,13 @@ msgstr "" #: ../../man/man5/manpath.man5:212 msgid "B<SECTIONS> is accepted as an alternative name for this directive." msgstr "" -"B<SECTIONS> bu yönerge için alternatif bir isim olarak kabul edilmektedir." +"B<SECTIONS> bu yönerge için alternatif bir ad olarak kabul edilmektedir." #. type: TP #: ../../man/man5/manpath.man5:213 #, no-wrap msgid "B<MINCATWIDTH>I<\\ width>" -msgstr "B<MINCATWIDTH>I<\\ width>" +msgstr "B<MINCATWIDTH>I<\\ geniÅŸlik>" #. type: Plain text #: ../../man/man5/manpath.man5:219 @@ -3453,14 +3300,14 @@ msgid "" "If the terminal width is less than I<width>, cat pages will not be created " "(if missing) or displayed. The default is 80." msgstr "" -"Terminal geniÅŸliÄŸi I<width>'ten azsa, cat sayfaları (eksikse) oluÅŸturulmaz " -"veya görüntülenmez. Varsayılan deÄŸer 80'dir." +"Terminal geniÅŸliÄŸi I<geniÅŸlik>'ten azsa cat sayfaları (eksikse) oluÅŸturulmaz " +"veya görüntülenmez. Öntanımlı deÄŸer 80'dir." #. type: TP #: ../../man/man5/manpath.man5:219 #, no-wrap msgid "B<MAXCATWIDTH>I<\\ width>" -msgstr "B<MAXCATWIDTH>I<\\ width>" +msgstr "B<MAXCATWIDTH>I<\\ geniÅŸlik>" #. type: Plain text #: ../../man/man5/manpath.man5:225 @@ -3468,27 +3315,25 @@ msgid "" "If the terminal width is greater than I<width>, cat pages will not be " "created (if missing) or displayed. The default is 80." msgstr "" -"Terminal geniÅŸliÄŸi I<width>'ten büyükse, cat sayfaları (eksikse) " -"oluÅŸturulmaz veya görüntülenmez. Varsayılan deÄŸer 80'dir." +"Terminal geniÅŸliÄŸi I<geniÅŸlik>'ten büyükse cat sayfaları (eksikse) " +"oluÅŸturulmaz veya görüntülenmez. Öntanımlı deÄŸer 80'dir." #. type: TP #: ../../man/man5/manpath.man5:225 #, no-wrap msgid "B<CATWIDTH>I<\\ width>" -msgstr "B<CATWIDTH>I<\\ width>" +msgstr "B<CATWIDTH>I<\\ geniÅŸlik>" #. type: Plain text #: ../../man/man5/manpath.man5:235 msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" -"EÄŸer I<width> sıfırdan farklıysa, fiilen kullanılan terminalin geniÅŸliÄŸine " -"bakılmaksızın, cat sayfaları daima verilen geniÅŸlikte bir terminal için " -"biçimlendirilir. Bu genellikle B<MINCATWIDTH> ve B<MAXCATWIDTH> tarafından " -"belirlenen aralıkta olmalıdır." +"EÄŸer I<geniÅŸlik> sıfırdan farklıysa fiilen kullanılan uçbirimin geniÅŸliÄŸine " +"bakılmaksızın, cat sayfaları her zaman verilen geniÅŸlikte bir uçbirim için " +"biçimlendirilir. Bu, B<MINCATWIDTH>'i ve B<MAXCATWIDTH>'i geçersiz kılar." #. type: Plain text #: ../../man/man5/manpath.man5:240 @@ -3529,7 +3374,7 @@ msgid "" "database library in use." msgstr "" "B<accessdb> bir man-db veritabanında bulunan verileri insan tarafından " -"okunabilir bir biçimde çıktılar. Varsayılan olarak, verileri B</var/cache/" +"okunabilir bir biçimde çıktılar. Öntanımlı olarak, verileri B</var/cache/" "man/index.E<lt>db-typeE<gt>,> alanlarından dökecektir; burada E<lt>db-" "typeE<gt>, kullanılan veritabanı kitaplığına bağımlıdır." @@ -3551,8 +3396,8 @@ msgid "" "B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<path>\\|] [\\|B<-C> I<file>\\|] [\\|" "I<section>\\|] \\&.\\|.\\|." msgstr "" -"B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<path>\\|] [\\|B<-C> I<file>\\|] [\\|" -"I<section>\\|] \\&.\\|.\\|." +"B<%catman%> [\\|B<-d?V>\\|] [\\|B<-M> I<yol>\\|] [\\|B<-C> I<dosya>\\|] [\\|" +"I<bölüm>\\|] \\&.\\|.\\|." #. type: Plain text #: ../../man/man8/catman.man8:32 @@ -3565,7 +3410,7 @@ msgid "" msgstr "" "B<%catman%>, cat sayfası olarak bilinen ve önceden biçimlendirilmiÅŸ kılavuz " "sayfalarının güncel bir kümesini oluÅŸturmak için kullanılır. Cat sayfaları, " -"orijinal kılavuz sayfalara göre genellikle daha hızlı görüntülenir, ancak " +"orijinal kılavuz sayfalara göre genellikle daha hızlı görüntülenir; ancak " "ekstra saklama alanı gerektirir. Cat sayfalarını destekleme kararı, bunları " "içermesi için uygun dizinleri saÄŸlaması gereken yerel yöneticinindir." @@ -3581,12 +3426,12 @@ msgid "" "names will override both of the above." msgstr "" "B<%catman%> için kullanılabilen seçenekler kılavuz sayfa hiyerarÅŸileri ve ön " -"biçimlendirme için bölümlerdir. Varsayılan hiyerarÅŸiler, man-db " -"yapılandırma dosyasında sistem hiyerarÅŸileri olarak belirtilen " -"hiyerarÅŸilerdir ve varsayılan bölümler ortam deÄŸiÅŸkeni $B<MANSECT>'ın iki " -"nokta üst üste çizgiyle ayrılmış içerikleri veya eÄŸer $B<MANSECT> " -"tanımlanmamış ise B<%man%> içine derlenmiÅŸ standart kümedir. B<%catman%>'e " -"boÅŸluklarla ayrılmış bölüm adları vermek, her ikisinin de üzerine yazacaktır." +"biçimlendirme için bölümlerdir. Öntanımlı hiyerarÅŸiler, man-db yapılandırma " +"dosyasında sistem hiyerarÅŸileri olarak belirtilen hiyerarÅŸilerdir ve " +"öntanımlı bölümler çevre deÄŸiÅŸkeni $B<MANSECT>'ın iki nokta üst üste " +"çizgiyle ayrılmış içerikleri veya eÄŸer $B<MANSECT> tanımlanmamış ise " +"B<%man%> içine derlenmiÅŸ standart kümedir. B<%catman%>'e boÅŸluklarla " +"ayrılmış bölüm adları vermek, her ikisinin de üzerine yazacaktır." #. type: Plain text #: ../../man/man8/catman.man8:55 @@ -3605,13 +3450,13 @@ msgid "" "configuration file." msgstr "" "Ä°ki nokta üst üste ayrılmış alternatif kılavuz sayfa hiyerarÅŸisi arama yolu " -"belirtin. Varsayılan olarak, bu, man-db yapılandırma dosyasında sistem " +"belirtin. Öntanımlı olarak, bu, man-db yapılandırma dosyasında sistem " "hiyerarÅŸileri olarak belirtilen tüm yollardır." #. type: Plain text #: ../../man/man8/catman.man8:116 ../../man/man8/mandb.man8:207 msgid "An alternate or FSSTND compliant global I<index> database cache." -msgstr "Alternatif veya FSSTND uyumlu genel I<index> veritabanı önbelleÄŸi." +msgstr "Alternatif veya FSSTND uyumlu genel I<indeks> veritabanı önbelleÄŸi." #. type: Plain text #: ../../man/man8/mandb.man8:17 @@ -3623,7 +3468,7 @@ msgstr "%mandb% - kılavuz sayfası index önbellekleri oluÅŸtur veya güncelle" msgid "" "B<%mandb%> [\\|B<-dqsucpt?V>\\|] [\\|B<-C> I<file>\\|] [\\|I<manpath>\\|]" msgstr "" -"B<%mandb%> [\\|B<-dqsucpt?V>\\|] [\\|B<-C> I<file>\\|] [\\|I<manpath>\\|]" +"B<%mandb%> [\\|B<-dqsucpt?V>\\|] [\\|B<-C> I<dosya>\\|] [\\|I<manpath>\\|]" #. type: Plain text #: ../../man/man8/mandb.man8:30 @@ -3631,29 +3476,22 @@ msgid "" "B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<file>\\|] B<-f> I<filename>\\ .\\|." "\\|." msgstr "" -"B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<file>\\|] B<-f> I<filename>\\ .\\|." +"B<%mandb%> [\\|B<-dqsut>\\|] [\\|B<-C> I<dosya>\\|] B<-f> I<dosyaadı>\\ .\\|." "\\|." #. type: Plain text #: ../../man/man8/mandb.man8:38 -#, fuzzy -#| msgid "" -#| "B<%mandb%> is used to initialise or manually update B<index> database " -#| "caches that are usually maintained by B<%man%>. The caches contain " -#| "information relevant to the current state of the manual page system and " -#| "the information stored within them is used by the man-db utilities to " -#| "enhance their speed and functionality." msgid "" "B<%mandb%> is used to initialise or manually update B<index> database " "caches. The caches contain information relevant to the current state of the " "manual page system and the information stored within them is used by the man-" "db utilities to enhance their speed and functionality." msgstr "" -"B<%mandb%> genellikle B<%man%> tarafından saklanan B<index> veritabanı " -"önbelleklerini baÅŸlatmak veya elle güncellemek için kullanılır. " -"Önbellekler, kılavuz sayfa sisteminin geçerli durumu ile ilgili bilgileri " -"içerir ve içinde depolanan bilgiler, hızını ve iÅŸlevselliÄŸini artırmak için " -"man-db yardımcı programları tarafından kullanılır." +"B<%mandb%> genellikle B<index> veritabanı önbelleklerini baÅŸlatmak veya elle " +"güncellemek için kullanılır. Önbellekler, kılavuz sayfa sisteminin geçerli " +"durumu ile ilgili bilgileri içerir ve içinde depolanan bilgiler, hızını ve " +"iÅŸlevselliÄŸini artırmak için man-db yardımcı programları tarafından " +"kullanılır." #. type: Plain text #: ../../man/man8/mandb.man8:46 @@ -3696,7 +3534,7 @@ msgstr "" #: ../../man/man8/mandb.man8:59 #, no-wrap msgid "Name" -msgstr "Ä°sim" +msgstr "Ad" #. type: tbl table #: ../../man/man8/mandb.man8:59 @@ -3708,7 +3546,7 @@ msgstr "Asenkron" #: ../../man/man8/mandb.man8:59 #, no-wrap msgid "Filename" -msgstr "Dosya Ä°smi" +msgstr "Dosya Adı" #. type: tbl table #: ../../man/man8/mandb.man8:61 @@ -3800,13 +3638,13 @@ msgstr "" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" -"Varsayılan olarak, B<%mandb%> daha önce oluÅŸturulan veritabanlarını " -"güncelleÅŸtirmeye çalışacaktır. Bir veritabanı yoksa, onu oluÅŸturur. Bu " +"Öntanımlı olarak, B<%mandb%> daha önce oluÅŸturulan veritabanlarını " +"güncelleÅŸtirmeye çalışacaktır. Bir veritabanı yoksa onu oluÅŸturur. Bu " "seçenek, B<%mandb%>'ı önceki veritabanlarını silmek ve sıfırdan tekrar " "oluÅŸturmak için zorlar ve B<--no-purge.> anlamına gelir. Bu, bir veritabanı " "bozulduysa veya gelecekte yeni bir veritabanı depolama ÅŸeması getirildiÄŸinde " @@ -3891,7 +3729,7 @@ msgid "" msgstr "" "Verilen E<lt>filenameE<gt> satırından satırları çıkarma denemesi baÅŸarısız " "oldu. Bu genellikle kötü bir ÅŸekilde yazılmış bir kılavuz sayfadan " -"kaynaklanır, ancak böyle birçok ileti gönderilirse, sistemin man-db whatis " +"kaynaklanır; ancak böyle birçok ileti gönderilirse sistemin man-db whatis " "çözümleyici ile uyuÅŸmayan standart olmayan kılavuz sayfaları ihtimali " "ihtimal dahilindedir. Daha fazla bilgi için B<lexgrog>(1) bölümündeki " "B<WHATIS PARSING> bölümüne bakın." @@ -3909,7 +3747,7 @@ msgid "" "Further diagnostics are usually emitted to identify the E<lt>filenameE<gt> " "of the offending link." msgstr "" -"E<lt>filenameE<gt> mevcut deÄŸil, ancak bir sembolik baÄŸ tarafından " +"E<lt>filenameE<gt> mevcut deÄŸil; ancak bir sembolik baÄŸ tarafından " "baÅŸvuruluyor. EriÅŸen bağın E<lt>filenameE<gt>ini tanımlayabilmek için daha " "fazla teÅŸhiÅŸ yayılır." @@ -3941,7 +3779,7 @@ msgid "" "invalid. This is usually due to a manual page with sectional extension " "E<lt>xE<gt> being put in manual page section E<lt>yE<gt>." msgstr "" -"E<lt>filenameE<gt> geçerli bir kılavuz sayfası olabilir veya olmayabilir, " +"E<lt>filenameE<gt> geçerli bir kılavuz sayfası olabilir veya olmayabilir; " "ancak adı geçersizdir. Bu genellikle, E<lt>yE<gt> kılavuz sayfa bölümüne " "konan kesit uzantısı E<lt>xE<gt> olan bir kılavuz sayfaya baÄŸlıdır." @@ -3975,269 +3813,3 @@ msgid "" msgstr "" "Daha önce bu kılavuz sayfasındaki B<WHATIS PARSING> bölümü, artık " "B<lexgrog>(1)'un bir parçasıdır." - -#, no-wrap -#~ msgid "Type" -#~ msgstr "Tür" - -#, no-wrap -#~ msgid "Binary tree" -#~ msgstr "Ä°ki aÄŸaç" - -#, no-wrap -#~ msgid "Hashed" -#~ msgstr "Hash'lenmiÅŸ" - -#~ msgid "" -#~ "B<%man%> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " -#~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" -#~ msgstr "" -#~ "B<%man%> [\\|B<-C> I<dosya>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#~ "warnings>\\|[\\|=I<uyarılar>\\|]\\|] [\\|B<-R> I<kodlama>\\|] [\\|B<-L> " -#~ "I<dil>\\|] [\\|B<-m> I<sistem>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<yol>" -#~ "\\|] [\\|B<-S> I<liste>\\|] [\\|B<-e> I<uzantı>\\|] [\\|B<-i>\\||\\|B<-I>" -#~ "\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>\\|] [\\|" -#~ "B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> I<sayfalayıcı>" -#~ "\\|] [\\|B<-r> I<istem>\\|] [\\|B<-7>\\|] [\\|B<-E> I<kodlama>\\|] [\\|" -#~ "B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> I<dizge>" -#~ "\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<aygıt>\\|]\\|] [\\|B<-H>\\|[\\|" -#~ "I<tarayıcı>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|" -#~ "I<bölüm>\\|] I<sayfa>[.\\|I<bölüm>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" - -#~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" -#~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<liste>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<bölüm>\\|] I<ifade>\\ .\\|.\\|." -#~ "\\&" - -#~ msgid "" -#~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" -#~ msgstr "" -#~ "B<%man%> B<-l> [\\|B<-C> I<dosya>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#~ "warnings>\\|[\\|=I<uyarılar>\\|]\\|] [\\|B<-R> I<kodlama>\\|] [\\|B<-L> " -#~ "I<dil>\\|] [\\|B<-P> I<sayfalayıcı>\\|] [\\|B<-r> I<istem>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<kodlama>\\|] [\\|B<-p> I<dizge>\\|] [\\|B<-t>\\|] [\\|B<-" -#~ "T>\\|[\\|I<aygıt>\\|]\\|] [\\|B<-H>\\|[\\|I<tarayıcı>\\|]\\|] [\\|B<-X>\\|" -#~ "[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<dosya> \\&.\\|.\\|.\\&" - -#~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" -#~ msgstr "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<dosya>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<sayfa> \\&.\\|.\\|.\\&" - -#~ msgid "" -#~ "B<%man%> B<-c> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I<page> " -#~ "\\&.\\|.\\|.\\&" -#~ msgstr "" -#~ "B<%man%> B<-c> [\\|B<-C> I<dosya>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] " -#~ "I<sayfa> \\&.\\|.\\|.\\&" - -#~ msgid "B<%man%> [\\|B<-?V>\\|]" -#~ msgstr "B<%man%> [\\|B<-?V>\\|]" - -#~ msgid "" -#~ "The manual pager utilities packaged as B<man-db> make extensive use of " -#~ "B<index> database caches. These caches contain information such as where " -#~ "each manual page can be found on the filesystem and what its I<whatis> " -#~ "(short one line description of the man page) contains, and allow B<%man%> " -#~ "to run faster than if it had to search the filesystem each time to find " -#~ "the appropriate manual page. If requested using the B<-u> option, B<man> " -#~ "will ensure that the caches remain consistent, which can obviate the need " -#~ "to manually run software to update traditional I<whatis> text databases." -#~ msgstr "" -#~ "B<man-db> olarak paketlenmiÅŸ manuel sayfalayıcı yardımcı programları, " -#~ "B<indis> veritabanı önbelleklerini kapsamlı bir ÅŸekilde kullanır. Bu " -#~ "önbellekler, her kılavuz sayfasının dosya sisteminde nerede " -#~ "bulunabileceÄŸi ve I<whatis> (man sayfasının kısa bir satır açıklaması) " -#~ "neyi içerdiÄŸini göstererek B<%man%>'ın uygun kılavuz sayfasını bulmak " -#~ "için her zaman dosya sisteminde arama yapmak yerine daha hızlı " -#~ "çalışmasını saÄŸlar. B<-u> seçeneÄŸini kullanarak istenirse, B<man>, " -#~ "önbelleklerin tutarlı kalmasını saÄŸlayacak ve bu ÅŸekilde geleneksel " -#~ "I<whatis> metin veritabanlarını güncellemek için yazılımı el ile " -#~ "çalıştırma gereksinimini ortadan kaldırılabilecek." - -#~ msgid "" -#~ "If B<%man%> cannot find a B<%mandb%> initiated B<index> database for a " -#~ "particular manual page hierarchy, it will still search for the requested " -#~ "manual pages, although file globbing will be necessary to search within " -#~ "that hierarchy. If B<%whatis%> or B<%apropos%> fails to find an B<index> " -#~ "it will try to extract information from a traditional I<whatis> database " -#~ "instead." -#~ msgstr "" -#~ "Belli bir kılavuz sayfa hiyerarÅŸisi için B<%man%>, B<%mandb%> tarafından " -#~ "baÅŸlatılan B<indis> veritabanını bulamazsa, bu hiyerarÅŸide arama yapmak " -#~ "için dosya globbing gerekli olsa da, yine de istenen kılavuz sayfalarını " -#~ "arayacaktır. B<%whatis%> veya B<%apropos%> bir B<indis> bulamazsa, onun " -#~ "yerine geleneksel bir I<whatis> veritabanından bilgi çıkarmaya çalışır." - -#~ msgid "" -#~ "These utilities support compressed source nroff files having, by default, " -#~ "the extensions of B<.Z>, B<.z> and B<.gz>. It is possible to deal with " -#~ "any compression extension, but this information must be known at compile " -#~ "time. Also, by default, any cat pages produced are compressed using " -#~ "B<gzip>. Each `global' manual page hierarchy such as I</usr/share/man> " -#~ "or I</usr/X11R6/man> may have any directory as its cat page hierarchy. " -#~ "Traditionally the cat pages are stored under the same hierarchy as the " -#~ "man pages, but for reasons such as those specified in the B<File " -#~ "Hierarchy Standard (FHS)>, it may be better to store them elsewhere. For " -#~ "details on how to do this, please read B<manpath>(5). For details on why " -#~ "to do this, read the standard." -#~ msgstr "" -#~ "Bu yardımcı programlar, sıkıştırılmış kaynak nroff dosyalarını, " -#~ "varsayılan olarak, B<.Z>, B<.z> ve B<.gz> uzantıları destekler. Herhangi " -#~ "bir sıkıştırma uzantısı ile baÅŸ etmek mümkündür, ancak bu bilgi derleme " -#~ "zamanında bilinmelidir. Ayrıca, varsayılan olarak, üretilen cat sayfaları " -#~ "B<gzip> kullanılarak sıkıştırılır. Her I</usr/share/man> veya I</usr/" -#~ "X11R6/man> gibi 'genel' kılavuz sayfa hiyerarÅŸisi, dizininin cat sayfası " -#~ "hiyerarÅŸisi olarak herhangi bir dizin olabilir. Geleneksel olarak cat " -#~ "sayfaları, man sayfaları ile aynı hiyerarÅŸide saklanır, ancak B<Dosya " -#~ "HiyerarÅŸisi Standardı (FHS)> içinde belirtilen nedenlerden dolayı baÅŸka " -#~ "yerde saklamak daha iyi olabilir. Bunu nasıl yapacağınız hakkında " -#~ "ayrıntılar için lütfen B<manpath>(5) bölümünü okuyun. Bunu neden yapmanız " -#~ "gerektiÄŸi ile ilgili ayrıntılar için standarda bakın." - -#~ msgid "" -#~ "B<%man%> will search for the desired manual pages within the I<index> " -#~ "database caches. If the B<-u> option is given, a cache consistency check " -#~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " -#~ "corrupt. However, the cache consistency check can be slow on systems " -#~ "with many manual pages installed, so it is not performed by default, and " -#~ "system administrators may wish to run B<%mandb%> every week or so to keep " -#~ "the database caches fresh. To forestall problems caused by outdated " -#~ "caches, B<%man%> will fall back to file globbing if a cache lookup fails, " -#~ "just as it would if no cache was present." -#~ msgstr "" -#~ "B<%man%>, I<index> veritabanı önbellekleri içinde istenen kılavuz " -#~ "sayfaları arayacaktır. B<-u> seçeneÄŸi verilirse, veritabanlarının dosya " -#~ "sistemini doÄŸru bir ÅŸekilde yansıttığından emin olmak için bir önbellek " -#~ "tutarlılığı kontrolü yapılır. Bu seçenek her zaman verilirse, bir " -#~ "önbellek bozulmadığı sürece, önbellekler ilk oluÅŸturulduktan sonra B<" -#~ "%mandb%> komutunu çalıştırmak genellikle gerekli deÄŸildir. Bununla " -#~ "birlikte, önbellek tutarlılığı kontrolü, birçok kılavuz sayfası yüklü " -#~ "olan sistemlerde yavaÅŸ olabilir, bu nedenle varsayılan olarak " -#~ "gerçekleÅŸtirilmez ve sistem yöneticileri, veritabanı önbelleÄŸini taze " -#~ "tutmak için her hafta B<%mandb%>'yi çalıştırmayı isteyebilir. Eski " -#~ "önbelleklerin neden olduÄŸu sorunları önlemek için, B<%man%>, bir önbellek " -#~ "araması baÅŸarısız olursa, tıpkı önbellek yokmuÅŸ gibi, dosya genellemeye " -#~ "geri dönecektir." - -#~ msgid "" -#~ "Once a manual page has been located, a check is performed to find out if " -#~ "a relative preformatted `cat' file already exists and is newer than the " -#~ "nroff file. If it does and is, this preformatted file is (usually) " -#~ "decompressed and then displayed, via use of a pager. The pager can be " -#~ "specified in a number of ways, or else will fall back to a default is " -#~ "used (see option B<-P> for details). If no cat is found or is older than " -#~ "the nroff file, the nroff is filtered through various programs and is " -#~ "shown immediately." -#~ msgstr "" -#~ "Kılavuz sayfası bulunduktan sonra, nispeten önceden biçimlendirilmiÅŸ " -#~ "`cat' dosyasının mevcut olup olmadığını ve nroff dosyasından yeni olup " -#~ "olmadığını öğrenmek için bir kontrol gerçekleÅŸtirilir. Varsa ve öyleyse, " -#~ "bu önceden biçimlendirilmiÅŸ dosya (genellikle) sıkıştırılmıştır ve sonra " -#~ "bir sayfalayıcı kullanılarak görüntülenir. Sayfalayıcı çeÅŸitli " -#~ "ÅŸekillerde belirtilebilir veya baÅŸka bir durumda varsayılana geri dönülür " -#~ "(ayrıntılar için B<-P> seçeneÄŸine bakın). Hiçbir cat bulunamazsa veya " -#~ "nroff dosyasından daha yaÅŸlıysa, nroff çeÅŸitli programlarla filtrelenir " -#~ "ve hemen gösterilir." - -#~ msgid "" -#~ "If a cat file can be produced (a relative cat directory exists and has " -#~ "appropriate permissions), B<%man%> will compress and store the cat file " -#~ "in the background." -#~ msgstr "" -#~ "Bir cat dosyası üretilebilirse (göreceli cat dizini varsa ve uygun " -#~ "izinlere sahipse), B<%man%> sıkıştıracak ve cat dosyasını arka planda " -#~ "saklayacak." - -#~ msgid "" -#~ "Don't actually display the manual pages, but do print the location(s) of " -#~ "the source nroff files that would be formatted." -#~ msgstr "" -#~ "Kılavuz sayfalarını gerçekte göstermeyin, ancak biçimlendirilecek kaynak " -#~ "nroff dosyalarının yerini/yerlerini yazın." - -#~ msgid "" -#~ "This option causes B<%man%> to perform an `inode level' consistency check " -#~ "on its database caches to ensure that they are an accurate representation " -#~ "of the filesystem. It will only have a useful effect if B<%man%> is " -#~ "installed with the setuid bit set." -#~ msgstr "" -#~ "Bu seçenek, B<%man%>'nın veritabanı önbelleklerinde `inode seviyesi' " -#~ "tutarlılık kontrolü yapmalarına ve dosya sisteminin doÄŸru bir ÅŸekilde " -#~ "gösterilmesini saÄŸlar. B<%man%> setuid biti ayarlanmış olarak kurulursa, " -#~ "yalnızca yararlı bir etkiye sahip olacak." - -#~ msgid "" -#~ "The contents of $B<MANROFFOPT> are added to the command line every time " -#~ "B<man> invokes the formatter (B<nroff>, B<troff>, or B<groff>)." -#~ msgstr "" -#~ "B<man> formatlayıcıyı (B<nroff>, B<troff> veya B<groff>) her çağırdığında " -#~ "$B<MANROFFOPT> içeriÄŸi komut satırına eklenir." - -#~ msgid "the man-db package manual, B<FSSTND>" -#~ msgstr "man-db paket kılavuzu, B<FSSTND>" - -#~ msgid "%thapropos%" -#~ msgstr "%thapropos%" - -#~ msgid "%date%" -#~ msgstr "%date%" - -#~ msgid "%version%" -#~ msgstr "%version%" - -#~ msgid "LEXGROG" -#~ msgstr "LEXGROG" - -#~ msgid "%thman%" -#~ msgstr "%thman%" - -#~ msgid "%thmanconv%" -#~ msgstr "%thmanconv%" - -#~ msgid "%thmanpath%" -#~ msgstr "%thmanpath%" - -#~ msgid "%thwhatis%" -#~ msgstr "%thwhatis%" - -#~ msgid "%thzsoelim%" -#~ msgstr "%thzsoelim%" - -#~ msgid "MANPATH" -#~ msgstr "MANPATH" - -#~ msgid "%manpath_config_file%" -#~ msgstr "%manpath_config_file%" - -#~ msgid "ACCESSDB" -#~ msgstr "ERİŞİMVERÅžTABANI" - -#~ msgid "%thcatman%" -#~ msgstr "%thcatman%" - -#~ msgid "%thmandb%" -#~ msgstr "%thmandb%" diff --git a/man/po4a/po/zh_CN.po b/man/po4a/po/zh_CN.po index 9a05c53e..fe4872af 100644 --- a/man/po4a/po/zh_CN.po +++ b/man/po4a/po/zh_CN.po @@ -6,9 +6,9 @@ # msgid "" msgstr "" -"Project-Id-Version: man-db-manpages-2.10.0-pre1\n" -"POT-Creation-Date: 2022-01-24 11:17+0000\n" -"PO-Revision-Date: 2022-02-07 14:38-0500\n" +"Project-Id-Version: man-db-manpages-2.11.0-pre1\n" +"POT-Creation-Date: 2022-10-02 18:03+0100\n" +"PO-Revision-Date: 2022-10-04 15:41-0400\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" "Language: zh_CN\n" @@ -16,8 +16,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.0.1\n" -"X-Poedit-Bookmarks: -1,102,-1,-1,-1,-1,-1,-1,-1,-1\n" +"X-Generator: Poedit 3.1.1\n" #. type: TH #: ../../man/man1/apropos.man1:12 ../../man/man1/lexgrog.man1:9 @@ -63,12 +62,14 @@ msgstr "概述" #: ../../man/man1/apropos.man1:32 msgid "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|.\\|." +"s> I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<keyword> \\&.\\|." +"\\|." msgstr "" "B<%apropos%> [\\|B<-dalv?V>\\|] [\\|B<-e>\\||\\|B<-w>\\||\\|B<-r>\\|] [\\|B<-" -"s> I<列表>\\|] [\\|B<-m> I<系统>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>" -"\\|] [\\|B<-L> I<区域>\\|] [\\|B<-C> I<文件>\\|] I<关键è¯> \\&.\\|.\\|." +"s> I<列表>\\|] [\\|B<-m> I<系统>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<区域>\\|] [\\|B<-C> I<文件>\\|] I<关键è¯> \\&.\\|." +"\\|." #. type: SH #: ../../man/man1/apropos.man1:32 ../../man/man1/lexgrog.man1:20 @@ -412,9 +413,9 @@ msgstr "" #. type: Plain text #: ../../man/man1/apropos.man1:238 msgid "" -"If $B<POSIXLY_CORRECT> is set, even to a null value, the default B<%apropos" -"%> search will be as an extended regex (B<-r>). Nowadays, this is the " -"default behaviour anyway." +"If $B<POSIXLY_CORRECT> is set, even to a null value, the default " +"B<%apropos%> search will be as an extended regex (B<-r>). Nowadays, this is " +"the default behaviour anyway." msgstr "" "如果设置了 $B<POSIXLY_CORRECT> 环境å˜é‡(å³ä½¿æ˜¯ç©ºå€¼)，默认的 B<%apropos%> æœç´¢" "将视为扩展的æ£åˆ™è¡¨è¾¾å¼(B<-r>)。ä¸è¿‡ï¼ŒçŽ°åœ¨è¿™å·²ç»æ˜¯é»˜è®¤è¡Œä¸ºäº†ã€‚" @@ -483,8 +484,8 @@ msgstr "lexgrog - è§£æž man 手册页的头部信æ¯" #. type: Plain text #: ../../man/man1/lexgrog.man1:20 msgid "" -"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<encoding>" -"\\|] I<file> \\&.\\|.\\|." +"B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> " +"I<encoding>\\|] I<file> \\&.\\|.\\|." msgstr "" "B<lexgrog> [\\|B<-m>\\||\\|B<-c>\\|] [\\|B<-dfw?V>\\|] [\\|B<-E> I<ç¼–ç >\\|] " "I<文件> \\&.\\|.\\|." @@ -507,11 +508,11 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:45 msgid "" -"If its input is badly formatted, B<lexgrog> will print \\(lqparse failed" -"\\(rq; this may be useful for external programs that need to check man pages " -"for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, it will " -"read from standard input; if any input file is compressed, a decompressed " -"version will be read automatically." +"If its input is badly formatted, B<lexgrog> will print \\(lqparse " +"failed\\(rq; this may be useful for external programs that need to check man " +"pages for correctness. If one of B<lexgrog>'s input files is \\(lq-\\(rq, " +"it will read from standard input; if any input file is compressed, a " +"decompressed version will be read automatically." msgstr "" "如果它的输入错误，B<lexgrog> ä¼šæ‰“å° \\(lqparse 失败\\(rq；这有助于外部程åºæ£€" "查 man 页é¢æ˜¯å¦æ£ç¡®ã€‚如果 B<lexgrog> çš„æŸä¸ªè¾“入文件是 \\(lq-\\(rqï¼Œå®ƒä¼šä»Žæ ‡å‡†" @@ -640,8 +641,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/lexgrog.man1:148 msgid "" -"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; B<" -"%mandb%> is more tolerant, but for compatibility with other systems it is " +"Some manual pagers require the \\(oq\\e-\\(cq to be exactly as shown; " +"B<%mandb%> is more tolerant, but for compatibility with other systems it is " "nevertheless a good idea to retain the backslash." msgstr "" "一些手册分页程åºè¦æ±‚ \\(oq\\e-\\(cq 与上é¢æ˜¾ç¤ºçš„完全相åŒï¼›ä¸è¿‡ B<%mandb%> æ›´" @@ -705,11 +706,11 @@ msgstr "" #: ../../man/man1/lexgrog.man1:197 msgid "" "There are several common reasons why whatis parsing fails. Sometimes " -"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH MYPROGRAM" -"\\(cq, and then B<%mandb%> cannot find the section from which to extract the " -"information it needs. Sometimes authors include a NAME section, but place " -"free-form text there rather than \\(oqname \\e- description\\(cq. However, " -"any syntax resembling the above should be accepted." +"authors of manual pages replace \\(oq.SH NAME\\(cq with \\(oq.SH " +"MYPROGRAM\\(cq, and then B<%mandb%> cannot find the section from which to " +"extract the information it needs. Sometimes authors include a NAME section, " +"but place free-form text there rather than \\(oqname \\e- description\\(cq. " +"However, any syntax resembling the above should be accepted." msgstr "" "whatis 解æžå¤±è´¥å¯èƒ½æœ‰å‡ ç§åŽŸå› 。有时文档作者将 \\(oq.SH NAME\\(cq 替æ¢æˆäº† " "\\(oq.SH MYPROGRAM\\(cq，导致 B<%mandb%> 找ä¸åˆ°ç”¨æ¥æå–ä¿¡æ¯çš„这一节。有时作者" @@ -796,13 +797,13 @@ msgstr "B<%man%> B<-w>\\||\\|B<-W> [\\|I<man 选项>\\|] I<page> \\&.\\|.\\|.\\& #. type: Plain text #: ../../man/man1/man.man1:88 msgid "" -"B<%man%> is the system's manual pager. Each I<page> argument given to B<%man" -"%> is normally the name of a program, utility or function. The I<manual " -"page> associated with each of these arguments is then found and displayed. " -"A I<section>, if provided, will direct B<%man%> to look only in that " -"I<section> of the manual. The default action is to search in all of the " -"available I<sections> following a pre-defined order (see B<DEFAULTS>), and " -"to show only the first I<page> found, even if I<page> exists in several " +"B<%man%> is the system's manual pager. Each I<page> argument given to " +"B<%man%> is normally the name of a program, utility or function. The " +"I<manual page> associated with each of these arguments is then found and " +"displayed. A I<section>, if provided, will direct B<%man%> to look only in " +"that I<section> of the manual. The default action is to search in all of " +"the available I<sections> following a pre-defined order (see B<DEFAULTS>), " +"and to show only the first I<page> found, even if I<page> exists in several " "I<sections>." msgstr "" "B<%man%> 是系统的手册分页程åºã€‚指定给 B<%man%> çš„ I<页> 选项通常是程åºã€å·¥å…·" @@ -890,10 +891,10 @@ msgid "" "B<BUGS>, B<EXAMPLE>, B<AUTHORS>, and B<SEE\\ ALSO>." msgstr "" "å°èŠ‚å称通常包括 B<NAME>, B<概述(SYNOPSIS)>, B<é…ç½®(CONFIGURATION)>, B<æè¿°" -"(DESCRIPTION)>, B<选项(OPTIONS)>, B<退出状æ€(EXIT\\ STATUS)>, B<返回值(RETURN" -"\\ VALUE)>, B<错误(ERRORS)>, B<环境(ENVIRONMENT)>, B<文件(FILES)>, B<版本" -"(VERSIONS)>, B<符åˆæ ‡å‡†(CONFORMING\\ TO)>, B<注(NOTES)>, B<缺陷(BUGS)>, B<示" -"例(EXAMPLE)>, B<作者(AUTHORS)>, å’Œ B<亦è§(SEE\\ ALSO)>." +"(DESCRIPTION)>, B<选项(OPTIONS)>, B<退出状æ€(EXIT\\ STATUS)>, B<返回值" +"(RETURN\\ VALUE)>, B<错误(ERRORS)>, B<环境(ENVIRONMENT)>, B<文件(FILES)>, B<" +"版本(VERSIONS)>, B<符åˆæ ‡å‡†(CONFORMING\\ TO)>, B<注(NOTES)>, B<缺陷(BUGS)>, " +"B<示例(EXAMPLE)>, B<作者(AUTHORS)>, å’Œ B<亦è§(SEE\\ ALSO)>." #. type: Plain text #: ../../man/man1/man.man1:153 @@ -1063,22 +1064,15 @@ msgstr "B<%man% -t >I<bash >|I< lpr -Pps>" #. type: Plain text #: ../../man/man1/man.man1:237 -#, fuzzy -#| msgid "" -#| "Format the manual page referenced by `I<alias>', usually a shell manual " -#| "page, into the default B<troff> or B<groff> format and pipe it to the " -#| "printer named I<ps>. The default output for B<groff> is usually " -#| "PostScript. B<%man% --help> should advise as to which processor is bound " -#| "to the B<-t> option." msgid "" "Format the manual page for I<bash> into the default B<troff> or B<groff> " "format and pipe it to the printer named I<ps>. The default output for " "B<groff> is usually PostScript. B<%man% --help> should advise as to which " "processor is bound to the B<-t> option." msgstr "" -"将别å“I<alias>â€æ‰€å¼•ç”¨çš„手册页(常为 shell 手册页)æ ¼å¼åŒ–为默认的 B<troff> 或 " -"B<groff> æ ¼å¼å¹¶é€šè¿‡ç®¡é“ä¼ é€ç»™å为 I<ps> 的打å°æœºã€‚B<groff> 的默认输出通常为 " -"PostScript。B<%man% --help> 应该会æ示哪个处ç†å™¨ç¨‹åºä¸Ž B<-t> 选项绑定。" +"å°† I<bash> çš„æ‰‹å†Œé¡µæ ¼å¼åŒ–为默认的 B<troff> 或 B<groff> æ ¼å¼ï¼Œå¹¶å°†å…¶é€šè¿‡ç®¡é“é€" +"至å为 I<ps> 的打å°æœºã€‚B<groff> 的默认输出通常是 PostScript。B<%man% --help> " +"应该会æ示哪个处ç†å™¨ç¨‹åºä¸Ž B<-t> 选项绑定。" #. type: TP #: ../../man/man1/man.man1:237 @@ -1088,13 +1082,6 @@ msgstr "B<%man% -l -T>I<dvi ./foo.1x.gz>B< E<gt> >I<./foo.1x.dvi>" #. type: Plain text #: ../../man/man1/man.man1:253 -#, fuzzy -#| msgid "" -#| "This command will decompress and format the nroff source manual page I<./" -#| "foo.1x.gz> into a B<device independent (dvi)> file. The redirection is " -#| "necessary as the B<-T> flag causes output to be directed to B<stdout> " -#| "with no pager. The output could be viewed with a program such as B<xdvi> " -#| "or further processed into PostScript using a program such as B<dvips.>" msgid "" "This command will decompress and format the nroff source manual page I<./" "foo.1x.gz> into a B<device independent (dvi)> file. The redirection is " @@ -1117,8 +1104,8 @@ msgstr "B<%man%\\ -k>I<\\ printf>" #: ../../man/man1/man.man1:261 msgid "" "Search the short descriptions and manual page names for the keyword " -"I<printf> as regular expression. Print out any matches. Equivalent to B<" -"%apropos%>I<\\ printf>B<.>" +"I<printf> as regular expression. Print out any matches. Equivalent to " +"B<%apropos%>I<\\ printf>B<.>" msgstr "" "å°†å…³é”®è¯ I<printf> 作为æ£åˆ™è¡¨è¾¾å¼æ¥æœç´¢å¯¹åº”的手册页概述和手册页å称，并打å°æ‰€" "有匹é…结果。ç‰æ•ˆäºŽ B<%apropos%>I<\\ printf>B<.>" @@ -1156,18 +1143,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:296 -#, fuzzy -#| msgid "" -#| "If set, various environment variables are interrogated to determine the " -#| "operation of B<%man%>. It is possible to set the `catch all' variable " -#| "$B<MANOPT> to any string in command line format with the exception that " -#| "any spaces used as part of an option's argument must be escaped (preceded " -#| "by a backslash). B<%man%> will parse $B<MANOPT> prior to parsing its own " -#| "command line. Those options requiring an argument will be overridden by " -#| "the same options found on the command line. To reset all of the options " -#| "set in $B<MANOPT>, B<-D> can be specified as the initial command line " -#| "option. This will allow %man% to `forget' about the options specified in " -#| "$B<MANOPT> although they must still have been valid." msgid "" "If set, various environment variables are interrogated to determine the " "operation of B<%man%>. It is possible to set the \"catch-all\" variable " @@ -1181,11 +1156,11 @@ msgid "" "although they must still have been valid." msgstr "" "如果被设置，程åºå°†æ£€æŸ¥å„ç§çŽ¯å¢ƒå˜é‡æ¥ç¡®å®š B<%man%> 如何æ“作。å¯ä»¥å¯¹å‘½ä»¤è¡Œä¸çš„" -"任何å—符串设置“catch allâ€å˜é‡ $B<MANOPT>，除éžæ˜¯é€‰é¡¹å‚æ•°ä¸éœ€è¦è½¬ä¹‰çš„ç©ºæ ¼ã€‚B<" -"%man%> å°†ä¼šå…ˆè§£æž $B<MANOPT>，å†è§£æžå®ƒè‡ªå·±çš„命令行。这些需è¦å‚数的选项将会被" -"命令行ä¸å…¶ä»–的相åŒé€‰é¡¹æ‰€è¦†ç›–。若è¦é‡ç½® $B<MANOPT> ä¸çš„所有选项，å¯ä»¥åœ¨å‘½ä»¤è¡Œ" -"开头指定 B<-D> 选项。这会让 %man% “忘掉â€$B<MANOPT> ä¸æŒ‡å®šçš„选项，å³ä¾¿å®ƒä»¬å¯èƒ½" -"ä»ç„¶æ˜¯æœ‰æ•ˆçš„。" +"任何å—符串设置“catch allâ€å˜é‡ $B<MANOPT>，除éžæ˜¯é€‰é¡¹å‚æ•°ä¸éœ€è¦è½¬ä¹‰çš„ç©ºæ ¼ã€‚" +"B<%man%> å°†ä¼šå…ˆè§£æž $B<MANOPT>，å†è§£æžå®ƒè‡ªå·±çš„命令行。这些需è¦å‚数的选项将会" +"被命令行ä¸å…¶ä»–的相åŒé€‰é¡¹æ‰€è¦†ç›–。若è¦é‡ç½® $B<MANOPT> ä¸çš„所有选项，å¯ä»¥åœ¨å‘½ä»¤" +"行开头指定 B<-D> 选项。这会让 %man% “忘掉â€$B<MANOPT> ä¸ç»™å®šçš„选项，但å³ä¾¿å¦‚æ¤" +"曾ç»ç»™å®šçš„选项必须ä»ç„¶åˆæ³•ã€‚" #. type: Plain text #: ../../man/man1/man.man1:307 @@ -1195,17 +1170,12 @@ msgid "" "preformatted I<cat pages> to improve performance. See B<manpath>(5) for " "details of where these files are stored." msgstr "" +"手册页通常以 B<nroff>(1) æ ¼å¼å˜æ”¾åœ¨è¯¸å¦‚ I</usr/share/man> 路径下的目录ä¸ã€‚在" +"æŸäº›å®‰è£…场景ä¸ï¼Œä¹Ÿå¯èƒ½å˜åœ¨ç”¨äºŽæé«˜æ€§èƒ½çš„é¢„æ ¼å¼åŒ– I<cat pages>。请å‚è§ " +"B<manpath>(5) 以了解这些文件å˜æ”¾ä½ç½®çš„具体信æ¯ã€‚" #. type: Plain text #: ../../man/man1/man.man1:318 -#, fuzzy -#| msgid "" -#| "International support is available with this package. Native language " -#| "manual pages are accessible (if available on your system) via use of " -#| "I<locale> functions. To activate such support, it is necessary to set " -#| "either $B<LC_MESSAGES>, $B<LANG> or another system dependent environment " -#| "variable to your language locale, usually specified in the B<POSIX " -#| "1003.1> based format:" msgid "" "This package supports manual pages in multiple languages, controlled by your " "I<locale>. If your system did not set this up for you automatically, then " @@ -1213,10 +1183,9 @@ msgid "" "environment variable to indicate your preferred locale, usually specified in " "the B<POSIX> format:" msgstr "" -"æ¤åŒ…æ供了国际化支æŒã€‚本地è¯è¨€çš„手册页(如果系统上有)å¯ä»¥é€šè¿‡ä½¿ç”¨ I<locale> 功" -"能æ¥è®¿é—®ã€‚è¦å¯ç”¨æœ¬åœ°è¯è¨€æ”¯æŒï¼Œéœ€è¦å°† $B<LC_MESSAGES> 或 $B<LANG> 或其他系统相" -"关的环境å˜é‡è®¾ç½®ä¸ºæ‚¨çš„è¯è¨€åŒºåŸŸä»£ç ；该代ç 通常以基于 B<POSIX 1003.1> çš„æ ¼å¼æŒ‡" -"定：" +"本软件包支æŒå¤šè¯è¨€çš„手册页，其行为由您的 I<locale>（è¯åŒºï¼‰æ‰€æŽ§åˆ¶ã€‚如果您的系" +"统未帮您自动设置，那么您å¯èƒ½éœ€è¦æ‰‹åŠ¨è®¾ç½® $B<LC_MESSAGES>ã€$B<LANG> 或其它系统" +"相关的环境å˜é‡ä»¥æŒ‡ç¤ºæ‚¨å好的区域è¯è¨€è®¾ç½®ï¼Œé€šå¸¸ä»¥ B<POSIX> æ ¼å¼ç»™å‡ºï¼š" # #. type: Plain text @@ -1239,22 +1208,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:332 -#, fuzzy -#| msgid "" -#| "Support for international message catalogues is also featured in this " -#| "package and can be activated in the same way, again if available. If you " -#| "find that the manual pages and message catalogues supplied with this " -#| "package are not available in your native language and you would like to " -#| "supply them, please contact the maintainer who will be coordinating such " -#| "activity." msgid "" "If you find that the translations supplied with this package are not " "available in your native language and you would like to supply them, please " "contact the maintainer who will be coordinating such activity." msgstr "" -"国际化的消æ¯åˆ†ç±»åŠŸèƒ½ä¹ŸåŒ…å«åœ¨æ¤åŒ…ä¸ï¼Œå¯ä»¥ç”¨åŒæ ·çš„æ–¹å¼å¯ç”¨(如果å¯ç”¨çš„è¯)。如果" -"您å‘现æ¤åŒ…æ供的手册页和消æ¯åˆ†ç±»å¯¹æ‚¨çš„本地è¯è¨€ä¸å¯ç”¨å¹¶ä¸”想æ供支æŒï¼Œè¯·è”ç³»å" -"调这类活动的(手册本地化)维护者。" +"如果您å‘现æ¤åŒ…æ供的翻译对您的本地è¯è¨€ä¸å¯ç”¨å¹¶ä¸”您想æ供支æŒçš„è¯ï¼Œè¯·è”ç³»åè°ƒ" +"这类活动的（手册本地化）维护者。" #. type: Plain text #: ../../man/man1/man.man1:338 @@ -1286,9 +1246,11 @@ msgstr "默认值" #: ../../man/man1/man.man1:350 msgid "" "The order of sections to search may be overridden by the environment " -"variable $B<MANSECT> or by the B<SECTION> directive in I<%manpath_config_file" -"%>. By default it is as follows:" +"variable $B<MANSECT> or by the B<SECTION> directive in " +"I<%manpath_config_file%>. By default it is as follows:" msgstr "" +"è¦æœç´¢çš„ç« èŠ‚é¡ºåºå¯ä»¥ä½¿ç”¨ $B<MANSECT> 或 I<%manpath_config_file%> é…置文件的 " +"B<SECTION> 指令进行覆盖。其默认行为如下所示：" #. type: Plain text #: ../../man/man1/man.man1:361 @@ -1350,11 +1312,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:412 -#, fuzzy -#| msgid "" -#| "Non argument options that are duplicated either on the command line, in " -#| "$B<MANOPT>, or both, are not harmful. For options that require an " -#| "argument, each duplication will override the previous argument value." msgid "" "Non-argument options that are duplicated either on the command line, in " "$B<MANOPT>, or both, are not harmful. For options that require an argument, " @@ -1372,10 +1329,10 @@ msgstr "常规选项" #. type: Plain text #: ../../man/man1/man.man1:430 msgid "" -"This option is normally issued as the very first option and resets B<%man" -"%'s> behaviour to its default. Its use is to reset those options that may " -"have been set in $B<MANOPT>. Any options that follow B<-D> will have their " -"usual effect." +"This option is normally issued as the very first option and resets " +"B<%man%'s> behaviour to its default. Its use is to reset those options that " +"may have been set in $B<MANOPT>. Any options that follow B<-D> will have " +"their usual effect." msgstr "" "æ¤é€‰é¡¹é€šå¸¸ä½œä¸ºç¬¬ä¸€ä¸ªé€‰é¡¹ï¼Œå®ƒå°† B<%man%> 的行为æ¢å¤ä¸ºé»˜è®¤å€¼ã€‚它的作用是é‡ç½®ä»»" "何在 $B<MANOPT> ä¸è®¾ç½®çš„选项。B<-D> 之åŽçš„任何选项ä¿ç•™å…¶åŽŸæœ‰æ•ˆæžœã€‚" @@ -1419,8 +1376,8 @@ msgid "" "Equivalent to B<%apropos%>. Search the short manual page descriptions for " "keywords and display any matches. See B<%apropos%>(1) for details." msgstr "" -"ç‰åŒäºŽ B<%apropos%>。æœç´¢å…³é”®è¯å¯¹åº”的手册概述并显示所有匹é…ç»“æžœã€‚è¯¦è§ B<" -"%apropos%>。" +"ç‰åŒäºŽ B<%apropos%>。æœç´¢å…³é”®è¯å¯¹åº”的手册概述并显示所有匹é…ç»“æžœã€‚è¯¦è§ " +"B<%apropos%>。" #. type: Plain text #: ../../man/man1/man.man1:470 @@ -1450,16 +1407,6 @@ msgstr "" #. usual filters. #. type: Plain text #: ../../man/man1/man.man1:492 -#, fuzzy -#| msgid "" -#| "Activate `local' mode. Format and display local manual files instead of " -#| "searching through the system's manual collection. Each manual page " -#| "argument will be interpreted as an nroff source file in the correct " -#| "format. No cat file is produced. If '-' is listed as one of the " -#| "arguments, input will be taken from stdin. When this option is not used, " -#| "and man fails to find the page required, before displaying the error " -#| "message, it attempts to act as if this option was supplied, using the " -#| "name as a filename and looking for an exact match." msgid "" "Activate \"local\" mode. Format and display local manual files instead of " "searching through the system's manual collection. Each manual page argument " @@ -1477,35 +1424,25 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:500 -#, fuzzy -#| msgid "" -#| "Don't actually display the manual pages, but do print the location(s) of " -#| "the cat files that would be displayed. If -w and -W are both specified, " -#| "print both separated by a space." msgid "" "Don't actually display the manual page, but do print the location of the " "source nroff file that would be formatted. If the B<-a> option is also " "used, then print the locations of all source files that match the search " "criteria." msgstr "" -"ä¸å®žé™…显示手册页，但打å°å°†æ˜¾ç¤ºçš„ cat 文件的ä½ç½®ã€‚如果åŒæ—¶æŒ‡å®šäº† -w å’Œ -W，则" -"åŒæ—¶æ‰“å°äºŒè€…ï¼Œä»¥ç©ºæ ¼éš”å¼€ã€‚" +"ä¸å®žé™…显示手册页，但打å°å°†è¢«æ ¼å¼åŒ–çš„æº nroff 文件的ä½ç½®ã€‚如果åŒæ—¶æŒ‡å®šäº† B<-" +"a> 选项，则打å°æ‰€æœ‰åŒ¹é…æœç´¢æ¡ä»¶çš„æºæ–‡ä»¶çš„ä½ç½®ã€‚" #. type: Plain text #: ../../man/man1/man.man1:508 -#, fuzzy -#| msgid "" -#| "Don't actually display the manual pages, but do print the location(s) of " -#| "the cat files that would be displayed. If -w and -W are both specified, " -#| "print both separated by a space." msgid "" "Don't actually display the manual page, but do print the location of the " "preformatted cat file that would be displayed. If the B<-a> option is also " "used, then print the locations of all preformatted cat files that match the " "search criteria." msgstr "" -"ä¸å®žé™…显示手册页，但打å°å°†æ˜¾ç¤ºçš„ cat 文件的ä½ç½®ã€‚如果åŒæ—¶æŒ‡å®šäº† -w å’Œ -W，则" -"åŒæ—¶æ‰“å°äºŒè€…ï¼Œä»¥ç©ºæ ¼éš”å¼€ã€‚" +"ä¸å®žé™…显示手册页，但打å°å°†æ˜¾ç¤ºçš„é¢„æ ¼å¼åŒ– cat 文件的ä½ç½®ã€‚如果åŒæ—¶ä½¿ç”¨äº† B<-" +"a> 选项，则打å°æ‰€æœ‰åŒ¹é…æœç´¢æ¡ä»¶çš„é¢„æ ¼å¼åŒ– cat 文件的ä½ç½®ã€‚" #. type: Plain text #: ../../man/man1/man.man1:522 @@ -1514,12 +1451,15 @@ msgid "" "separated by a space. If all of B<-w>, B<-W>, and B<-a> are used, then do " "this for each possible match." msgstr "" +"如果åŒæ—¶ä½¿ç”¨äº† B<-w> å’Œ B<-W> 选项，则åŒæ—¶æ‰“å°æºæ–‡ä»¶å’Œ cat æ–‡ä»¶ï¼Œå¹¶ä½¿ç”¨ç©ºæ ¼åˆ†" +"隔。如果使用了全部 B<-w>ã€B<-W> å’Œ B<-a> 三个选项，则为æ¯ä¸ªå¯èƒ½çš„匹é…进行相åŒ" +"çš„æ“作。" #. type: Plain text #: ../../man/man1/man.man1:527 msgid "" -"This option is not for general use and should only be used by the B<%catman" -"%> program." +"This option is not for general use and should only be used by the " +"B<%catman%> program." msgstr "æ¤é€‰é¡¹ä¸€èˆ¬ä¸ä½¿ç”¨ï¼Œå¹¶ä¸”åªåº”ç”± B<%catman%> 程åºä½¿ç”¨ã€‚" #. type: TP @@ -1611,19 +1551,15 @@ msgstr "B<-S> I<列表\\/>, B<-s> I<列表\\/>, B<--sections=>I<列表\\/>" #. type: Plain text #: ../../man/man1/man.man1:616 -#, fuzzy -#| msgid "" -#| "List is a colon- or comma-separated list of `order specific' manual " -#| "sections to search. This option overrides the $B<MANSECT> environment " -#| "variable. (The B<-s> spelling is for compatibility with System V.)" msgid "" "The given I<list> is a colon- or comma-separated list of sections, used to " "determine which manual sections to search and in what order. This option " "overrides the $B<MANSECT> environment variable. (The B<-s> spelling is for " "compatibility with System V.)" msgstr "" -"è¦æœç´¢çš„“指定顺åºâ€çš„æ‰‹å†Œç« èŠ‚åˆ—è¡¨ï¼Œä»¥è‹±æ–‡å†’å·æˆ–逗å·åˆ†éš”。æ¤é€‰é¡¹ä¼šè¦†ç›– " -"$B<MANSECT> 环境å˜é‡ã€‚(使用 B<-s> 表示是为了与 System V 兼容。)" +"给定的 I<list> 是一个用英文冒å·æˆ–逗å·åˆ†éš”çš„æ‰‹å†Œç« èŠ‚åˆ—è¡¨ï¼Œç”¨äºŽç¡®å®šè¦æœç´¢çš„手册" +"ç« èŠ‚çš„æœç´¢é¡ºåºã€‚æ¤é€‰é¡¹ä¼šè¦†ç›– $B<MANSECT> 环境å˜é‡ã€‚(使用 B<-s> 表示是为了与 " +"System V 兼容。)" #. type: TP #: ../../man/man1/man.man1:616 @@ -1644,9 +1580,9 @@ msgid "" "preference to B<exit>(3tcl). To negotiate this situation and to avoid " "having to know which section the page you require resides in, it is now " "possible to give B<%man%> a I<sub-extension> string indicating which package " -"the page must belong to. Using the above example, supplying the option B<-e" -"\\ tcl> to B<%man%> will restrict the search to pages having an extension of " -"B<*tcl>." +"the page must belong to. Using the above example, supplying the option B<-" +"e\\ tcl> to B<%man%> will restrict the search to pages having an extension " +"of B<*tcl>." msgstr "" "æŸäº›ç³»ç»ŸåŒ…å«å¤§é‡çš„手册页包，例如æŸäº›ç³»ç»Ÿå°† B<Tcl> (手册)包并入主手册页层次目" "录。为é¿å…两个手册页é‡å，如 B<exit>(3)，B<Tcl> 手册页通常都归于 B<l> ç« èŠ‚ã€‚" @@ -1710,8 +1646,8 @@ msgid "" "page it finds. Using this option forces B<%man%> to display all the manual " "pages with names that match the search criteria." msgstr "" -"默认情况下，B<%man%> 在显示它找到的最符åˆçš„手册页åŽä¼šé€€å‡ºã€‚æ¤é€‰é¡¹å¼ºåˆ¶ B<%man" -"%> 显示åå—匹é…æœç´¢æ¡ä»¶çš„所有的手册页。" +"默认情况下，B<%man%> 在显示它找到的最符åˆçš„手册页åŽä¼šé€€å‡ºã€‚æ¤é€‰é¡¹å¼ºåˆ¶ " +"B<%man%> 显示åå—匹é…æœç´¢æ¡ä»¶çš„所有的手册页。" #. type: Plain text #: ../../man/man1/man.man1:707 @@ -1763,9 +1699,10 @@ msgid "" "overrides the $B<PAGER> environment variable. It is not used in conjunction " "with B<-f> or B<-k>." msgstr "" -"指定使用哪个输出分页程åºã€‚B<%man%> 默认使用 B<%pager%>ï¼Œåœ¨æ— æ³•æ‰¾åˆ° B<%pager" -"%> 或它ä¸æ˜¯å¯æ‰§è¡Œæ–‡ä»¶æ—¶åˆ™ä¼šå›žé€€åˆ°ä½¿ç”¨ B<%cat%>。æ¤é€‰é¡¹ä¼šè¦†ç›– $B<MANPAGER> 环" -"境å˜é‡ï¼Œè¿›ä¸€æ¥è¦†ç›– $B<PAGER> 环境å˜é‡ã€‚它ä¸å’Œ B<-f> 或 B<-k> åˆç”¨ã€‚" +"指定使用哪个输出分页程åºã€‚B<%man%> 默认使用 B<%pager%>ï¼Œåœ¨æ— æ³•æ‰¾åˆ° " +"B<%pager%> 或它ä¸æ˜¯å¯æ‰§è¡Œæ–‡ä»¶æ—¶åˆ™ä¼šå›žé€€åˆ°ä½¿ç”¨ B<%cat%>。æ¤é€‰é¡¹ä¼šè¦†ç›– " +"$B<MANPAGER> 环境å˜é‡ï¼Œè¿›ä¸€æ¥è¦†ç›– $B<PAGER> 环境å˜é‡ã€‚它ä¸å’Œ B<-f> 或 B<-k> " +"åˆç”¨ã€‚" #. type: Plain text #: ../../man/man1/man.man1:763 ../../man/man1/man.man1:1132 @@ -1820,21 +1757,15 @@ msgstr "" #. rejects the default options or if you prefer a different prompt. #. type: Plain text #: ../../man/man1/man.man1:801 -#, fuzzy -#| msgid "" -#| "Supplying B<-r> with a string will override this default. The string may " -#| "contain the text B<$MAN_PN> which will be expanded to the name of the " -#| "current manual page and its section name surrounded by `(' and `)'. The " -#| "string used to produce the default could be expressed as" msgid "" "Supplying B<-r> with a string will override this default. The string may " "contain the text B<$MAN_PN> which will be expanded to the name of the " "current manual page and its section name surrounded by \"(\" and \")\". The " "string used to produce the default could be expressed as" msgstr "" -"æ供一个带å—符串的 B<-r> 选项会覆盖这个默认值。å—符串å¯ä»¥åŒ…å«æ–‡æœ¬ B<" -"$MAN_PN>，它会展开为用“(â€å’Œâ€œ)â€æ‹¬èµ·æ¥çš„当å‰æ‰‹å†Œé¡µçš„ç« èŠ‚å。显示默认æ示的å—符" -"串å¯ä»¥è¡¨ç¤ºä¸º" +"æ供一个带å—符串的 B<-r> 选项会覆盖这个默认值。å—符串å¯ä»¥åŒ…å«æ–‡æœ¬ " +"B<$MAN_PN>，它会展开为用“(â€å’Œâ€œ)â€æ‹¬èµ·æ¥çš„当å‰æ‰‹å†Œé¡µçš„ç« èŠ‚å。显示默认æ示的å—" +"符串å¯ä»¥è¡¨ç¤ºä¸º" #. type: Plain text #: ../../man/man1/man.man1:803 @@ -2009,8 +1940,8 @@ msgstr "" msgid "" "If you are writing a manual page and simply want to prevent B<nroff> from " "justifying certain paragraphs, do not use this option, but consult the " -"B<nroff> documentation instead; for instance, you can use the \".na\", \".nf" -"\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " +"B<nroff> documentation instead; for instance, you can use the \".na\", \"." +"nf\", \".fi\", and \".ad\" requests to temporarily disable adjusting and " "filling." msgstr "" "如果您编写手册页时åªæ˜¯ä¸å¸Œæœ› B<nroff> 对é½æŸäº›æ®µè½ï¼Œä¸è¦ä½¿ç”¨æ¤é€‰é¡¹ï¼Œè€Œåº”查阅 " @@ -2177,8 +2108,8 @@ msgstr "" msgid "" "If $B<MANPAGER> or $B<PAGER> is set ($B<MANPAGER> is used in preference), " "its value is used as the name of the program used to display the manual " -"page. By default, B<%pager%> is used, falling back to B<%cat%> if B<%pager" -"%> is not found or is not executable." +"page. By default, B<%pager%> is used, falling back to B<%cat%> if " +"B<%pager%> is not found or is not executable." msgstr "" "如果设置了 $B<MANPAGER> 或 $B<PAGER> (优先使用 $B<MANPAGER>)，它的值会用作显" "示手册页的程åºçš„å称。默认使用 B<%pager%>ï¼Œå¦‚æžœæ— æ³•æ‰¾åˆ° B<%pager%> 或它ä¸æ˜¯å¯" @@ -2191,8 +2122,8 @@ msgid "" "for the B<less> pager, as if it had been passed using the B<-r> option (so " "any occurrences of the text B<$MAN_PN> will be expanded in the same way). " "For example, if you want to set the prompt string unconditionally to \\(lqmy " -"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ string>" -"\\(cq. Using the B<-r> option overrides this environment variable." +"prompt string\\(rq, set $B<MANLESS> to \\(oqB<-Psmy\\ prompt\\ " +"string>\\(cq. Using the B<-r> option overrides this environment variable." msgstr "" "如果设置了 $B<MANLESS>，它的值将用作 B<less> 分页程åºçš„默认æ示å—符串，如åŒä½œ" "为 B<-r> 选项的å‚æ•°ä¼ é€’ä¸€æ ·(å› æ¤å‡ºçŽ°çš„任何 B<$MAN_PN> 会以åŒæ ·çš„æ–¹å¼å±•å¼€)。例" @@ -2206,8 +2137,8 @@ msgid "" "If $B<BROWSER> is set, its value is a colon-delimited list of commands, each " "of which in turn is used to try to start a web browser for B<man> B<--" "html>. In each command, I<%s> is replaced by a filename containing the HTML " -"output from B<groff>, I<%%> is replaced by a single percent sign (%), and I<" -"%c> is replaced by a colon (:)." +"output from B<groff>, I<%%> is replaced by a single percent sign (%), and " +"I<%c> is replaced by a colon (:)." msgstr "" "如果设置了 $B<BROWSER>，它的值(冒å·åˆ†éš”的命令列表)ä¸çš„æ¯ä¸€ä¸ªä¼šè½®æµç”¨äºŽå°è¯•ä¸º " "B<man> B<--html> å¯åŠ¨ä¸€ä¸ªç½‘络æµè§ˆå™¨ã€‚æ¯ä¸ªå‘½ä»¤ä¸ï¼ŒI<%s> 会替æ¢æˆåŒ…å« B<groff> " @@ -2230,15 +2161,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1204 -#, fuzzy -#| msgid "" -#| "If $B<MANWIDTH> is set, its value is used as the line length for which " -#| "manual pages should be formatted. If it is not set, manual pages will be " -#| "formatted with a line length appropriate to the current terminal (using " -#| "the value of $B<COLUMNS>, an B<ioctl>(2) if available, or falling back " -#| "to 80 characters if neither is available). Cat pages will only be saved " -#| "when the default formatting can be used, that is when the terminal line " -#| "length is between 66 and 80 characters." msgid "" "If $B<MANWIDTH> is set, its value is used as the line length for which " "manual pages should be formatted. If it is not set, manual pages will be " @@ -2302,8 +2224,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/man.man1:1248 msgid "" -"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then B<%man" -"%> will print debugging messages to standard error describing each " +"If the $B<PIPELINE_DEBUG> environment variable is set to \"1\", then " +"B<%man%> will print debugging messages to standard error describing each " "subprocess it runs." msgstr "" "如果 $B<PIPELINE_DEBUG> 环境å˜é‡ç½®ä¸ºâ€œ1â€ï¼Œåˆ™ B<%man%> 会å‘æ ‡å‡†é”™è¯¯æ‰“å°æè¿°æ¯ä¸ª" @@ -2313,8 +2235,8 @@ msgstr "" #: ../../man/man1/man.man1:1260 msgid "" "Depending on system and implementation, either or both of $B<LANG> and " -"$B<LC_MESSAGES> will be interrogated for the current message locale. B<%man" -"%> will display its messages in that locale (if available). See " +"$B<LC_MESSAGES> will be interrogated for the current message locale. " +"B<%man%> will display its messages in that locale (if available). See " "B<setlocale>(3) for precise details." msgstr "" "å–决于系统和实现，程åºä¼šæŸ¥è¯¢ $B<LANG> å’Œ/或 $B<LC_MESSAGES> 获知当å‰çš„消æ¯åŒº" @@ -2414,6 +2336,11 @@ msgid "" "program is much faster than running B<%man% --recode> or B<%manconv%> on " "each page." msgstr "" +"B<%man_recode%> å¯å°†å¤šä¸ªæ‰‹å†Œé¡µä»Žä¸€ç§ç¼–ç 转æ¢è‡³å¦ä¸€ç§ç¼–ç ，并猜测æ¯ä¸€ä¸ªæ‰‹å†Œé¡µ" +"çš„åˆé€‚的输入编ç 。它在永久性对过时å—符集编写的页é¢è¿›è¡Œè½¬ç 时很有用，或者也å¯" +"以在构建系统需è¦å°†ä¸€ç»„手册页转ç 为å•ä¸€çš„通用编ç （通常为 UTF-8）时起到作用。" +"在转æ¢å¤šä¸ªæ‰‹å†Œé¡µæ—¶ï¼Œè¯¥ç¨‹åºè¦è¿œå¿«äºŽå¯¹æ¯ä¸ªé¡µé¢è¿è¡Œ B<%man% --recode> 或 " +"B<%manconv%>。" #. type: Plain text #: ../../man/man1/man-recode.man1:36 @@ -2458,13 +2385,14 @@ msgid "" "Form each output file name by appending I<suffix> to the input file name, " "after removing any compression extension." msgstr "" +"在移除任何压缩扩展ååŽï¼Œå°†è¾“出文件å设置为输入文件åå¹¶æ·»åŠ I<suffix> åŽç¼€ã€‚" #. type: Plain text #: ../../man/man1/man-recode.man1:66 msgid "" "Overwrite each input file with the output, after removing any compression " "extension." -msgstr "" +msgstr "在移除任何压缩扩展ååŽï¼Œå°†è¾“入的æ¯ä¸ªæ–‡ä»¶ä½¿ç”¨è¾“出覆写。" #. type: Plain text #: ../../man/man1/man-recode.man1:69 ../../man/man1/manconv.man1:64 @@ -2478,16 +2406,12 @@ msgstr "%manconv% - 将手册页从一ç§ç¼–ç 转æ¢åˆ°å¦ä¸€ç§" #. type: Plain text #: ../../man/man1/manconv.man1:20 -#, fuzzy -#| msgid "" -#| "B<%manconv%> B<-f> I<from-code>\\|[:I<from-code>\\|.\\|.\\|.] B<-t> I<to-" -#| "code> [\\|B<-dqhV>\\|] [\\|I<filename>\\|]" msgid "" "B<%manconv%> B<-f> [\\|I<from-code>\\|[:I<from-code>\\|.\\|.\\|.]\\|] B<-t> " "I<to-code> [\\|B<-dqhV>\\|] [\\|I<filename>\\|]" msgstr "" -"B<%manconv%> B<-f> I<æºç¼–ç >\\|[:I<æºç¼–ç >\\|.\\|.\\|.] B<-t> I<ç›®æ ‡ç¼–ç > " -"[\\|B<-dqhV>\\|] [\\|I<文件å>\\|]" +"B<%manconv%> B<-f> [\\|I<æºç¼–ç >\\|[:I<æºç¼–ç >\\|.\\|.\\|.]\\|] B<-t> I<ç›®æ ‡" +"ç¼–ç > [\\|B<-dqhV>\\|] [\\|I<文件å>\\|]" #. type: Plain text #: ../../man/man1/manconv.man1:30 @@ -2520,15 +2444,13 @@ msgstr "B<-f> I<ç¼–ç >, B<--from-code> I<ç¼–ç >" #. type: Plain text #: ../../man/man1/manconv.man1:57 -#, fuzzy -#| msgid "" -#| "Try each of I<encodings> (a colon-separated list) in sequence as the " -#| "input encoding." msgid "" "Try each of I<encodings> (a colon-separated list) in sequence as the input " "encoding. The default is to guess likely input encodings based on the file " "name." -msgstr "ä¾æ¬¡å°è¯•æ¯ç§ I<ç¼–ç > (冒å·åˆ†éš”的列表)作为输入编ç 。" +msgstr "" +"ä¾æ¬¡å°è¯•æ¯ç§ I<ç¼–ç >（冒å·åˆ†éš”的列表）作为输入编ç ã€‚é»˜è®¤è¡Œä¸ºæ˜¯æ ¹æ®æ–‡ä»¶å猜测" +"å¯èƒ½çš„输入编ç 。" #. type: TP #: ../../man/man1/manconv.man1:57 @@ -2567,18 +2489,13 @@ msgstr "" #. type: Plain text #: ../../man/man1/manpath.man1:38 -#, fuzzy -#| msgid "" -#| "The colon-delimited path is determined using information gained from the " -#| "man-db configuration file - (I<%manpath_config_file%>) and the user's " -#| "environment." msgid "" "The colon-delimited path is determined using information gained from the man-" "db configuration file \\(en (I<%manpath_config_file%>) and the user's " "environment." msgstr "" -"冒å·åˆ†éš”的路径使用由 man-db é…置文件 - (I<%manpath_config_file%>) 和用户环境" -"å˜é‡æ‰€å¾—到的信æ¯ç¡®å®šã€‚" +"冒å·åˆ†éš”的路径使用由 man-db é…置文件 \\(en (I<%manpath_config_file%>) 和用户" +"环境å˜é‡æ‰€å¾—到的信æ¯ç¡®å®šã€‚" #. type: Plain text #: ../../man/man1/manpath.man1:42 @@ -2604,18 +2521,14 @@ msgstr "在 man-db é…置文件ä¸ç”Ÿæˆä¸€ä¸ªå为“globalâ€çš„，包å«æ‰€æ #. type: Plain text #: ../../man/man1/manpath.man1:63 -#, fuzzy -#| msgid "" -#| "If this system has access to other operating system's manual hierarchies, " -#| "this option can be used to include them in the output of B<%manpath%>. " -#| "To include NewOS's manual page hierarchies use the option B<-m> B<NewOS>." msgid "" "If this system has access to other operating systems' manual hierarchies, " "this option can be used to include them in the output of B<%manpath%>. To " "include NewOS's manual page hierarchies use the option B<-m> B<NewOS>." msgstr "" -"如果æ¤ç³»ç»Ÿå¯ä»¥è®¿é—®å…¶ä»–æ“作系统的手册页层次结构，å¯ä»¥ä½¿ç”¨æ¤é€‰é¡¹å°†å®ƒä»¬åŒ…å«åœ¨ B<" -"%manpath%> 的输出ä¸ã€‚è¦åŒ…å«NewOS 的手册页层次结构，使用 B<-m> B<NewOS> 选项。" +"如果æ¤ç³»ç»Ÿå¯ä»¥è®¿é—®å…¶ä»–æ“作系统的手册页层次结构，å¯ä»¥ä½¿ç”¨æ¤é€‰é¡¹å°†å®ƒä»¬åŒ…å«åœ¨ " +"B<%manpath%> 的输出ä¸ã€‚è¦åŒ…å«NewOS 的手册页层次结构，使用 B<-m> B<NewOS> 选" +"项。" #. type: Plain text #: ../../man/man1/manpath.man1:74 @@ -2635,6 +2548,7 @@ msgid "" "If $B<MANPATH> is set, B<%manpath%> displays its value rather than " "determining it on the fly." msgstr "" +"如果设置了 $B<MANPATH>，B<%manpath%> 将显示它的值，而ä¸æ˜¯åœ¨è¿è¡Œæ—¶ç¡®å®šå®ƒã€‚" #. type: Plain text #: ../../man/man1/whatis.man1:15 @@ -2644,13 +2558,14 @@ msgstr "%whatis% - 显示在线手册页说明" #. type: Plain text #: ../../man/man1/whatis.man1:32 msgid "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<list>" -"\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<path>\\|] [\\|" -"B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> " +"I<list>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " +"I<path>\\|] [\\|B<-L> I<locale>\\|] [\\|B<-C> I<file>\\|] I<name> \\&.\\|." +"\\|." msgstr "" -"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<列表>" -"\\|] [\\|B<-m> I<系统>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<路径>\\|] [\\|B<-" -"L> I<区域>\\|] [\\|B<-C> I<文件>\\|] I<å称> \\&.\\|.\\|." +"B<%whatis%> [\\|B<-dlv?V>\\|] [\\|B<-r>\\||\\|B<-w>\\|] [\\|B<-s> I<列表" +">\\|] [\\|B<-m> I<系统>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<路径>\\|] [\\|" +"B<-L> I<区域>\\|] [\\|B<-C> I<文件>\\|] I<å称> \\&.\\|.\\|." #. type: Plain text #: ../../man/man1/whatis.man1:39 @@ -2675,8 +2590,8 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:61 msgid "" -"B<index> databases are used during the search, and are updated by the B<" -"%mandb%> program. Depending on your installation, this may be run by a " +"B<index> databases are used during the search, and are updated by the " +"B<%mandb%> program. Depending on your installation, this may be run by a " "periodic cron job, or may need to be run manually after new manual pages " "have been installed. To produce an old style text B<whatis> database from " "the relative B<index> database, issue the command:" @@ -2719,11 +2634,6 @@ msgstr "" #. type: Plain text #: ../../man/man1/whatis.man1:131 -#, fuzzy -#| msgid "" -#| "If this system has access to other operating system's manual page names, " -#| "they can be accessed using this option. To search NewOS's manual page " -#| "names, use the option B<-m> B<NewOS>." msgid "" "If this system has access to other operating systems' manual page names, " "they can be accessed using this option. To search NewOS's manual page " @@ -2842,6 +2752,8 @@ msgid "" "By default, man-db examines the user's $B<PATH>. For each I<path_element> " "found there, it adds I<manpath_element> to the search path." msgstr "" +"默认情况下，man-db 检查用户的 $B<PATH>。对æ¯ä¸ªæ‰¾åˆ°çš„ I<path_element>，它会将 " +"I<manpath_element> æ·»åŠ è‡³æœç´¢è·¯å¾„。" #. type: Plain text #: ../../man/man5/manpath.man5:47 @@ -2851,6 +2763,10 @@ msgid "" "man>, I<path_element/../share/man>, and I<path_element/share/man> that exist " "as directories to the search path." msgstr "" +"如果对于一个给定的 I<path_element> 在é…置文件ä¸ä¸å˜åœ¨å¯¹åº”çš„ B<MANPATH_MAP> " +"è¡Œï¼Œåˆ™å®ƒå°†æ·»åŠ I<path_element/../man>ã€I<path_element/man>ã€" +"I<path_element/../share/man> å’Œ I<path_element/share/man> 这些路径ä¸æ‰€æœ‰å˜åœ¨" +"的目录至æœç´¢è·¯å¾„ä¸ã€‚" #. type: Plain text #: ../../man/man5/manpath.man5:51 @@ -2858,6 +2774,7 @@ msgid "" "It then adds any B<MANDATORY_MANPATH> entries from the configuration file to " "the search path." msgstr "" +"在æ¤ä¹‹åŽï¼Œå®ƒå°†æ·»åŠ é…置文件ä¸æ‰€æœ‰çš„ B<MANDATORY_MANPATH> æ¡ç›®è‡³æœç´¢è·¯å¾„ä¸ã€‚" #. type: Plain text #: ../../man/man5/manpath.man5:73 @@ -2874,6 +2791,14 @@ msgid "" "then the final search path will be I</usr/share/man/newOS:/usr/share/man:/" "usr/local/man/newOS:/usr/local/man>." msgstr "" +"最åŽï¼Œå¦‚果使用了 B<--systems> 选项或设置了 $B<SYSTEM> 环境å˜é‡ï¼Œå®ƒä»¬åº”该包å«" +"使用英文逗å·æˆ–冒å·åˆ†éš”çš„æ“作系统å称的列表。它将作为模æ¿ï¼Œå¹¶å†ä¸€æ¬¡æ‰©å±•ä¸ºæœç´¢" +"路径以访问其它æ“作系统的手册页：对于æ¯ä¸€ä¸ªç³»ç»Ÿå称，man-db 将查找æœç´¢è·¯å¾„下给" +"定æ¡ç›®ä¸ºå称的å目录，并在其å˜åœ¨çš„æƒ…å†µä¸‹å°†å…¶æ·»åŠ åˆ°æœ€ç»ˆçš„æœç´¢è·¯å¾„ä¸ã€‚若系统å" +"称为 B<man>，则将使用通常的ã€ä¸å¸¦å目录的æœç´¢è·¯å¾„。例如，如果æœç´¢è·¯å¾„原先为 " +"I</usr/share/man:/usr/local/man> 且 $B<SYSTEM> 被设置为 I<newOS:man>，则最终" +"çš„æœç´¢è·¯å¾„将为 I</usr/share/man/newOS:/usr/share/man:/usr/local/man/newOS:/" +"usr/local/man>。" #. type: Plain text #: ../../man/man5/manpath.man5:83 @@ -2884,19 +2809,12 @@ msgid "" "names separated by colons. It overrides the default search path described " "above." msgstr "" +"$B<MANPATH> 环境å˜é‡ä¼šè¦†ç›– man-db 的默认手册页æœç´¢è·¯å¾„。大部分用户ä¸åº”该需è¦" +"对æ¤è¿›è¡Œè®¾ç½®ã€‚å…¶è¯æ³•ç±»ä¼¼ $B<PATH> 环境å˜é‡ï¼šå®ƒåŒ…å«ä¸€ä¸ªç›®å½•å称的åºåˆ—，并使用" +"冒å·è¿›è¡Œåˆ†éš”。它会覆盖上文所述的默认æœç´¢è·¯å¾„。" #. type: Plain text #: ../../man/man5/manpath.man5:96 -#, fuzzy -#| msgid "" -#| "If $B<MANPATH> is set, B<%manpath%> displays its value rather than " -#| "determining it on the fly. If $B<MANPATH> is prefixed by a colon, then " -#| "the value of the variable is appended to the list determined from the " -#| "content of the configuration files. If the colon comes at the end of the " -#| "value in the variable, then the determined list is appended to the " -#| "content of the variable. If the value of the variable contains a double " -#| "colon (B<::>), then the determined list is inserted in the middle of the " -#| "value, between the two colons." msgid "" "If the value of $B<MANPATH> starts with a colon, then the default search " "path is added at its start. If the value of $B<MANPATH> ends with a colon, " @@ -2904,10 +2822,9 @@ msgid "" "$B<MANPATH> contains a double colon (B<::>), then the default search path is " "inserted in the middle of the value, between the two colons." msgstr "" -"如果设置了 $B<MANPATH>，B<%manpath%> 显示它的值，而ä¸æ˜¯åœ¨è¿è¡Œæ—¶ç¡®å®šå®ƒã€‚如果 " -"$B<MANPATH> å‰ç¼€æ˜¯å†’å·ï¼Œåˆ™å˜é‡çš„å€¼ä¼šè¿½åŠ åˆ°ä»Žé…置文件内容确定的列表之åŽã€‚如果" -"冒å·åœ¨å˜é‡å€¼çš„ç»“å°¾ï¼Œåˆ™ç¡®å®šçš„åˆ—è¡¨ä¼šè¿½åŠ åˆ°å˜é‡å†…容之åŽã€‚如果å˜é‡çš„值包å«åŒå†’å·" -"(B<::>)，则确定的列表会æ’入值的ä¸é—´ï¼ˆä¸¤ä¸ªå†’å·é—´ï¼‰ã€‚" +"如果 $B<MANPATH> 使用冒å·å¼€å¤´ï¼Œåˆ™é»˜è®¤æœç´¢è·¯å¾„å°†æ·»åŠ åˆ°å…¶å¼€å¤´ä½ç½®ã€‚如果 " +"$B<MANPATH> 使用冒å·ç»“尾，则默认æœç´¢è·¯å¾„å°†æ·»åŠ åˆ°å…¶ç»“æŸä½ç½®ã€‚如果å˜é‡çš„值包å«" +"åŒå†’å·ï¼ˆB<::>），则默认æœç´¢è·¯å¾„å°†æ’入到两个冒å·ä¹‹é—´ã€‚" #. type: SH #: ../../man/man5/manpath.man5:96 @@ -3006,13 +2923,6 @@ msgstr "" #. type: Plain text #: ../../man/man5/manpath.man5:157 -#, fuzzy -#| msgid "" -#| "Traditional cat placement would be impossible for read only mounted " -#| "manual page hierarchies and because of this it is possible to specify any " -#| "valid directory hierarchy for their storage. To observe the B<Linux " -#| "FSSTND> the keyword `B<FSSTND> can be used in place of an actual " -#| "directory." msgid "" "Traditional cat placement would be impossible for read only mounted manual " "page hierarchies and because of this it is possible to specify any valid " @@ -3143,12 +3053,10 @@ msgstr "B<CATWIDTH>I<\\ 宽度>" msgid "" "If I<width> is non-zero, cat pages will always be formatted for a terminal " "of the given width, regardless of the width of the terminal actually being " -"used. This should generally be within the range set by B<MINCATWIDTH> and " -"B<MAXCATWIDTH>." +"used. This overrides B<MINCATWIDTH> and B<MAXCATWIDTH>." msgstr "" "如果 I<宽度> 是éžé›¶çš„ï¼Œå¯¹æŒ‡å®šå®½åº¦çš„ç»ˆç«¯å°†æ€»æ˜¯æ ¼å¼åŒ– cat 页é¢ï¼Œä¸ç®¡å®žé™…使用的" -"终端宽度是多少。æ¤æ•°å€¼é€šå¸¸åº”在 B<MINCATWIDTH> å’Œ B<MAXCATWIDTH> 设置的范围之" -"内。" +"终端宽度是多少。æ¤æ•°å€¼å°†è¦†ç›– B<MINCATWIDTH> å’Œ B<MAXCATWIDTH>。" #. type: Plain text #: ../../man/man5/manpath.man5:240 @@ -3232,8 +3140,8 @@ msgid "" msgstr "" "B<%catman%> çš„å¯ç”¨é€‰é¡¹ä¸ºè¦é¢„æ ¼å¼åŒ–çš„æ‰‹å†Œé¡µå±‚æ¬¡ç»“æž„å’Œç« èŠ‚ã€‚é»˜è®¤çš„å±‚æ¬¡ç»“æž„æ˜¯é‚£" "些在 man-db é…置文件ä¸æŒ‡å®šçš„ç³»ç»Ÿå±‚æ¬¡ç»“æž„ï¼Œé»˜è®¤ç« èŠ‚æ˜¯çŽ¯å¢ƒå˜é‡ $B<MANSECT> ä¸ä»¥" -"冒å·åˆ†éš”的内容或编译进 B<%man%> çš„æ ‡å‡†é›†åˆ(如果未定义 $B<MANSECT>)。给 B<" -"%catman%> æä¾›ä¸€ç»„ç©ºæ ¼åˆ†éš”çš„ç« èŠ‚å会覆盖以上两个选项。" +"冒å·åˆ†éš”的内容或编译进 B<%man%> çš„æ ‡å‡†é›†åˆ(如果未定义 $B<MANSECT>)。给 " +"B<%catman%> æä¾›ä¸€ç»„ç©ºæ ¼åˆ†éš”çš„ç« èŠ‚å会覆盖以上两个选项。" #. type: Plain text #: ../../man/man8/catman.man8:55 @@ -3269,8 +3177,8 @@ msgstr "%mandb% - 创建或更新手册页索引缓å˜" msgid "" "B<%mandb%> [\\|B<-dqsucpt?V>\\|] [\\|B<-C> I<file>\\|] [\\|I<manpath>\\|]" msgstr "" -"B<%mandb%> [\\|B<-dqsucpt?V>\\||\\|B<-h>\\||\\|B<-V>\\|] [\\|B<-C> I<文件>" -"\\|] [\\|I<manpath>\\|]" +"B<%mandb%> [\\|B<-dqsucpt?V>\\||\\|B<-h>\\||\\|B<-V>\\|] [\\|B<-C> I<文件" +">\\|] [\\|I<manpath>\\|]" #. type: Plain text #: ../../man/man8/mandb.man8:30 @@ -3283,22 +3191,14 @@ msgstr "" #. type: Plain text #: ../../man/man8/mandb.man8:38 -#, fuzzy -#| msgid "" -#| "B<%mandb%> is used to initialise or manually update B<index> database " -#| "caches that are usually maintained by B<%man%>. The caches contain " -#| "information relevant to the current state of the manual page system and " -#| "the information stored within them is used by the man-db utilities to " -#| "enhance their speed and functionality." msgid "" "B<%mandb%> is used to initialise or manually update B<index> database " "caches. The caches contain information relevant to the current state of the " "manual page system and the information stored within them is used by the man-" "db utilities to enhance their speed and functionality." msgstr "" -"B<%mandb%> 用于åˆå§‹åŒ–或手动更新 B<索引> æ•°æ®åº“缓å˜(通常由 B<%man%> 维护)。缓" -"å˜åŒ…å«ä¸Žæ‰‹å†Œé¡µç³»ç»Ÿå½“å‰çŠ¶æ€ç›¸å…³çš„ä¿¡æ¯ï¼›ä¿å˜åœ¨ç¼“å˜ä¸çš„这些信æ¯è¢« man-db 工具用" -"æ¥æ高速度和增强功能。" +"B<%mandb%> 用于åˆå§‹åŒ–或手动更新 B<索引> æ•°æ®åº“缓å˜ã€‚缓å˜åŒ…å«ä¸Žæ‰‹å†Œé¡µç³»ç»Ÿå½“å‰" +"状æ€ç›¸å…³çš„ä¿¡æ¯ï¼›ä¿å˜åœ¨ç¼“å˜ä¸çš„这些信æ¯è¢« man-db 工具用æ¥æ高速度和增强功能。" #. type: Plain text #: ../../man/man8/mandb.man8:46 @@ -3434,10 +3334,10 @@ msgstr "ä¸èŠ±æ—¶é—´æ£€æŸ¥åˆ 除的手册页并从数æ®åº“ä¸æ¸…ç†å®ƒä»¬ã€‚" #: ../../man/man8/mandb.man8:101 msgid "" "By default, B<%mandb%> will try to update any previously created databases. " -"If a database does not exist, it will create it. This option forces B<%mandb" -"%> to delete previous databases and re-create them from scratch, and implies " -"B<--no-purge.> This may be necessary if a database becomes corrupt or if a " -"new database storage scheme is introduced in the future." +"If a database does not exist, it will create it. This option forces " +"B<%mandb%> to delete previous databases and re-create them from scratch, and " +"implies B<--no-purge.> This may be necessary if a database becomes corrupt " +"or if a new database storage scheme is introduced in the future." msgstr "" "默认情况下，B<%mandb%> 会å°è¯•æ›´æ–°ä»»ä½•ä»¥å‰åˆ›å»ºçš„æ•°æ®åº“。如果æŸä¸ªæ•°æ®åº“ä¸å˜åœ¨ï¼Œ" "程åºä¼šåˆ›å»ºå®ƒã€‚æ¤é€‰é¡¹å¼ºåˆ¶ B<%mandb%> åˆ é™¤ä»¥å‰çš„æ•°æ®åº“并é‡æ–°ç”Ÿæˆæ•°æ®åº“，并éšå«" @@ -3611,56 +3511,57 @@ msgstr "æ¤æ‰‹å†Œé¡µä¸çš„ B<WHATIS PARSING> å°èŠ‚现在是 B<lexgrog>(1) çš„ä¸ #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " #~ "I<locale>\\|] [\\|B<-m> I<system>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> " #~ "I<path>\\|] [\\|B<-S> I<list>\\|] [\\|B<-e> I<extension>\\|] [\\|B<-i>\\||" -#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>" -#~ "\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " -#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> I<encoding>" -#~ "\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> " -#~ "I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|" -#~ "[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|" -#~ "[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|." -#~ "\\|.\\&" +#~ "\\|B<-I>\\|] [\\|B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-" +#~ "only>\\|] [\\|B<-a>\\|] [\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> " +#~ "I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>\\|] [\\|B<-E> " +#~ "I<encoding>\\|] [\\|B<--no-hyphenation>\\|] [\\|B<--no-justification>\\|] " +#~ "[\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<device>\\|]\\|] " +#~ "[\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-" +#~ "Z>\\|] [\\|[\\|I<section>\\|] I<page>[.\\|I<section>\\|]\\ \\|.\\|.\\|." +#~ "\\|]\\ .\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> [\\|B<-C> I<文件>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#~ "warnings>\\|[\\|=I<è¦å‘Š>\\|]\\|] [\\|B<-R> I<ç¼–ç >\\|] [\\|B<-L> I<区域>" -#~ "\\|] [\\|B<-m> I<系统>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<路径>\\|] [\\|" -#~ "B<-S> I<列表>\\|] [\\|B<-e> I<扩展>\\|] [\\|B<-i>\\||\\|B<-I>\\|] [\\|B<--" -#~ "regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>\\|] [\\|B<-a>\\|] [\\|" -#~ "B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> I<分页程åº>\\|] [\\|B<-r> I<" -#~ "æ示>\\|] [\\|B<-7>\\|] [\\|B<-E> I<ç¼–ç >\\|] [\\|B<--no-hyphenation>\\|] " -#~ "[\\|B<--no-justification>\\|] [\\|B<-p> I<å—符串>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<设备>\\|]\\|] [\\|B<-H>\\|[\\|I<æµè§ˆå™¨>\\|]\\|] [\\|B<-X>\\|" -#~ "[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<ç« èŠ‚>\\|] I<页>[.\\|I<ç« èŠ‚>" -#~ "\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" +#~ "warnings>\\|[\\|=I<è¦å‘Š>\\|]\\|] [\\|B<-R> I<ç¼–ç >\\|] [\\|B<-L> I<区域" +#~ ">\\|] [\\|B<-m> I<系统>\\|[\\|,.\\|.\\|.\\|]\\|] [\\|B<-M> I<路径>\\|] " +#~ "[\\|B<-S> I<列表>\\|] [\\|B<-e> I<扩展>\\|] [\\|B<-i>\\||\\|B<-I>\\|] [\\|" +#~ "B<--regex>\\||\\|B<--wildcard>\\|] [\\|B<--names-only>\\|] [\\|B<-a>\\|] " +#~ "[\\|B<-u>\\|] [\\|B<--no-subpages>\\|] [\\|B<-P> I<分页程åº>\\|] [\\|B<-" +#~ "r> I<æ示>\\|] [\\|B<-7>\\|] [\\|B<-E> I<ç¼–ç >\\|] [\\|B<--no-" +#~ "hyphenation>\\|] [\\|B<--no-justification>\\|] [\\|B<-p> I<å—符串>\\|] " +#~ "[\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<设备>\\|]\\|] [\\|B<-H>\\|[\\|I<æµè§ˆå™¨" +#~ ">\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] [\\|[\\|I<ç« èŠ‚" +#~ ">\\|] I<页>[.\\|I<ç« èŠ‚>\\|]\\ \\|.\\|.\\|.\\|]\\ .\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|.\\|." -#~ "\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<section>\\|] I<term>\\ .\\|." +#~ "\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-i>" -#~ "\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<ç« èŠ‚>\\|] I<è¯è¯>\\ .\\|.\\|.\\&" +#~ "B<%man%> B<-K> [\\|B<-w>\\||\\|B<-W>\\|] [\\|B<-S> I<list>\\|] [\\|B<-" +#~ "i>\\||\\|B<-I>\\|] [\\|B<--regex>\\|] [\\|I<ç« èŠ‚>\\|] I<è¯è¯>\\ .\\|.\\|." +#~ "\\&" #~ msgid "" #~ "B<%man%> B<-l> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" #~ "warnings>\\|[\\|=I<warnings>\\|]\\|] [\\|B<-R> I<encoding>\\|] [\\|B<-L> " -#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|B<-7>" -#~ "\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] [\\|" -#~ "B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|B<-X>" -#~ "\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" +#~ "I<locale>\\|] [\\|B<-P> I<pager>\\|] [\\|B<-r> I<prompt>\\|] [\\|" +#~ "B<-7>\\|] [\\|B<-E> I<encoding>\\|] [\\|B<-p> I<string>\\|] [\\|B<-t>\\|] " +#~ "[\\|B<-T>\\|[\\|I<device>\\|]\\|] [\\|B<-H>\\|[\\|I<browser>\\|]\\|] [\\|" +#~ "B<-X>\\|[\\|I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<file> \\&.\\|.\\|.\\&" #~ msgstr "" #~ "B<%man%> B<-l> [\\|B<-C> I<文件>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] [\\|B<--" -#~ "warnings>\\|[\\|=I<è¦å‘Š>\\|]\\|] [\\|B<-R> I<ç¼–ç >\\|] [\\|B<-L> I<区域>" -#~ "\\|] [\\|B<-P> I<分页程åº>\\|] [\\|B<-r> I<æ示>\\|] [\\|B<-7>\\|] [\\|B<-" -#~ "E> I<ç¼–ç >\\|] [\\|B<-p> I<å—符串>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<设" -#~ "备>\\|]\\|] [\\|B<-H>\\|[\\|I<æµè§ˆå™¨>\\|]\\|] [\\|B<-X>\\|[\\|I<dpi>" -#~ "\\|]\\|] [\\|B<-Z>\\|] I<文件> \\&.\\|.\\|.\\&" +#~ "warnings>\\|[\\|=I<è¦å‘Š>\\|]\\|] [\\|B<-R> I<ç¼–ç >\\|] [\\|B<-L> I<区域" +#~ ">\\|] [\\|B<-P> I<分页程åº>\\|] [\\|B<-r> I<æ示>\\|] [\\|B<-7>\\|] [\\|" +#~ "B<-E> I<ç¼–ç >\\|] [\\|B<-p> I<å—符串>\\|] [\\|B<-t>\\|] [\\|B<-T>\\|[\\|I<" +#~ "设备>\\|]\\|] [\\|B<-H>\\|[\\|I<æµè§ˆå™¨>\\|]\\|] [\\|B<-X>\\|[\\|" +#~ "I<dpi>\\|]\\|] [\\|B<-Z>\\|] I<文件> \\&.\\|.\\|.\\&" #~ msgid "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<page> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<page> \\&.\\|.\\|.\\&" #~ msgstr "" -#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<文件>\\|] [\\|B<-d>\\|] [\\|B<-D>" -#~ "\\|] I<页> \\&.\\|.\\|.\\&" +#~ "B<%man%> B<-w>\\||\\|B<-W> [\\|B<-C> I<文件>\\|] [\\|B<-d>\\|] [\\|B<-" +#~ "D>\\|] I<页> \\&.\\|.\\|.\\&" #~ msgid "" #~ "B<%man%> B<-c> [\\|B<-C> I<file>\\|] [\\|B<-d>\\|] [\\|B<-D>\\|] I<page> " @@ -3697,9 +3598,9 @@ msgstr "æ¤æ‰‹å†Œé¡µä¸çš„ B<WHATIS PARSING> å°èŠ‚现在是 B<lexgrog>(1) çš„ä¸ #~ "instead." #~ msgstr "" #~ "如果 B<%man%> 从 B<%mandb%> åˆå§‹åŒ–çš„ B<索引> æ•°æ®åº“ä¸æ‰¾ä¸åˆ°æŸä¸ªæ‰‹å†Œé¡µå±‚次" -#~ "结构，它ä»ç„¶ä¼šæœç´¢è¯·æ±‚的手册页，尽管æœç´¢è¯¥å±‚次结构时需è¦å±•å¼€æ–‡ä»¶ã€‚如果 B<" -#~ "%whatis%> 或 B<%apropos%> 找ä¸åˆ° B<索引>，它会å°è¯•ä»Žä¼ 统的 I<whatis> æ•°æ®" -#~ "库ä¸æå–ä¿¡æ¯ã€‚" +#~ "结构，它ä»ç„¶ä¼šæœç´¢è¯·æ±‚的手册页，尽管æœç´¢è¯¥å±‚次结构时需è¦å±•å¼€æ–‡ä»¶ã€‚如果 " +#~ "B<%whatis%> 或 B<%apropos%> 找ä¸åˆ° B<索引>，它会å°è¯•ä»Žä¼ 统的 I<whatis> æ•°" +#~ "æ®åº“ä¸æå–ä¿¡æ¯ã€‚" #~ msgid "" #~ "These utilities support compressed source nroff files having, by default, " @@ -3727,8 +3628,8 @@ msgstr "æ¤æ‰‹å†Œé¡µä¸çš„ B<WHATIS PARSING> å°èŠ‚现在是 B<lexgrog>(1) çš„ä¸ #~ "B<%man%> will search for the desired manual pages within the I<index> " #~ "database caches. If the B<-u> option is given, a cache consistency check " #~ "is performed to ensure the databases accurately reflect the filesystem. " -#~ "If this option is always given, it is not generally necessary to run B<" -#~ "%mandb%> after the caches are initially created, unless a cache becomes " +#~ "If this option is always given, it is not generally necessary to run " +#~ "B<%mandb%> after the caches are initially created, unless a cache becomes " #~ "corrupt. However, the cache consistency check can be slow on systems " #~ "with many manual pages installed, so it is not performed by default, and " #~ "system administrators may wish to run B<%mandb%> every week or so to keep " @@ -3856,8 +3757,8 @@ msgstr "æ¤æ‰‹å†Œé¡µä¸çš„ B<WHATIS PARSING> å°èŠ‚现在是 B<lexgrog>(1) çš„ä¸ #~ "manpath~5 -E<gt> \"5 5 795981543 A - - format of the /etc/man_db.config " #~ "file\"\n" #~ "whatis -E<gt> \"1 1 795981543 A - - search the manual page names\"\n" -#~ "zsoelim -E<gt> \"1 1 795981543 A - - satisfy .so requests in roff input" -#~ "\"\n" +#~ "zsoelim -E<gt> \"1 1 795981543 A - - satisfy .so requests in roff " +#~ "input\"\n" #~ msgstr "" #~ "$mtime$ -E<gt> “795987034â€\n" #~ "$version$ -E<gt> “2.3.1â€\n" diff --git a/man/pt/Makefile.in b/man/pt/Makefile.in index c5672c18..940a7c54 100644 --- a/man/pt/Makefile.in +++ b/man/pt/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/pt_BR/Makefile.in b/man/pt_BR/Makefile.in index 2653ba58..4f236e0e 100644 --- a/man/pt_BR/Makefile.in +++ b/man/pt_BR/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/ro/Makefile.in b/man/ro/Makefile.in index 924f8c7f..b666201c 100644 --- a/man/ro/Makefile.in +++ b/man/ro/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/ru/Makefile.in b/man/ru/Makefile.in index 7fd7426f..30ee12c8 100644 --- a/man/ru/Makefile.in +++ b/man/ru/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/sr/Makefile.in b/man/sr/Makefile.in index ca16cf54..5b3fb49e 100644 --- a/man/sr/Makefile.in +++ b/man/sr/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/sv/Makefile.in b/man/sv/Makefile.in index 25ab9210..e02aa858 100644 --- a/man/sv/Makefile.in +++ b/man/sv/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/tr/Makefile.in b/man/tr/Makefile.in index 5a855462..78c9f18d 100644 --- a/man/tr/Makefile.in +++ b/man/tr/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/man/zh_CN/Makefile.in b/man/zh_CN/Makefile.in index 26526461..a1e99f14 100644 --- a/man/zh_CN/Makefile.in +++ b/man/zh_CN/Makefile.in @@ -211,6 +211,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -222,8 +223,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -231,7 +232,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -250,6 +251,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -562,6 +564,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -582,6 +585,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -873,6 +877,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1001,6 +1006,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1178,6 +1184,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1333,6 +1340,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1368,6 +1376,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1404,6 +1413,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/manual/Makefile.in b/manual/Makefile.in index 29338b80..fa624698 100644 --- a/manual/Makefile.in +++ b/manual/Makefile.in @@ -212,6 +212,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -223,8 +224,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -232,7 +233,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -251,6 +252,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -351,6 +353,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -371,6 +374,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -662,6 +666,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -790,6 +795,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -967,6 +973,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1122,6 +1129,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1157,6 +1165,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1193,6 +1202,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/manual/comp.me b/manual/comp.me index f6f2c9fa..5907f879 100644 --- a/manual/comp.me +++ b/manual/comp.me @@ -2,7 +2,7 @@ .\" Copyright (c) 2002, 2007 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Thu Sep 21 19:22:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) @@ -31,7 +31,7 @@ Z@compress \-dc It is a relatively easy operation to include further pairs in this structure. See -.i include/comp_src.h +.i lib/compression.c for details and an example. .lp Support for compressed manual pages is compiled into the \*M utilities by diff --git a/manual/db.me b/manual/db.me index bc54251d..e5b0fbf9 100644 --- a/manual/db.me +++ b/manual/db.me @@ -2,7 +2,7 @@ .\" Copyright (c) 2002 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Thu Sep 21 19:22:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/manual/files.me b/manual/files.me index d3c587e2..72c09ed5 100644 --- a/manual/files.me +++ b/manual/files.me @@ -2,7 +2,7 @@ .\" Copyright (c) 2002, 2007 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Thu Sep 21 19:22:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/manual/format.me b/manual/format.me index 351a86bb..14446858 100644 --- a/manual/format.me +++ b/manual/format.me @@ -2,7 +2,7 @@ .\" Copyright (c) 2002 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Thu Sep 21 19:22:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/manual/glossary.me b/manual/glossary.me index fcaa7214..c6d6a799 100644 --- a/manual/glossary.me +++ b/manual/glossary.me @@ -2,7 +2,7 @@ .\" Copyright (c) 2002 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Thu Sep 21 19:22:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/manual/intro.me b/manual/intro.me index 1ce8f8bd..9ab871ba 100644 --- a/manual/intro.me +++ b/manual/intro.me @@ -2,7 +2,7 @@ .\" Copyright (c) 2001, 2002, 2003, 2007 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Thu Sep 21 19:22:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/manual/leader.me b/manual/leader.me index 0efa98ec..a8c12e52 100644 --- a/manual/leader.me +++ b/manual/leader.me @@ -2,7 +2,7 @@ .\" Copyright (c) 2002 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Thu Sep 21 19:22:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/manual/man_db.me b/manual/man_db.me index 3e3c04c0..ca212b47 100644 --- a/manual/man_db.me +++ b/manual/man_db.me @@ -2,7 +2,7 @@ .\" Copyright (c) 2001, 2002, 2007 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Thu Sep 21 19:22:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/manual/misc.me b/manual/misc.me index 332a4b55..48fb8d57 100644 --- a/manual/misc.me +++ b/manual/misc.me @@ -2,7 +2,7 @@ .\" Copyright (c) 2001, 2002 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Thu Sep 21 19:22:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/manual/sec.me b/manual/sec.me index 92aa042c..b8f70c06 100644 --- a/manual/sec.me +++ b/manual/sec.me @@ -2,7 +2,7 @@ .\" Copyright (c) 2002, 2007 Colin Watson. .\" .\" You may distribute under the terms of the GNU General Public -.\" License as specified in the file COPYING that comes with the +.\" License as specified in the file docs/COPYING.GPLv2 that comes with the .\" man-db distribution. .\" .\" Thu Sep 21 19:22:47 BST 1995 Wilf. (G.Wilford@ee.surrey.ac.uk) diff --git a/po/POTFILES.in b/po/POTFILES.in index 7ee81d23..3049ea50 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,3 +1,5 @@ +lib/compression.c +lib/filenames.c lib/pathsearch.c lib/security.c lib/xregcomp.c @@ -8,9 +10,7 @@ libdb/db_ver.c src/accessdb.c src/catman.c src/check_mandirs.c -src/compression.c src/descriptions_store.c -src/filenames.c src/globbing_test.c src/lexgrog.l src/lexgrog_test.c @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.8.0-pre2\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2018-07-11 17:43+0100\n" "Last-Translator: enolp <enolp@softastur.org>\n" "Language-Team: Asturian <ubuntu-l10n-ast@lists.ubuntu.com>\n" @@ -19,7 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 2.0\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "alvertencia: %s: inorando'l nome falsu de ficheru" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "nun pue determinase'l direutoriu actual" @@ -39,39 +44,39 @@ msgstr "l'usuariu man de setuid «%s» nun esiste" msgid "fatal: regex `%s': %s" msgstr "fatal: espresión regular «%s»: %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "nun esiste la clave múltiple %s" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "nun pue bloquiáse la caché del Ãndiz %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "caché del Ãndiz %s toyida" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "nun pue trocase la clave %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "namái %d campu nel contenÃu" msgstr[1] "namái %d campos nel contenÃu" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "receición fallida na clave múltiple %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Toyóse la base de datos de %s. Volvi construyila con mandb --create" @@ -100,9 +105,9 @@ msgstr "[BASE DE DATOS DE MAN]" msgid "The man database defaults to %s%s." msgstr "La base de datos de man por defeutu ye %s%s," -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "emite mensaxes de depuración" @@ -112,39 +117,39 @@ msgstr "emite mensaxes de depuración" msgid "can't open %s for reading" msgstr "nun pue abrise %s pa la llectura" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[SEICIÓN...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "CAMÃN" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "afita'l camÃn de gueta de páxines de manual a CAMIN" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "FICHERU" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "usa esti ficheru de configuración del usuariu" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "el comandu man falló col estáu de salida %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "contenÃu NULL pa la clave: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -153,139 +158,134 @@ msgstr "" "\n" "Anovando los ficheros cat pa la seición %s de la xerarquÃa man %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "nun pue escribise en %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "nun pue lleese la base de datos %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "nun pue anovase %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "alvertencia: %s/man%s/%s.%s*: estensiones en conflictu" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "nun pue anovase la caché del Ãndiz %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "alvertencia: %s: enllaz simbólicu o solicitú ROFF «.so» incorreutos" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "alvertencia: %s: inorando'l ficheru baleru" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "alvertecia: %s: falló l'analÃs de whatis pa %s(%s)" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "nun pue guetase'l direutoriu %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "nun pue facese chown a %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "alvertencia: nun pue crease'l direutoriu cat %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "nun pue facese chmod a %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "nun pue camudase al direutoriu %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "nun pue crease la caché del Ãndiz %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Anovando la caché del Ãndiz pal camÃn «%s/%s». Espera..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "fecho.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Purgando les entraes vieyes de la base de datos de %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "alvertencia: fallu al atroxar la entrada de %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "alvertencia: %s: inorando'l nome falsu de ficheru" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "CAMÃN SEICIÓN NOME" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "ESTENSIÓN" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "llenda la gueta a la triba de la estensión ESTENSIÓN" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "gueta páxines distinguiendo les mayúscules (por defeutu)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "gueta páxines ensin distinguir les mayúscules (por defeutu)" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "interpreta'l nome de la páxina como una espresión regular" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "el nome de la páxina contién comodinos" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "alvertencia: el whatis de %s perpase %d byte, truncando." msgstr[1] "alvertencia: el whatis de %s perpase %d bytes, truncando." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "nun pue abrise %s" @@ -310,19 +310,19 @@ msgstr "analiza como páxina cat" msgid "show whatis information" msgstr "amuesa la informacón de whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "amuesa una serie de peñeres aldovinaes de prepocesamientu" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "CODIFICACIÓN" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "usa la codificación esbillada de salida" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: opciones incompatibles" @@ -332,7 +332,7 @@ msgstr "%s: opciones incompatibles" msgid "command exited with status %d: %s" msgstr "el comandu coló col estáu %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[SEICIÓN] PÃXINA..." @@ -344,133 +344,133 @@ msgstr "reafita toles opciones" msgid "WARNINGS" msgstr "ALVERTENCIES" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "activa toles alvertencies de groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Moos principales d'operación:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "equival a whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "equival a apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "gueta testu en toles páxines" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "amuesa l'allugamientu fÃsicu de les páxines man" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "amuesa l'allugamientu fÃsicu de los ficheros cat" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpreta los argumentos de PÃXINA como nomes de ficheru llocal" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "usáu por catman pa reformatiar les páxines cat anticuaes" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "amuesa la salida de la páxina fonte cola codificación CODIFICACIÓN" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Gueta de páxines de manual:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOCALE" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "define la locale d'esta gueta especÃfica de man" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SISTEMA" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "usa les páxines de manual d'otros sistemes" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LLISTA" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "usa una llista de seiciones separtada per comes" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "amuesa toles páxines que concasen cola espresión regular" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "amuesa les páxines que concasen col comodÃn" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "fai que --regex y --wildcard concasen namái colos nome de páxina, non les " "descripciones" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "alcuentra toles páxines de manual que concasen" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "forcia una comprobación de consistencia de la caché" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "nun prueba les sopáxines, por exemplu «man foo bar» => «man foo-bar»" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Control de salida formatiada:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PAXINADOR" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "usa'l programa PAXINADOR p'amosar la salida" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "CADENA" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "apurre'l paxinador «less» con una llinia de comandos" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "amuesa la traducción ASCII de ciertos caráuteres latin1" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "desactiva la separtación con guiones" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "desactiva la xustificación" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -480,34 +480,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "usa %s pa formatiar páxines" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "PRESÉU" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "usa %s col preséu esbilláu" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "RESTOLADOR" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "usa %s o RESTOLADOR p'amosar la salida en HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "RESOLUCIÓN" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -515,87 +515,87 @@ msgstr "" "usa groff y amuésase pente gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "usa groff y forcia la producción de ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Nun hai entrada de manual pa %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Alternativamente, ¿qué páxina de manual quies de la seición %s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "¿Qué páxina de manual quies?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Nun hai entrada de manual pa %s na seición %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" "Mira «%s» pa más ayuda cuando nun heba páxines de manual disponibles.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "inorando'l preprocesador desconocÃu «%c»" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "nun pue renomase %s a %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "nun pue afitase la data en %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "nun pue desenllazase %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "nun pue crease'l cat temporal pa %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "nun pue crease'l direutoriu temporal" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "nun pue crease'l ficheru temporal %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "nun pue desaniciase'l direutoriu %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- siguiente: %s [ volver (retrocesu) | saltar (Ctrl-D) | colar (Ctrl-" "C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -604,27 +604,27 @@ msgstr "" "\n" "nun pue escribise en %s nel mou catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Nun pue convertise %s a un nome de cat" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: basase en referencies whatis ta anticuao\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "falló'l comandu mandb col estáu de salida %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "fallu internu: la triba de candidatu %d ta fuera de rangu" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr "Páxina de manual" @@ -640,7 +640,7 @@ msgstr "CÓDIGU" msgid "encoding for output" msgstr "codificación pa la salida" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "" @@ -671,7 +671,7 @@ msgstr "" msgid "--suffix and --in-place are mutually exclusive" msgstr "" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "nun pue desaniciase %s" @@ -698,163 +698,163 @@ msgstr "CODIGU[:...]" msgid "possible encodings of original text" msgstr "codificaciones posibles del testu orixinal" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[CAMÃN_DE_MAN]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "trabaya de mou silenciosu quitante cuando heba alvertencies «falses»" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "nun gueta o amiesta cats güerfanos a les bases de datos" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "nun purga les entraes obsoletes de les bases de datos" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "produz namái bases de datos d'usuariu" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "crea bases de datos nueves en cuentes d'anovales" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "comprueba que les páxines de manual seyan correutes" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "NOME_DE_FICHERU" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "namái anueva la entrada pa esti nome de ficheru" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "nun pue escribise en %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "nun pue lleese dende %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Procesando les páxines de manual so %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Desaniciando'l direutoriu cat obsoletu %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "alvertencia: nun hai denguna direutiva MANDB_MAP en %s, usando'l to manpath" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "%d sodireutoriu man contenÃa páxines de manual más nueves.\n" msgstr[1] "%d sodireutorios man contenÃen páxines de manual más nueves.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "Amestóse %d páxina de manual.\n" msgstr[1] "Amestáronse %d páxines de manual.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "Amestóse %d cat güérfanu.\n" msgstr[1] "Amestáronse %d cats güérfanos.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "Purgóse %d entrada vieya de la base de datos.\n" msgstr[1] "Purgáronse %d entraes vieyes de la base de datos.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Nun hai bases de datos creaes." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "" "nun pue dase sentÃu al ficheru de configuración de los caminos de man %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "alvertencia: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "alvertencia: %s nun ye un direutoriu" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "alvertencia: $PATH nun s'afitó" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "alvertencia: $PATH ta baleru" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "alvertencia: afitóse $MANPATH , amestando al principiu %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "alvertencia: afitóse $MANPATH , amestando %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "alvertencia: afitóse $MANPATH , inxertando %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "alvertencia: afitóse $MANPATH , inorando %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "nun pue analizase la llista de direutorios «%s»" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "nun pue abrise'l ficheru de configuración de los caminos de man %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "alvertencia: el direutoriu obligatoriu %s nun esiste" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "alvertencia: %s nun apenza per %s" @@ -867,113 +867,113 @@ msgstr "amuesa caminos rellativos de cat" msgid "show the entire global manpath" msgstr "amuesa'l camÃn de man global enteru" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "alvertencia: nun s'afitaron caminos de man globales nel ficheru de " "configuración %s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Comprobando los cats güerfanos so %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "alvertencia: %s ye un enllaz simbólicu inservible" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "nun pue resolvese %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Comprobando los cats güerfanos so %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s fai referencia a sigo mesmu" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "PALLABRA_CLAVE..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "La opción --regex ta activada por defeutu" -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "amuesa mensaxes d'alvertencia detallaos" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "interpreta cada pallabra clave como una espresión regular" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "gueta coincidencies exautes en cada pallabra clave" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "Les pallabres clave contienen comodinos" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "rique que toles pallabres clave concasen" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "nun axusta la salida al anchor de la terminal" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "gueta namái estes seiciones (separtaes per comes)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "define la locale d'esta gueta" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "¿%s qué?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "alvertencia: %s contién un bucle de punteros" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(asuntu desconocÃu)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nun hai nada afayadizo.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: les solicitúes .so tán perañeraes o son recursives" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: alvertancia: fallu na solicitú .so" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: alvertencia: llinia nueva na solicitú .so, inorando" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: alvertencia: llinia nueva na solicitú .lf, inorando" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: comilles ensin zarrar na solicitú roff" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.7.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2015-08-04 08:34+0200\n" "Last-Translator: Jordi Mallach <jordi@gnu.org>\n" "Language-Team: Catalan <ca@dodds.net>\n" @@ -17,7 +17,14 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n!=1;\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +# Aquesta accepció d'«ignorar» és un anglicisme. Descartar? ivb +# SÃ, de fet ho volia haver marcat amb "jm". jm +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "avÃs: %s: s'ha descartat un nom de fitxer estrany" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "no es pot determinar el directori actual" @@ -37,7 +44,7 @@ msgstr "l'usuari man setuid «%s» no existeix" msgid "fatal: regex `%s': %s" msgstr "fatal: expreg «%s»: %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "la clau múltiple %s no existeix" @@ -45,36 +52,36 @@ msgstr "la clau múltiple %s no existeix" # Potser «%s» és de la cache i no de l'Ãndex, aleshores seria: # «no es pot blocar la cache d'Ãndexs %s» o semblant. ivb # Després de consultar-ho, tens raó. jm -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "no es pot blocar la memòria cau d'Ãndex %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "la memòria cau d'Ãndex %s està corrompuda" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "no es pot reemplaçar la clau %s" # I què tal «només hi ha...». ivb # yep. jm -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "només hi ha %d camp en el contingut" msgstr[1] "només hi ha %d camps en el contingut" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "recepció errònia en clau múltiple %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "La base de dades %s està corrompuda; reconstruïu-la amb mandb --create" @@ -103,9 +110,9 @@ msgstr "[BASE DE DADES DE MAN]" msgid "The man database defaults to %s%s." msgstr "La base de dades de man per defecte és %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "produeix informació de depuració" @@ -115,41 +122,41 @@ msgstr "produeix informació de depuració" msgid "can't open %s for reading" msgstr "no es pot obrir %s per a lectura" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[SECCIÓ…]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "CAMÃ" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "estableix el camà de cerca de pà gines de manual a CAMÃ" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "FITXER" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "empra aquest fitxer de configuració de l'usuari" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "l'ordre de man ha fallat amb l'estat d'eixida %d" # Potser siga només «per», en tot cas crec que «de» és més adequat. ivb -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "contingut NUL de la clau: %s" # Alguna guia d'estil proposava «S'estan actualitzant...». ivb -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -159,146 +166,139 @@ msgstr "" "S'estan actualitzant els fitxers cat per a la secció %s de la jerarquia de " "man %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "no es pot escriure en %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "no es pot llegir la base de dades %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "no es pot actualitzar %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "avÃs: %s/man%s/%s.%s*: extensions en competència" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "no es pot actualitzar la memòria cau d'Ãndex %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "avÃs: %s: enllaç simbòlic o petició ROFF «.so» incorrecte" # «es descarta...» ivb -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "avÃs: %s: es descarta un fitxer buit" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "avÃs: %s: l'anà lisi de whatis per a %s(%s) ha fallat" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "no es pot cercar el directori %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "no es pot fer «chown» a %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "avÃs: no es pot crear el directori de cat %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "no es pot fer «chmod» a %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "no es pot canviar al directori %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "no es pot crear la memòria cau d'Ãndex %s" # S'està ... Per/per a/de? ivb -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "S'està actualitzant la memòria cau d'Ãndex del camà «%s/%s». Espereu…" -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "fet.\n" # S'estan... ivb -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "S'estan purgant entrades antigues de la base de dades en %s…\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "avÃs: no s'ha pogut desar l'entrada per a %s(%s)" -# Aquesta accepció d'«ignorar» és un anglicisme. Descartar? ivb -# SÃ, de fet ho volia haver marcat amb "jm". jm -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "avÃs: %s: s'ha descartat un nom de fitxer estrany" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "CAMà SECCIÓ NOM" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "EXTENSIÓ" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "limita la cerca al tipus d'extensió EXTENSIÓ" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "" "cerca les pà gines sense diferenciar majúscules i minúscules (per defecte)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "cerca les pà gines diferenciant majúscules i minúscules" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "interpreta el nom de la pà gina com si fora una expressió regular" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "el nom de la pà gina conté comodins" # Es trunca, es truncarà ? ivb -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "avÃs: el whatis per a %s s'excedeix en %d octet, es truncarà ." msgstr[1] "avÃs: el whatis per a %s s'excedeix en %d octets, es truncarà ." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "no es pot obrir %s" @@ -323,20 +323,20 @@ msgstr "analitza com si fora una pà gina de cat" msgid "show whatis information" msgstr "mostra informació whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "mostra sèries endevinades de filtres de preprocés" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "CODIFICACIÓ" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "empra la codificació d'eixida seleccionada" # Frase completa: «les opcions són incompatibles» ivb -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: les opcions són incompatibles" @@ -346,7 +346,7 @@ msgstr "%s: les opcions són incompatibles" msgid "command exited with status %d: %s" msgstr "l'ordre ha finalitzat amb l'estat %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[SECCIÓ] PÀGINA…" @@ -358,133 +358,133 @@ msgstr "reestableix totes les opcions als seus valors per defecte" msgid "WARNINGS" msgstr "AVISOS" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "habilita els avisos del groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Modes principals de funcionament:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "equivalent a «whatis»" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "equivalent a «apropos»" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "cerca text a totes les pà gines" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "mostra la ubicació fÃsica de les pà gines de manual" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "mostra la ubicació fÃsica dels fitxers cat" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpreta els arguments PÀGINA com a noms de fitxers locals" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "emprat per catman per a reformatar pà gines de cat antiquades" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "mostra el font de la pà gina codificat amb CODIFICACIÓ" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Cerca de pà gines de manual:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOCALE" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "defineix el locale per a aquesta cerca de manuals concreta" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SISTEMA" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "empra pà gines de manual d'altres sistemes" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LLISTA" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "empra una llista de seccions separada per dos punts" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "mostra totes les pà gines que concorden amb una expressió regular" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "mostra totes les pà gines que concorden amb un comodÃ" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "fes que --regex i --wildcard concorden només amb noms de pà gines, no " "descripcions" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "cerca totes les pà gines de manual coincidents" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "força una comprovació de consistència de la memòria cau" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "no proves subpà gines, p. ex. «man foo bar» → «man foo-bar»" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Control de l'eixida formatada" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PAGINADOR" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "empra el programa PAGINADOR per a mostrar l'eixida" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "CADENA" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "proveeix el paginador «less» amb un indicador" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "mostra traduccions ASCII d'alguns carà cters latin1" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "inhabilita la separació sil·là bica" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "inhabilita el sagnat" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -494,34 +494,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "empra %s per a formatar les pà gines" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "DISPOSITIU" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "empra %s amb el dispositiu seleccionat" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "NAVEGADOR" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "empra %s o NAVEGADOR per a mostrar l'eixida HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "RESOLUCIÓ" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -529,36 +529,36 @@ msgstr "" "empra groff i mostra a través de gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "utilitza groff i força la producció de ditroff" # per/per a/de? ivb # crec que és millor per a. jm -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "No hi ha una entrada de manual per a %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Alternativament, quina pà gina de manual voleu de la secció %s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Quina pà gina de manual voleu?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "No hi ha una entrada de manual per a %s a la secció %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" @@ -566,12 +566,12 @@ msgstr "" "disponibles.\n" # «es descarta el...» ivb -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "es descarta el preprocessador desconegut «%c»" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "no es pot reanomenar %s a %s" @@ -579,43 +579,43 @@ msgstr "no es pot reanomenar %s a %s" # Segurament es referirà a l'{a,m,c}time; hores/dates? ivb # I en eixe cas, què sugereixes? jm # Allò que s'use majorità riament pel cas, només era per assegurar-me. ivb -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "no es poden establir les hores en %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "no es pot desenllaçar %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "no es pot crear un fitxer cat temporal per a %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "no es pot crear un directori temporal" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "no es pot obrir el fitxer temporal %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "no es pot eliminar el directori %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- següent: %s [ visualitza (retorn) | omet (Ctrl-D) | surt (Ctrl-C ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -624,29 +624,29 @@ msgstr "" "\n" "no es pot escriure a %s en el mode catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "No es pot convertir %s a nom cat" # Lo de sempre, deprecated? jm -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: basar-se en referències whatis està desaconsellat\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "l'ordre de mandb ha fallat amb l'estat d'eixida %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" "s'ha produït un error intern: el candidat de tipus %d està fora de rang" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Pà gina de manual " @@ -662,7 +662,7 @@ msgstr "CODI" msgid "encoding for output" msgstr "codificació per a l'eixida" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "" @@ -693,7 +693,7 @@ msgstr "" msgid "--suffix and --in-place are mutually exclusive" msgstr "" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "no es pot eliminar %s" @@ -720,170 +720,170 @@ msgstr "CODI[:…]" msgid "possible encodings of original text" msgstr "codificacions possibles del text original" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[CAMà DE MAN]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "treballa silenciosament, excepte per a avisos estranys" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "no cerques o afegisques cats orfes a les bd" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "no purgues entrades obsoletes de les bd" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "produeix només bases de dades d'usuari" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "crea db noves, en comptes d'actualitzar-les" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "comprova que les pà gines de manual són correctes" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "NOMFITXER" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "actualitza només l'entrada per a aquest nom de fitxer" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "no es pot escriure en %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "no es pot llegir de %s" # Si es refereix a un directori, «sota». ivb -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Processant pà gines de manual sota %s…\n" # S'estan... ivb -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "S'està suprimint el directori de cats obsolet %s…\n" # s'està utilitzant/s'utilitza/s'utilitzarà ivb -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "avÃs: no hi ha directives MANDB_MAP en %s, s'utilitzarà el vostre camà de man" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "%d subdirectori de man contenia pà gines de manual més noves.\n" msgstr[1] "%d subdirectoris de man contenien pà gines de manual més noves.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "S'ha afegit %d pà gina de manual.\n" msgstr[1] "S'han afegit %d pà gines de manual.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "S'ha afegit %d cat orfe.\n" msgstr[1] "S'han afegit %d cats orfes.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "S'ha purgat %d entrada vella de la base de dades.\n" msgstr[1] "S'han purgat %d entrades velles de la base de dades.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "No s'ha creat cap base de dades." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "no s'enten el fitxer de configuració del camà de man %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "avÃs: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "avÃs: %s no és un directori" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "avÃs: $PATH no està establert" # Frase completa. ivb -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "avÃs: $PATH està buit" # Frase completa. ivb -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "avÃs: $MANPATH està establert, s'afegirà al principi %s" # Frase completa. ivb -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "avÃs: $MANPATH està establert, s'afegirà %s" # Frase completa. ivb -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "avÃs: $MANPATH està establert, s'inserirà %s" # Frase completa. Anglicisme. ivb -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "avÃs: $MANPATH establert, es descartarà %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "no es pot analitzar sintà cticament la llista de directoris «%s»" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "no es pot obrir el fitxer de configuració del camà de man %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "avÃs: el directori requerit %s no existeix" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "avÃs: %s no comença amb %s" @@ -896,81 +896,81 @@ msgstr "mostra els camins de cat relatius" msgid "show the entire global manpath" msgstr "mostra el camà de man global sencer" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "avÃs: no hi ha camins de man globals establerts al fitxer de configuració %s" -#: src/straycats.c:242 src/ult_src.c:128 +# S'estan... ivb +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "S'estan cercant cats orfes sota %s…\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "avÃs: %s és un enllaç simbòlic trencat" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "no es pot resoldre %s" -# S'estan... ivb -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "S'estan cercant cats orfes sota %s…\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s es referència a ell mateix" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "PARAULACLAU…" -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "L'opció --regex està habilitada per defecte." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "mostra missatges d'avÃs detallats" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "interpreta cada paraula clau com si fora una expressió regular" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "cerca coincidències exactes en cada paraula clau" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "les paraules clau contenen comodins" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "requereix que concorden totes les paraules clau" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "no ajustes l'eixida a l'amplada del terminal" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "cerca només en aquestes seccions (separades per punts i coma)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "defineix el locale per a aquesta cerca" # «comor?» ivb # «el que tu has dit entendre no he pogut» yoda -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s què?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "avÃs: %s conté un bucle de punters" @@ -979,39 +979,39 @@ msgstr "avÃs: %s conté un bucle de punters" # Gènere? Nombre? És bo posar-ne un comentari. ivb # Pareix que es refereix al resultat d'un whois. «whois desconegut?» jm # Arreglat en 2.4.0pre. jm -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(assumpte desconegut)" # «res d'apropiat»? ivb -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: res d'apropiat.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "" "%s:%d: les peticions de .so estan niuades amb massa profunditat o són " "recursives" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: avÃs: ha fallat la petició de .so" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: avÃs: nova lÃnia a la petició de .so, es descarta" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: avÃs: nova lÃnia a la petició .lf, es descarta" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: cometa no terminada a la petició roff" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.10.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2022-01-25 10:07+01:00\n" "Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n" "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n" @@ -20,7 +20,12 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "varovánÃ: %s: ignoruje se faleÅ¡ný název souboru" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "nelze zjistit aktuálnà složku" @@ -40,27 +45,27 @@ msgstr "uživatel manuálových stránek „%s“ použitý v setuid neexistuje" msgid "fatal: regex `%s': %s" msgstr "Fatálnà chyba: regulárnà výraz „%s“: %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "vÃcenásobný klÃÄ %s neexistuje" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "nelze zamknout rejstÅ™Ãk %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "rejstÅ™Ãk %s je poÅ¡kozen" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "nelze nahradit klÃÄ %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" @@ -68,12 +73,12 @@ msgstr[0] "pouze %d položka v obsahu" msgstr[1] "pouze %d položky v obsahu" msgstr[2] "pouze %d položek v obsahu" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "nelze zÃskat vÃcenásobný klÃÄ %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Databáze %s je poÅ¡kozena; znovu ji sestavte pomocà „mandb --create“" @@ -102,9 +107,9 @@ msgstr "[MANUÃLOVà DATABÃZE]" msgid "The man database defaults to %s%s." msgstr "Výchozà manuálová databáze je %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "vysÃlat ladicà zprávy" @@ -114,39 +119,39 @@ msgstr "vysÃlat ladicà zprávy" msgid "can't open %s for reading" msgstr "soubor %s nelze otevÅ™Ãt pro ÄtenÃ" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[ODDÃL…]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "CESTA" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "nastavit cestu pro vyhledávánà v manuálových stránkách na CESTA" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "SOUBOR" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "použÃt tento soubor s uživatelským nastavenÃm" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "pÅ™Ãkaz man skonÄil s návratovým kódem %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "položka pod klÃÄem %s je prázdná" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -155,130 +160,125 @@ msgstr "" "\n" "Aktualizujà se katalogové soubory pro oddÃl %s v manuálové hierarchii %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "nelze zapisovat do %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "databázi %s nelze ÄÃst" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "nelze aktualizovat %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "varovánÃ: %s/man%s/%s.%s*: nesluÄitelné pÅ™Ãpony" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "nelze aktualizovat rejstÅ™Ãk %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "varovánÃ: %s: chybný symbolický odkaz nebo požadavek „.so“ od ROFF" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "varovánÃ: %s: ignoruje se prázdný soubor" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "varovánÃ: %s: selhalo zpracovánà programem whatis pro %s(%s)" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "nelze prohledat složku %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "nelze zmÄ›nit vlastnictvà %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "varovánÃ: nelze vytvoÅ™it složku %s pro katalogy" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "nelze zmÄ›nit oprávnÄ›nà k %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "nelze se pÅ™epnout do složky %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "nelze vytvoÅ™it rejstÅ™Ãk %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Aktualizuje se rejstÅ™Ãk pro cestu „%s/%s“. ÄŒekejte…" -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "dokonÄeno.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Mažou se staré databázové záznamy v %s…\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "varovánÃ: selhalo uchovánà záznamu pro %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "varovánÃ: %s: ignoruje se faleÅ¡ný název souboru" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "CESTA ODDÃL NÃZEV" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "PŘÃPONA" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "omezit hledánà na pÅ™Ãpony typu PŘÃPONA" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "pÅ™i hledánà stránek nerozliÅ¡ovat velikost pÃsmen (výchozÃ)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "pÅ™i hledánà stránek rozliÅ¡ovat velikost pÃsmen" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "považovat název stránky za regulárnà výraz" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "název stránky obsahuje divoké znaky" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." @@ -286,9 +286,9 @@ msgstr[0] "varovánÃ: program whatis pro %s pÅ™ekroÄil %d bajt, bude zkrácen" msgstr[1] "varovánÃ: program whatis pro %s pÅ™ekroÄil %d bajty, bude zkrácen" msgstr[2] "varovánÃ: program whatis pro %s pÅ™ekroÄil %d bajtů, bude zkrácen" -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "nelze otevÅ™Ãt soubor %s" @@ -313,19 +313,19 @@ msgstr "zpracovat jako katalogové stránky" msgid "show whatis information" msgstr "zobrazit informace programu whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "zobrazit pÅ™edpokládanou sérii pÅ™edzpracujÃcÃch filtrů" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "KÓDOVÃNÃ" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "použÃt vybrané výstupnà kódovánÃ" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: nekompatibilnà pÅ™epÃnaÄe" @@ -335,7 +335,7 @@ msgstr "%s: nekompatibilnà pÅ™epÃnaÄe" msgid "command exited with status %d: %s" msgstr "pÅ™Ãkaz skonÄil s návratovým kódem %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[ODDÃL] STRÃNKA…" @@ -347,135 +347,135 @@ msgstr "nastavit vÅ¡echny pÅ™epÃnaÄe na jejich výchozà hodnoty" msgid "WARNINGS" msgstr "VAROVÃNÃ" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "povolit varovánà od programu groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Hlavnà režimy operacÃ:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "to stejné jako program whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "to stejné jako program apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "hledat text ve vÅ¡ech stránkách" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "vypsat fyzické umÃstÄ›nà manuálové stránky (Äi stránek)" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "vypsat fyzické umÃstÄ›nà katalogového souboru (Äi souborů)" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "" "vykládat si argument(y) STRÃNKA jako název mÃstnÃho souboru (Äi souborů)" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "použÃt program catman k pÅ™eformátovánà neaktuálnÃch stránek" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "vypsat zdrojovou stránku kódovanou v KÓDOVÃNÃ" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Hledánà manuálových stránek:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOCALE" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "" "definovat národnà prostÅ™edà LOCALE pro toto konkrétnà hledánà v manuálových " "stránkách" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SYSTÉM" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "použÃt manuálové stránky z jiných systémů" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "SEZNAM" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "použÃt dvojteÄkami oddÄ›lovaný seznam oddÃlů" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "zobrazit vÅ¡echny stránky odpovÃdajÃcà regulárnÃmu výrazu" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "zobrazit vÅ¡echny stránky odpovÃdajÃcà divokým znakům" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "nechÅ¥ se --regex a --wildcard porovnávajà jen s názvem stránky, ne s popisem" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "najÃt vÅ¡echny odpovÃdajÃcà manuálové stránky" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "vynutit kontrolu konzistence mezipamÄ›ti" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "nezkouÅ¡et podstránky, napÅ™. „man hokus pokus“ => „man hokus-pokus“" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "ŘÃzenà formátovaného výstupu:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "ZOBRAZOVAÄŒ" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "použÃt program ZOBRAZOVAÄŒ k zobrazenà výstupu" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "ŘETÄšZEC" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "poskytne zobrazovacà program „less“ s pÅ™Ãkazovým řádkem" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "nÄ›které znaky latin1 zobrazovat pÅ™episem do ASCII" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "vypnout dÄ›lnà slov" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "vypnout zarovnávánÃ" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -485,34 +485,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "použÃvat program %s k formátovánà stránek" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "ZAŘÃZENÃ" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "použÃvat program %s s vybraným zaÅ™ÃzenÃm" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "PROHLÃŽEÄŒ" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "použÃt %s nebo PROHLÃŽEÄŒ k zobrazenà výstupu v HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "ROZLIÅ ENÃ" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -520,86 +520,86 @@ msgstr "" "použÃt program groff a zobrazit pÅ™es gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "použÃt program groff a pÅ™imÄ›t ho vytvoÅ™it ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Manuálová stránka pro %s nebyla nalezena\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Respektive, kterou manuálovou stránku z oddÃlu %s si pÅ™ejete?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Kterou manuálovou stránku si pÅ™ejete?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "Na pÅ™Ãklad zkuste „man man“.\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Manuálová stránka pro %s nebyla v oddÃle %s nalezena\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Pokud nejsou manuálové stránky dostupné, použijte pro nápovÄ›du „%s“.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ignoruje se neznámé pÅ™edzpracovánà „%c“" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "%s nelze pÅ™ejmenovat na %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "nelze nastavit Äas na %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "nelze smazat %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "nelze vytvoÅ™it doÄasný katalog pro %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "nelze vytvoÅ™it doÄasnou složku" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "nelze otevÅ™Ãt doÄasný soubor %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "nelze odstranit složku %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- následujÃcÃ: %s [zobrazit (enter) | pÅ™eskoÄit (Ctrl-D) | ukonÄit " "(Ctrl-C)]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -608,27 +608,27 @@ msgstr "" "\n" "do %s nelze v režimu catman zapisovat" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "%s nelze pÅ™evést na název katalogu" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: spoléhat se na to, co program whatis považuje za neschválené\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "program mandb skonÄil s návratovým kódem %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "internà chyba: kandidujÃcà typ %d je mimo rozsah" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Manuálová stránka " @@ -644,7 +644,7 @@ msgstr "KÓD" msgid "encoding for output" msgstr "kódovánà pro výstup" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "PŘÃPONA" @@ -675,7 +675,7 @@ msgstr "je nutné použÃt buÄ --suffix, nebo --in-place" msgid "--suffix and --in-place are mutually exclusive" msgstr "pÅ™epÃnaÄe --suffix a --in-place se vzájemnÄ› vyluÄujÃ" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "nelze odstranit soubor %s" @@ -701,69 +701,69 @@ msgstr "KÓD[:…]" msgid "possible encodings of original text" msgstr "možná kódovánà originálnÃho textu" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[CESTA_K_MANUÃLOVÃM_STRÃNKÃM]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "pracovat tiÅ¡e, s výjimkou „faleÅ¡ných“ varovánÃ" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "nehledat a nepÅ™idávat do databáze bezprizornà katalogy" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "nemazat z databáze zastaralé záznamy" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "vytvoÅ™it pouze uživatelskou databázi" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "vytvoÅ™it databázi radÄ›ji od pÃky, než ji aktualizovat" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "zkontrolovat, zda jsou manuálové stránky v pořádku" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "SOUBOR" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "aktualizovat jen záznam pro tento soubor" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "nelze zapisovat do souboru %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "nelze ÄÃst ze souboru %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Zpracovávajà se manuálové stránky ve složce %s…\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Odstraňuje se zastaralá složka katalogů %s…\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "varovánÃ: v souboru %s nenà direktiva MANDB_MAP, použije se program manpath" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" @@ -771,7 +771,7 @@ msgstr[0] "%d manuálová podsložka obsahovala nové manuálové stránky.\n" msgstr[1] "%d manuálové podsložky obsahovaly nové manuálové stránky.\n" msgstr[2] "%d manuálových podsložek obsahovalo nové manuálové stránky.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" @@ -779,7 +779,7 @@ msgstr[0] "%d manuálová stránka byla pÅ™idána.\n" msgstr[1] "%d manuálové stránky byly pÅ™idány.\n" msgstr[2] "%d manuálových stránek bylo pÅ™idáno.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" @@ -787,7 +787,7 @@ msgstr[0] "Byl pÅ™idán %d bezprizornà katalog.\n" msgstr[1] "Byly pÅ™idány %d bezprizornà katalogy.\n" msgstr[2] "Bylo pÅ™idáno %d bezprizornÃch katalogů.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" @@ -795,72 +795,72 @@ msgstr[0] "Byl vymazán %d starý databázový záznam.\n" msgstr[1] "Byly vymazány %d staré databázové záznamy.\n" msgstr[2] "Bylo vymazáno %d starých databázových záznamů.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Nebyla vytvoÅ™ena žádná databáze." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "ze souboru %s s nastavenÃm nelze zjistit cesty k manuálovým stránkám" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "varovánÃ: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "varovánÃ: %s nenà složka" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "varovánÃ: promÄ›nná $PATH nenà nastavena" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "varovánÃ: prázdná promÄ›nná $PATH" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "varovánÃ: promÄ›nná $MANPATH nastavena, na zaÄátek pÅ™idáno %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "varovánÃ: promÄ›nná $MANPATH nastavena, na konec pÅ™idáno %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "varovánÃ: promÄ›nná $MANPATH nastavena, vloženo %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "varovánÃ: promÄ›nná $MANPATH nastavena, ignorováno %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "seznam složek „%s“ nelze zpracovat" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "nelze otevÅ™Ãt soubor %s s nastavenÃm cest k manuálovým stránkám" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "varovánÃ: povinná složka %s neexistuje" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "varovánÃ: cesta %s nezaÄÃná na %s" @@ -873,113 +873,113 @@ msgstr "zobrazovat relativnà cesty ke katalogům" msgid "show the entire global manpath" msgstr "zobrazovat celé globálnà cesty k manuálovým stránkám" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "varovánÃ: v souboru %s s nastavenÃm nejsou nastaveny žádné globálnà cesty k " "manuálovým stránkám" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Kontrolujà se bezprizornà katalogy ve složce %s…\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "varovánÃ: %s je symbolický odkaz ukazujÃcà na neexistujÃcà soubor" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "cestu %s nelze zpracovat" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Kontrolujà se bezprizornà katalogy ve složce %s…\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "stránka %s se odkazuje sama na sebe" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "KLÃÄŒOVÉ_SLOVO…" -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "PÅ™epÃnaÄ --regex je standardnÄ› zapnutý." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "vypisovat podrobné varovné zprávy" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "každé klÃÄové slovo považovat za regulárnà výraz" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "každé klÃÄové slovo hledat na pÅ™esnou shodu" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "klÃÄové slovo (Äi slova) obsahujà divoké znaky" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "požadovat shodu vÅ¡ech klÃÄových slov" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "neoÅ™ezávat výstup na Å¡ÃÅ™ku terminálu" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "prohledávat jen tyto oddÃly (oddÄ›lené dvojteÄkou)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "definovat národnà prostÅ™edà pro toto hledánÃ" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "Co má pÅ™Ãkaz %s provést?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "varovánÃ: %s obsahuje zacyklený ukazatel" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(neznámý pÅ™edmÄ›t)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nic neodpovÃdá.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: požadavky .so se zanoÅ™ily pÅ™ÃliÅ¡ hluboko nebo jsou rekurzivnÃ" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: varovánÃ: selhal požadavek .so" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: varovánÃ: nový řádek v požadavku .so, ignorován" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: varovánÃ: nový řádek v požadavku .lf, ignorován" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: nezakonÄené uvozovky v požadavku roff" Binary files differ@@ -4,7 +4,7 @@ # Christian Rose <menthos@menthos.com>, 2002. # Keld Simonsen <keld@dkuug.dk>, 2003. # Byrial Ole Jensen <byrial@image.dk>, 2003. -# Joe Hansen <joedalton2@yahoo.dk>, 2011, 2012, 2016. +# Joe Hansen <joedalton2@yahoo.dk>, 2011, 2012, 2016, 2022. # # cat -> katalog # dbs -> databaser @@ -18,10 +18,10 @@ # msgid "" msgstr "" -"Project-Id-Version: man-db 2.7.6.1\n" +"Project-Id-Version: man-db 2.10.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" -"PO-Revision-Date: 2016-12-12 23:42+0100\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" +"PO-Revision-Date: 2022-05-28 23:42+0100\n" "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n" "Language-Team: Danish <dansk@dansk-gruppen.dk>\n" "Language: da\n" @@ -31,10 +31,15 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "advarsel: %s: ignorerer fejlagtigt filnavn" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" -msgstr "kan ikke bestemme aktuelt katalog" +msgstr "kan ikke bestemme aktuel mappe" #: lib/security.c:80 #, c-format @@ -51,39 +56,39 @@ msgstr "en manualbruger »%s« som er setuid findes ikke" msgid "fatal: regex `%s': %s" msgstr "fatalt: regulært udtryk »%s«: %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "multinøglen %s findes ikke" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "kan ikke lÃ¥se indekscachen %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "indekscachen %s er ødelagt" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "kan ikke erstatte nøglen %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "kun %d felt i indhold" msgstr[1] "kun %d felter i indhold" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "fejlagtig hentning pÃ¥ multinøgle %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Databasen %s er beskadiget; genopbyg med mandb --create" @@ -112,9 +117,9 @@ msgstr "[MANUALDATABASE]" msgid "The man database defaults to %s%s." msgstr "Manualdatabasen er som standard %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "vis fejlsøgningsbeskeder" @@ -124,39 +129,39 @@ msgstr "vis fejlsøgningsbeskeder" msgid "can't open %s for reading" msgstr "kan ikke Ã¥bne %s for læsning" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[AFSNIT...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "STI" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "angiv søgesti for manualsider med STI" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "FIL" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "brug denne brugers konfigurationsfil" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "man-kommandoen mislykkedes med slutstatus %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "NULL-indhold for nøgle: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -165,143 +170,138 @@ msgstr "" "\n" "Opdaterer katalogfiler for afsnit %s i man-hierarkiet %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "kan ikke skrive indenfor %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "kan ikke læse databasen %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "kan ikke opdatere %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "advarsel: %s/man%s/%s.%s*: filendelser i konflikt" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "kan ikke opdatere indekscachen %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "advarsel: %s: fejlagtig symbolsk lænke eller ROFF ».so-anmodning«" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "advarsel: %s: ignorerer tom fil" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "advarsel: %s: whatis-tolkning for %s(%s) mislykkedes" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" -msgstr "kan ikke søge i kataloget %s" +msgstr "kan ikke søge i mappen %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "kan ikke skifte ejer pÃ¥ %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "advarsel: kan ikke oprette katalogmappe %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "kan ikke ændre rettigheder pÃ¥ %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" -msgstr "kan ikke skifte til kataloget %s" +msgstr "kan ikke skifte til mappen %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "kan ikke oprette indekscachen %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Opdaterer indekscache for søgestien »%s/%s«. Vent..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "færdig.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Tømmer gamle databaseindgange i %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "advarsel: det mislykkedes at lagre indgang for %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "advarsel: %s: ignorerer fejlagtigt filnavn" - # Koden tyder pÃ¥, det er betegnelsen pÃ¥ tre separate argumenter, derfor: # "STI AFSNIT NAVN" #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "STI AFSNIT NAVN" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "FILENDELSE" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "begræns søgning til filendelser med typen FILENDELSE" # evt. "med versalfølsomhed slÃ¥et fra" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "se efter sider uden at være versalfølsom (standard)" # "med versalfølsomhed slÃ¥et til" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "se efter sider versalfølsomt" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "fortolk sidenavn som et regulært udtryk" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "sidenavnet indeholder jokertegn" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "advarsel: whatis for %s overskrider %d byte, forkorter." msgstr[1] "advarsel: whatis for %s overskrider %d byte, forkorter." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "kan ikke Ã¥bne %s" @@ -326,19 +326,19 @@ msgstr "fortolk som en katalogside" msgid "show whatis information" msgstr "vis whatis-information" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "vis gættet serie af forhÃ¥ndsbehandlede filtre" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "KODNING" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "brug valgt uddatakodning" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: inkompatible tilvalg" @@ -348,7 +348,7 @@ msgstr "%s: inkompatible tilvalg" msgid "command exited with status %d: %s" msgstr "kommandoen afsluttede med status %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[AFSNIT] SIDE..." @@ -360,138 +360,138 @@ msgstr "nulstil alle tilvalg til deres standardværdier" msgid "WARNINGS" msgstr "ADVARSLER" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "aktiver advarsler fra groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Hovedtilstande for handling:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "svarende til whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "svarende til apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "søg efter tekst pÃ¥ alle sider" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "vis fysisk placering af manualsider" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "vis fysisk placering af katalogfiler" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "fortolk SIDE-argumenter som lokale filnavne" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "" "bruges af katalogmanual til at omformatere katalogsider der skal opdateres" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "uddatakildeside kodet i KODNING" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Finder manualsider:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "SPROG" # denne specifikke -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "definere sproget for netop denne manualsøgning" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SYSTEM" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "brug manualsider fra andre systemer" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LISTE" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "brug kolonadskilt afsnitsliste" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "vis alle sider der matcher regulært udtryk" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "vis alle sider der matcher jokertegn" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "fÃ¥ --regex og --wildcard til at finde sidenavne og ikke beskrivelser" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "find alle matchende manualsider" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "fremtving konsistenskontrol af mellemlager" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "forsøg ikke med undersider, f.eks. »man foo bar« => »man foo-bar«" # "Kontrollerer formaterede uddata:" # Det er en slags overskrift, sÃ¥: # "Tilvalg for formateret uddata" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Tilvalg for formateret uddata:" # Der menes nok et program som less. Ordlisten foreslÃ¥r bl.a. "tekstviser" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "TEKSTVISER" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "brug programmet TEKSTVISER til at vise uddata" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "STRENG" # dette er hjælpeteksten til tilvalget -r til ma -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "brug tekstviseren »less« med den angivne prompt" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "vis ASCII-oversættelse af visse latin1-tegn" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "brug ikke orddeling" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "brug ikke justering" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -501,34 +501,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "brug %s til formatsider" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "ENHED" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "brug %s med valgt enhed" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "BROWSER" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "brug %s eller BROWSER til at vise HTML-uddata" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "OPLØSNING" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -536,85 +536,85 @@ msgstr "" "brug groff og vis igennem gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "brug groff og tving den til at producere ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Ingen manualindgang for %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Eller hvilken manualside vil du have fra afsnit %s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Hvilken manualside vil du have?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" -msgstr "" +msgstr "For eksempel, prøv »man man«.\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Ingen manualindgang for %s i afsnit %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Se »%s« for hjælp nÃ¥r manualsider ikke er tilgængelige.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ignorerer ukendt forbehandler »%c«" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "kan ikke omdøbe %s til %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "kan ikke sætte tider pÃ¥ %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "kan ikke aflænke %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "kan ikke oprette midlertidigt katalog for %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "kan ikke oprette midlertidig mappe" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "kan ikke Ã¥bne midlertidig fil %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" -msgstr "kan ikke fjerne kataloget %s" +msgstr "kan ikke fjerne mappen %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- næste: %s [ vis (retur) | overspring (Ctrl-D) | afslut (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -623,33 +623,33 @@ msgstr "" "\n" "kan ikke skrive til %s i tilstanden katalogmanual" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Kan ikke konvertere %s til katalognavn" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: at stole pÃ¥ whatis-referencer er forældet\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb-kommandoen mislykkedes med slutstatus %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "intern fejl: kandidattype %d uden for gyldigt interval" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Manualside " #: src/man-recode.c:110 msgid "-t CODE {--suffix SUFFIX | --in-place} FILENAME..." -msgstr "" +msgstr "-t KODNING {--suffix SUFFIKS | --in-place} FILNAVN ..." #: src/man-recode.c:113 src/manconv_main.c:99 msgid "CODE" @@ -659,17 +659,17 @@ msgstr "KODNING" msgid "encoding for output" msgstr "kodning for uddata" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" -msgstr "" +msgstr "SUFFIKS" #: src/man-recode.c:115 msgid "suffix to append to output file name" -msgstr "" +msgstr "suffiks der tilføjes filnavnet" #: src/man-recode.c:117 msgid "overwrite input files in place" -msgstr "" +msgstr "overskriv inddatafiler pÃ¥ stedet" #: src/man-recode.c:119 src/manconv_main.c:101 src/manpath.c:68 msgid "produce fewer warnings" @@ -683,14 +683,14 @@ msgstr "uddatakodning skal angives" #: src/man-recode.c:159 #, c-format msgid "must use either --suffix or --in-place" -msgstr "" +msgstr "skal bruge enten --suffix eller --in-place" #: src/man-recode.c:163 #, c-format msgid "--suffix and --in-place are mutually exclusive" -msgstr "" +msgstr "--suffix og --in-place udelukker hinanden" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "kan ikke fjerne %s" @@ -705,9 +705,8 @@ msgid "iconv: incomplete character at end of buffer" msgstr "iconv: ufuldstændigt tegn ved slutningen af mellemlageret" #: src/manconv_main.c:94 -#, fuzzy msgid "[-f CODE[:...]] -t CODE [FILENAME]" -msgstr "-f KODNING[:...] -t KODNING [FILNAVN]" +msgstr "[-f KODNING[:...] -t KODNING [FILNAVN]" #: src/manconv_main.c:97 msgid "CODE[:...]" @@ -717,161 +716,161 @@ msgstr "KODNING[:...]" msgid "possible encodings of original text" msgstr "mulige kodninger af oprindelig tekst" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[MANSTI]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "arbejd stille, undtagen for »bogus-advarsler«" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "kig ikke efter og tilføj ikke vildfarne katalogsider til databaserne" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "afinstaller ikke forældede punkter fra databaserne" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "producer kun brugerdatabaser" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "opret databaser fra bunden af i stedet for at opdatere" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "kontroller manualsider for korrekthed" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "FILNAVN" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "opdater kun punktet for dette filnavn" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "kan ikke skrive til %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "kan ikke læse fra %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Bearbejder manualsider under %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Fjerner forældet katalogside %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "advarsel: intet MANDB_MAP-direktiv i %s, bruger din manualsøgesti" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" -msgstr[0] "%d manualunderkatalog indeholdt nyere manualsider.\n" -msgstr[1] "%d manualunderkataloger indeholdt nyere manualsider.\n" +msgstr[0] "%d manualundermappe indeholdt nyere manualsider.\n" +msgstr[1] "%d manualundermappe indeholdt nyere manualsider.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "%d manualside blev tilføjet.\n" msgstr[1] "%d manualsider blev tilføjet.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "%d vildfaren katalogside blev tilføjet.\n" msgstr[1] "%d vildfarne katalogsider blev tilføjet.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d gammel databaseindgang blev tømt.\n" msgstr[1] "%d gamle databaseindgange blev tømt.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Ingen databaser er oprettet." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "kan ikke forstÃ¥ konfigurationsfilen for manualsøgesti %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "advarsel: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" -msgstr "advarsel: %s er ikke et katalog" +msgstr "advarsel: %s er ikke en mappe" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "advarsel: $PATH er ikke sat" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "advarsel: tom $PATH" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "advarsel: $MANPATH er sat, tilføjer %s før" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "advarsel: $MANPATH er sat, tilføjer %s efter" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "advarsel: $MANPATH er sat, indsætter %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "advarsel: $MANPATH er sat, ignorerer %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "kan ikke tolke mappeliste »%s«" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "kan ikke Ã¥bne konfigurationsfilen for manualsøgesti %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" -msgstr "advarsel: det obligatoriske katalog %s findes ikke" +msgstr "advarsel: den obligatoriske mappe %s findes ikke" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "advarsel: %s begynder ikke med %s" @@ -884,112 +883,112 @@ msgstr "vis relative katalogstier" msgid "show the entire global manpath" msgstr "vis den samlede globale manualsti" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "advarsel: ingen globale manualsøgestier angivet i konfigurationsfilen %s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Undersøger vildfarne katalogsider under %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "advarsel: %s er en vildfaren symbolsk lænke" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "kan ikke slÃ¥ %s op" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Undersøger vildfarne katalogsider under %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s refererer til sig selv" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "NØGLEORD..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "Tilvalget --regex er aktiveret som standard." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "vis uddybende advarselsbeskeder" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "fortolk hvert nøgleord som et regulært udtryk" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "søg i hvert nøgleord for nøjagtigt match" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "nøgleordene indeholder jokertegn" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "alle nøgleord skal matche" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "tilpas ikke uddata til terminalbredde" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "søg kun i disse afsnit (kolonadskilt)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "definer sproget for denne søgning" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s hvad?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "advarsel: %s indeholder en pegerløkke" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(ukendt emne)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: ingenting egnet.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: .so-forespørgsler er indlejret for dybt eller rekursivt" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: advarsel: .so-forespørgsel mislykkedes" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: advarsel: linjeskift i .so-forespørgsel; ignorerer" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: advarsel: linjeskift i .lf-forespørgsel; ignorerer" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: ikke afsluttet anførelsestegn i roff-forespørgsel" @@ -1002,9 +1001,11 @@ msgstr "skift af kompatibilitet (ignoreret)" #~ msgid "warning: can't update index cache %s" #~ msgstr "advarsel: kan ikke opdatere indekscachen %s" -#, c-format -#~ msgid "%s:%d: warning: malformed .lf request, ignoring" -#~ msgstr "%s:%d: advarsel: forkert udformet .lf-forespørgsel; ignorerer" +#~ msgid "can't restore previous working directory" +#~ msgstr "kan ikke gendanne tidligere arbejdsmappe" + +#~ msgid "can't chdir to %s" +#~ msgstr "kan ikke skifte katalog til %s" #~ msgid "must specify an input encoding" #~ msgstr "inddatakodning skal angives" @@ -1012,11 +1013,8 @@ msgstr "skift af kompatibilitet (ignoreret)" #~ msgid "manpath list too long" #~ msgstr "manualsøgesti-liste er for lang" -#~ msgid "can't restore previous working directory" -#~ msgstr "kan ikke gendanne tidligere arbejdsmappe" - -#~ msgid "can't chdir to %s" -#~ msgstr "kan ikke skifte katalog til %s" +#~ msgid "%s:%d: warning: malformed .lf request, ignoring" +#~ msgstr "%s:%d: advarsel: forkert udformet .lf-forespørgsel; ignorerer" #~ msgid "badly formed configuration directive: '%s'" #~ msgstr "forkert formet konfigurationsdirektiv: »%s«" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.9.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2019-10-01 21:04+0200\n" "Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n" "Language-Team: German <translation-team-de@lists.sourceforge.net>\n" @@ -25,7 +25,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 19.08.1\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "Warnung: %s: fehlerhafter Dateiname wird ignoriert" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "momentanes Verzeichnis kann nicht festgestellt werden" @@ -45,39 +50,39 @@ msgstr "Der von »man« verwandte Benutzer »%s« existiert nicht" msgid "fatal: regex `%s': %s" msgstr "Fatal: Suchausdruck »%s«: %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "Suchschlüssel %s existiert nicht" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "Indexcache %s kann nicht gesperrt werden" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "Indexcache %s fehlerhaft" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "Schlüssel %s kann nicht ersetzt werden" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "nur %d Feld im Inhalt enthalten" msgstr[1] "nur %d Felder im Inhalt enthalten" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "Suchschlüssel %s kann nicht eingelesen werden" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Datenbank %s beschädigt; mit »mandb --create« neu erstellen" @@ -106,9 +111,9 @@ msgstr "[HANDBUCHDATENBANK]" msgid "The man database defaults to %s%s." msgstr "Die Handbuchdatenbank benutzt standardmäßig %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "Hinweise zur Fehlersuche werden ausgegeben" @@ -118,39 +123,39 @@ msgstr "Hinweise zur Fehlersuche werden ausgegeben" msgid "can't open %s for reading" msgstr "%s kann nicht zum Lesen geöffnet werden" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[ABSCHNITT ...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "PFAD" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "Suchpfad für Handbuchseiten auf PFAD setzen" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "DATEI" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "diese Benutzerkonfigurationsdatei verwenden" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "Man-Befehl schlug mit Exit-Status %d fehl" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "Inhalt für Suchschlüssel ist NULL: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -160,132 +165,127 @@ msgstr "" "»cat«-Dateien des Abschnitts %s der Handbuchhierarchie %s werden " "aktualisiert.\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "innerhalb von %s kann nicht geschrieben werden" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "Datenbank %s kann nicht gelesen werden" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "%s kann nicht aktualisiert werden" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "Warnung: %s/man%s/%s.%s*: konkurrierende Dateierweiterungen" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "Indexcache %s kann nicht aktualisiert werden" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "" "Warnung: %s: ungültige symbolische Verknüpfung oder »roff«-».so«-Anfrage" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "Warnung: %s: leere Datei wird ignoriert" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "Warnung: %s: whatis-Verarbeitung für %s(%s) fehlgeschlagen" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "Verzeichnis %s kann nicht durchsucht werden" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "Besitzer und/oder Gruppe von %s können nicht geändert werden" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "Warnung: »cat«-Verzeichnis %s kann nicht angelegt werden" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "Zugriffsrechte von %s können nicht geändert werden" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "Es konnte nicht ins Verzeichnis %s gewechselt werden" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "Indexcache %s kann nicht erzeugt werden" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Indexcache des Pfades »%s/%s« wird aktualisiert. Bitte warten ..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "fertig.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Alte Datenbankeinträge in %s werden gelöscht ...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "Warnung: Eintrag für (%s)%s konnte nicht abgelegt werden" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "Warnung: %s: fehlerhafter Dateiname wird ignoriert" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "PFAD ABSCHNITT NAME" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "ERWEITERUNG" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "Suche auf Erweiterungstyp ERWEITERUNG beschränken" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "" "Nach Seiten suchen ohne Groß- und Kleinschreibung zu beachten (Standard)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "Nach Seiten unter Beachtung von Groß- und Kleinschreibung suchen" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "jeden Seitennamen als RegEx interpretieren" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "der Seitenname enthält Platzhalter" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." @@ -294,9 +294,9 @@ msgstr[0] "" msgstr[1] "" "Warnung: whatis-Eintrag für %s ist größer als %d Bytes, verkürze ihn." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "%s kann nicht geöffnet werden" @@ -321,19 +321,19 @@ msgstr "als »cat«-Seite verarbeiten" msgid "show whatis information" msgstr "whatis-Informationen anzeigen" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "vermutete Serie der Vorverarbeitungsfilter anzeigen" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "KODIERUNG" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "ausgewählte Ausgabekodierung verwenden" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: inkompatible Optionen" @@ -343,7 +343,7 @@ msgstr "%s: inkompatible Optionen" msgid "command exited with status %d: %s" msgstr "Befehl mit Exit-Status %d beendet: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[ABSCHNITT] SEITE ..." @@ -355,138 +355,138 @@ msgstr "Alle Optionen auf ihre Standardwerte zurücksetzen" msgid "WARNINGS" msgstr "WARNUNGEN" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "groff-Warnungen aktivieren" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Hauptbetriebsmodi:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "Ersatz für »whatis«" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "Ersatz für »apropos«" # (mes) NEU -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "Text in allen Seiten suchen" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "Speicherort der Handbuchseite(n) ausgeben" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "Speicherort der »cat«-Datei(en) ausgeben" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "SEITEN-Argument(e) als lokale(n) Dateinamen interpretieren" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "von »catman« verwendet um veraltete »cat«-Seiten neu zu formatieren" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "Quellseiten mit KODIERUNG kodiert ausgeben" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Handbuchseiten finden: " -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOCALE" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "Locale für diese spezielle Handbuchsuche definieren" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SYSTEM" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "Handbuchseiten von anderen Systemen verwenden" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LISTE" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "kommaseparierte Abschnittsliste verwenden" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "alle mit dem regulären Ausdruck übereinstimmenden Seiten anzeigen" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "alle mit dem Platzhalter übereinstimmenden Seiten anzeigen" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "»--regex« und »--wildcard« werden nur gegen den Seitennamen geprüft, nicht " "die Beschreibungen" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "alle übereinstimmenden Handbuchseiten finden" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "Konsistenzkontrolle des Caches erzwingen" # (mes) neu -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" "keine Unterseiten versuchen, zum Beispiel »man foo bar« => »man foo-bar«" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Formatierte Ausgabe kontrollieren:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "ANZEIGEPROGRAMM" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "ANZEIGEPROGRAMM zur Darstellung der Ausgabe verwenden" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "ZEICHENKETTE" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "das »less«-Anzeigeprogramm mit einer Eingabeaufforderung ausstatten" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "ASCII-Ãœbersetzungen einiger Latin1-Zeichen anzeigen" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "Silbentrennung abschalten" # (mes) Was trifft es: Ausrichtung, Begründung, Blocksatz, Einstellung, # Justierung, Rechtfertigung -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "Blocksatz abschalten" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -496,34 +496,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "%s zur Seitenformatierung verwenden" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "GERÄT" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "%s mit ausgewähltem Gerät verwenden" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "BROWSER" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "%s oder BROWSER zur Anzeige von HTML-Ausgabe verwenden" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "AUFLÖSUNG" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -531,88 +531,88 @@ msgstr "" "»groff« verwenden und mit »gxditview« (X11) anzeigen:\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "»groff« verwenden und ditroff-Ausgabe erzwingen" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Kein Handbucheintrag für %s vorhanden\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "" "(Welche Handbuchseiten wollen Sie aus Abschnitt %s alternativ haben?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Welche Handbuchseiten möchten Sie haben?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "Zum Beispiel versuchen Sie »man man«.\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Kein Handbucheintrag für %s im Abschnitt %s vorhanden\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Siehe auch »%s« für Hilfe, wenn Handbuchseiten nicht verfügbar sind.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "Ignoriere unbekannten Präprozessor »%c«" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "%s kann nicht in %s umbenannt werden" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "Es können keine Zeiten für %s gesetzt werden" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "%s kann nicht gelöscht werden" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "Es kann keine temporäre »cat«-Datei für %s erzeugt werden" # (mes) NEU -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "Temporäres Verzeichnis kann nicht erzeugt werden." -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "Temporäre Datei %s kann nicht geöffnet werden" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "Verzeichnis %s kann nicht entfernt werden" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- nächste: %s [ Anzeigen (Return) | Ãœberspringen (Strg+D) | Beenden " "(Strg+C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -621,27 +621,27 @@ msgstr "" "\n" "im »catman«-Modus kann nicht nach %s geschrieben werden" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "%s kann nicht in »cat«-Namen umgewandelt werden" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: es wird davon abgeraten, auf »whatis«-Referenzen zu vertrauen\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "»mandb«-Befehl schlug fehl mit Beendigungs-Status %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "interner Fehler: Kandidatentyp %d außerhalb des Bereichs" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Handbuchseite " @@ -657,7 +657,7 @@ msgstr "KODIERUNG" msgid "encoding for output" msgstr "Kodierung der Ausgabe" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "ENDUNG" @@ -688,7 +688,7 @@ msgstr "muss entweder --suffix oder --in-place sein" msgid "--suffix and --in-place are mutually exclusive" msgstr "--suffix und --in-place schließen sich gegenseitig aus" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "%s kann nicht entfernt werden" @@ -714,163 +714,163 @@ msgstr "KODIERUNG[: ...]" msgid "possible encodings of original text" msgstr "mögliche Kodierungen des Originaltextes" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[HANDBUCHPFAD]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "still arbeiten, mit Ausnahme von »fehlerhaften« Warnungen" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "" "nicht nach herrenlosen »cat«-Datein suchen oder zu den Datenbanken hinzufügen" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "keine veralteten Einträge aus den Datenbanken löschen" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "nur Benutzerdatenbanken erzeugen" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "Datenbanken von Grund auf neu generieren, statt sie zu aktualisieren" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "Handbuchseiten auf Korrektheit überprüfen" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "DATEINAME" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "nur den Eintrag für diesen Dateinamen aktualisieren" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "es kann nicht nach %s geschrieben werden" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "%s kann nicht ausgelesen werden" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Handbuchseiten unter %s werden verarbeitet ...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "veraltetes »cat«-Verzeichnis %s wird entfernt ...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "Warnung: keine MANDB_MAP-Anweisungen in %s, ihr Handbuchpfad wird verwendet" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "%d Handbuchverzeichnis enthielt neuere Handbuchseiten.\n" msgstr[1] "%d Handbuchverzeichnisse enthielten neuere Handbuchseiten.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "%d Handbuchseite wurde hinzugefügt.\n" msgstr[1] "%d Handbuchseiten wurden hinzugefügt.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "%d herrenlose »cat«-Datei wurde hinzugefügt.\n" msgstr[1] "%d herrenlose »cat«-Dateien wurden hinzugefügt.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d alter Datenbankeintrag wurde entfernt.\n" msgstr[1] "%d alte Datenbankeinträge wurden entfernt.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Keine Datenbanken erstellt." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "Die Handbuchpfad-Konfigurationsdatei %s kann nicht ausgewertet werden." -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "Warnung: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "Warnung: %s ist kein Verzeichnis" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "Warnung: $PATH nicht gesetzt" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "Warnung: $PATH ist leer" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "Warnung: $MANPATH ist gesetzt, füge vorn %s an" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "Warnung: $MANPATH ist gesetzt, hänge %s an" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "Warnung: $MANPATH ist gesetzt, füge %s ein" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "Warnung: $MANPATH ist gesetzt, ignoriere %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "Verzeichnisliste »%s« kann nicht verarbeitet werden" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "Handbuchpfad-Konfigurationsdatei %s kann nicht geöffnet werden" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "Warnung: erforderliches Verzeichnis %s existiert nicht" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "Warnung: %s fängt nicht mit %s an" @@ -883,113 +883,113 @@ msgstr "relative »cat«-Pfade anzeigen" msgid "show the entire global manpath" msgstr "den gesamten globalen Handbuchpfad (MANPATH) anzeigen" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "Warnung: Keine globalen Handbuchpfade (MANPATH) in Konfigurationsdatei %s " "gesetzt" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Handbuchseiten ohne »cat«-Dateien in %s werden gesucht ...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "Warnung: %s ist eine freihängende symbolische Verknüpfung" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "%s kann nicht aufgelöst werden" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Handbuchseiten ohne »cat«-Dateien in %s werden gesucht ...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s bezieht sich auf sich selbst" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "SCHLÃœSSELWORT ..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "Die »--regex«-Option ist standardmäßig aktiviert." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "ausführliche Warnmeldungen anzeigen" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "jedes Schlüsselwort als RegEx interpretieren" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "mit jedem Schlüsselwort nach exakten Treffern suchen" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "das bzw. die Schlüsselwort(e) enthalten Platzhalter" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "alle Schlüsselwörter müssen übereinstimmen" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "Ausgabe nicht an Terminalbreite anpassen" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "nur diese Abschnitte durchsuchen (durch Doppelpunkte getrennt)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "Locale für diese Suche definieren" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s was bitte?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "Warnung: %s enthält zyklische Verweise" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(unbekanntes Thema)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nichts passendes.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: ».so«-Anfragen sind zu tief verschachtelt oder rekursiv" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: Warnung: ».so«-Anfrage fehlgeschlagen" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: Warnung: Zeilenumbruch in ».so«-Anfrage; ignoriert" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: Warnung: Zeilenumbruch in ».lf«-Anfrage; ignoriert" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: nicht geschlossene Anführungszeichen in »roff«-Anfrage" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.9.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2019-12-25 11:45-0300\n" "Last-Translator: Felipe Castro <fefcas@gmail.com>\n" "Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" @@ -19,7 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n!=1);\n" "X-Generator: Poedit 2.2.1\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "averto: %s: ni preteratentas aĉan dosiernomon" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "ne eblas determini la nunan dosierujon" @@ -39,39 +44,39 @@ msgstr "la man-uzanto kun setuid \"%s\" ne ekzistas" msgid "fatal: regex `%s': %s" msgstr "neriparebla: regex '%s': %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "plur-Ålosilo %s ne ekzistas" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "ne eblas Ålosi la indeksan kaÅmemoron %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "la indeksa kaÅmemoro %s fuÅas" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "ne eblas anstataÅigi la Ålosilon %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "nur %d kampo en enhavo" msgstr[1] "nur %d kampoj en enhavo" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "malÄusta havigo per plur-Ålosilo %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "La datumbazon %s fuÅas; rekonstruu per mandb --create" @@ -100,9 +105,9 @@ msgstr "[MAN-DATUMBAZO]" msgid "The man database defaults to %s%s." msgstr "La man-datumbazo apriore estas %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "sendi rafinigajn mesaÄojn" @@ -112,39 +117,39 @@ msgstr "sendi rafinigajn mesaÄojn" msgid "can't open %s for reading" msgstr "ne eblas malfermi %s por legi" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[SEKCIO...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "VOJO" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "difini serĉvojo por manlibraj paÄoj al VOJO" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "DOSIERO" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "uzi tiun ĉi uzant-agorda dosiero" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "komando man fiaskis kun elir-stato %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "Enhavo NULL por Ålosilo: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -153,139 +158,134 @@ msgstr "" "\n" "Äœisdatigo de cat-dosieroj por sekcio %s de man-hierarkio %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "ne eblas skribi ene de %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "ne eblas legi la datumbazon %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "Ne eblas Äisdatigi %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "averto: %s/man%s/%s.%s*: konkurantaj sufiksoj" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "ne eblas Äisdatigi la indeksan kaÅmemoron %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "averto: %s: malÄusta symlink aÅ peto de ROFF '.so'" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "averto: %s: ni preteratentas malplenan dosieron" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "averto: %s: analizo de whatis por %s(%s) fiaskis" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "ne eblas serĉi la dosierujon %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "ne eblas apliki chown %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "averto: ne eblas krei la catdir %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "ne eblas apliki chmod %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "ne eblas ÅanÄi al la dosierujo %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "ne eblas krei la indeksan kaÅmemoron %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Äœisdatigo de indeksa kaÅmemoro por la vojo '%s/%s'. Atendu..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "farite.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "ViÅo de malnovaj datumbazaj enigoj en %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "averto: fiasko dum konservo de elemento por %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "averto: %s: ni preteratentas aĉan dosiernomon" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "VOJO SEKCIO NOMO" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "SUFIKSO" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "limigi serĉon al la sufiksa tipo SUFIKSO" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "serĉi paÄojn sen-usklece (aprioras)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "serĉi paÄojn usklece" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "interpreti paÄ-nomon kiel regulesprimon" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "la paÄ-nomo enhavas ĵokerojn" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "averto: whatis por %s troigas %d bajton, ni tranĉas." msgstr[1] "averto: whatis por %s troigas %d bajtojn, ni tranĉas." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "ne eblas malfermi %s" @@ -310,19 +310,19 @@ msgstr "analizi kiel cat-paÄo" msgid "show whatis information" msgstr "montri informon de whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "montri supozitan serion da antaÅprocezaj filtriloj" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "ENKODIGO" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "uzi la elektitan eligan enkodigon" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: nekongruaj modifiloj" @@ -332,7 +332,7 @@ msgstr "%s: nekongruaj modifiloj" msgid "command exited with status %d: %s" msgstr "komando ĉesis kun stato %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[SEKCIO] PAÄœO..." @@ -344,132 +344,132 @@ msgstr "redifini ĉiujn modifilojn al iliaj aprioraj valoroj" msgid "WARNINGS" msgstr "AVERTOJ" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "ebligi avertojn el groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Ĉefaj reÄimoj de operacio:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "samfunkcia al whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "samfunkcia al apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "serĉi tekston en ĉiuj paÄoj" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "montri fizikan lokon de man-paÄo(j)" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "montri fizikan lokon de cat-dosiero(j)n" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpreti argumento(j)n de PAÄœO kiel loka(j)n dosiernomo(j)n" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "uzata de catman por restrukturigi malaktualajn cat-paÄojn" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "eligi font-paÄon enkoditan laÅ ENKODIGO" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Trovo de manlibraj paÄoj:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOKAÄ´ARO" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "difini la lokaĵaron por tiu ĉi specifa serĉo de man" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SISTEMO" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "uzi manlibrajn paÄojn el aliaj sistemoj" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LISTO" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "uzi dupunkto-apartitan sekcio-liston" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "montri ĉiujn paÄojn kongruajn al regulesprimo" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "montri ĉiujn paÄojn kongruajn al ĵokero" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "igi ke --regex kaj --wildcard kongruu nur al paÄ-nomoj, ne al priskriboj" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "trovi ĉiujn kongruajn manlibrajn paÄojn" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "devigi kontrolon pri kaÅmemora kohero" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "ne provi subpaÄojn, ekz 'man foo bar' => 'man foo-bar'" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Regado de strukturita eligo:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PAÄœILO" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "uzi la programon PAÄœILO por montri eligon" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "ĈENO" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "provizi komandinviton al la paÄilo 'less'" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "montri mapigon ASCII por kelkaj signoj latin1" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "malaktivigi vorto-dividon" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "malaktivigi Äisrandigon" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -479,34 +479,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "uzi %s por strukturigi paÄojn" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "APARATO" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "uzi %s kun elektita aparato" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "FOLIUMILO" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "uzi %s aÅ FOLIUMILO por montri eligon HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "DISTINGIVO" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -514,85 +514,85 @@ msgstr "" "uzi groff kaj montri per gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "uzi groff kaj devigi Äin produkti ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Neniu manlibra elemento por %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Alternative, kiun manlibran paÄon vi volas el sekcio %s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Kiun manlibran paÄon vi volas?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "Ekzemple, provu 'man man'.\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Neniu manlibra elemento por %s en sekcio %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Konsultu '%s' por helpo kiam manlibraj paÄoj ne disponeblas.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ni preteratentas nekonatan antaÅprocezilon '%c'" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "ne eblas renomigi %s al %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "ne eblas difini horon en %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "ne eblas forigi %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "ne eblas krei provizoran cat por %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "ne eblas krei provizoran dosierujon" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "ne eblas malfermi la provizoran dosieron %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "ne eblas forigi la dosierujon %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- sekva: %s [ vidi (enigklavo) | salti (Ctrl-D) | eliri (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -601,27 +601,27 @@ msgstr "" "\n" "ne eblas skribi al %s sub reÄimo catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Ne eblas konverti %s al cat-nomo" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: fini je whatis refs estas malrekomendinde\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "komando mandb fiaskis kun elir-stato %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "interna eraro: kanditata tipo %d estas for de intervalo" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Manlibra paÄo " @@ -637,7 +637,7 @@ msgstr "KODO" msgid "encoding for output" msgstr "enkodigo por eligo" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "SUFIKSO" @@ -668,7 +668,7 @@ msgstr "nepras uzi aÅ --suffix aÅ --in-place" msgid "--suffix and --in-place are mutually exclusive" msgstr "--suffix kaj --in-place ne povas esti kune" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "ne eblas forigi %s" @@ -694,161 +694,161 @@ msgstr "KODO[:...]" msgid "possible encodings of original text" msgstr "eblaj enkodigoj de la originala teksto" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[MAN-VOJO]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "labori kviete, krom por averto pri 'aĉeco'" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "ne serĉi aÅ aldoni perditajn dosierojn cat al la dbs" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "ne forpurigi malaktualajn elementojn el la dbs" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "produkti nur datumbazojn de uzantoj" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "krei datumbazon elkomence, prefere ol Äisdatigante" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "kontroli korektecon de manlibraj paÄoj" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "DOSIERNOMO" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "Äisdatigi nur la elementon por tiu ĉi dosiernomo" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "ne eblas skribi al %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "ne eblas legi el %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Procezado de manlibraj paÄoj sub %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Forigado de malaktuala cat-dosierujo %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "averto: neniu instrukcio MANDB_MAP en %s, ni uzas vian man-vojon" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "%d man-subdosierujo enhavis pli novajn manlibrajn paÄojn.\n" msgstr[1] "%d man-subdosierujoj enhavis pli novajn manlibrajn paÄojn.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "%d manlibra paÄo estis aldonata.\n" msgstr[1] "%d manlibraj paÄoj estis aldonataj.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "%d perdita cat estis aldonata.\n" msgstr[1] "%d perditaj cat estis aldonataj.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d malnova datumbaza elemento estis forpurigata.\n" msgstr[1] "%d malnovaj datumbazaj elementoj estis forpurigataj.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Neniu datumbazo estis kreata." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "ne eblas kompreni la man-vojan agordan dosieron %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "averto: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "averto: %s ne estas dosierujo" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "averto: $PATH ne estas difinita" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "averto: malplena $PATH" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "averto: $MANPATH estas difinita, ni antaÅmetas %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "averto: $MANPATH estas difinita, ni postmetas %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "averto: $MANPATH estas difinita, ni enmetas %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "averto: $MANPATH estas difinita, ni preteratentas %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "ne eblas analizi dosierujan liston '%s'" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "ne eblas malfermi la man-vojan agordan dosieron %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "averto: la deviga dosierujo %s ne ekzistas" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "averto: %s ne komenciÄas per %s" @@ -861,111 +861,111 @@ msgstr "montri relativajn cat-vojojn" msgid "show the entire global manpath" msgstr "montri la tutan mallokan man-vojon" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "averto: neniu malloka man-vojo estas difinita en la agorda dosiero %s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Kontrolo pri perditaj cat sub %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "averto: %s estas sentrafa simbol-ligilo" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "ne eblas solvi %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Kontrolo pri perditaj cat sub %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s estas mem-referenca" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "ÅœLOSILVORTO..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "La modifilo --regex estas ebligita apriore." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "montri detaligajn avertajn mesaÄojn" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "interpreti ĉiun Ålosilvorton kiel regulesprimon" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "serĉi ĉiun Ålosilvorton por entuta kongruo" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "la Ålosilvorto(j) enhavas ĵokerojn" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "postuli ke ĉiuj Ålosilvortoj kongruu" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "ne adapti eligon al la terminala larÄo" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "serĉi nur tiujn ĉi sekciojn (dupunkt-apartite)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "difini la lokaĵaron por tiu ĉi serĉo" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s kio?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "averto: %s enhavas adresmontrilan ciklon" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(nekonata temo)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nenio taÅga.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: petoj .so estas nestitaj tro profunde aÅ estas rekursigaj" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: averto: peto .so fiaskis" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: averto: novlinio en peto .so, ni preteratentas" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: averto: novlinio en peto .lf, ni preteratentas" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: nefinigita citilo en peto roff" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.9.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2019-10-01 16:50+0200\n" "Last-Translator: Antonio Ceballos Roa <aceballos@gmail.com>\n" "Language-Team: Spanish <es@tp.org.es>\n" @@ -19,7 +19,12 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "aviso: %s: ignorando nombre espurio de fichero" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "no se puede determinar el directorio actual" @@ -39,39 +44,39 @@ msgstr "el usuario man setuid «%s» no existe" msgid "fatal: regex `%s': %s" msgstr "error fatal: regex `%s': %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "la clave múltiple %s no existe" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "no se puede bloquear la caché de Ãndices %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "caché de Ãndices %s corrompida" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "no se puede reemplazar la clave %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "únicamente %d campo en el contenido" msgstr[1] "únicamente %d campos en el contenido" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "mal acceso en clave múltiple %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Base de datos %s corrompida; reconstrúyala con mandb --create" @@ -100,9 +105,9 @@ msgstr "[BASEDEDATOS DE MAN]" msgid "The man database defaults to %s%s." msgstr "La base de datos predeterminada es %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "emite mensajes de depuración" @@ -112,39 +117,39 @@ msgstr "emite mensajes de depuración" msgid "can't open %s for reading" msgstr "no se puede abrir %s para leer" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[SECCIÓN...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "RUTA" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "establece ruta de búsqueda para páginas del manual a RUTA" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "FICHERO" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "emplee este fichero de configuración de usuario" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "orden man fallada con estado de salida %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "Contenido NULO para clave: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -153,139 +158,134 @@ msgstr "" "\n" "Actualizando los ficheros cat para la sección %s de la jerarquÃa de man %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "no se puede escribir en %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "no se puede leer la base de datos %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "incapaz de actualizar %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "aviso: %s/man%s/%s.%s*: extensiones en conflicto" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "no se puede actualizar la caché de Ãndices %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "aviso: %s: enlace simbólico o solicitud `.so' de ROFF defectuoso" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "aviso: %s: ignorando fichero vacÃo" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "aviso: %s: ha fallado la exploración de whatis para %s(%s)" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "no se puede buscar en el directorio %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "no se puede cambiar propietario con chown %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "aviso: no se pudo crear directorio para «cat» %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "no se puede ejecutar el chmod %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "no se puede cambiar al directorio %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "no se puede crear la caché de Ãndices %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Actualizando la caché de Ãndices para la ruta `%s/%s'. Aguarde..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "terminado.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Purgando entradas antiguas en la base de datos en %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "aviso: ha fallado al almacenar entrada para %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "aviso: %s: ignorando nombre espurio de fichero" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "NOMBRE DE SECCIÓN DE RUTA" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "EXTENSIÓN" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "búsqueda limitada para tipo de extensión EXTENSIÓN" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "busca páginas sin distinguir mayúsculas y minúsculas (predeterminado)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "busca páginas distinguiendo mayúsculas y minúsculas" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "interpreta nombre de página como una expreg" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "el nombre de la página contiene comodines" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "aviso: whatis para %s excede de %d byte, truncando." msgstr[1] "aviso: whatis para %s excede de %d bytes, truncando." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "no se puede abrir %s" @@ -310,19 +310,19 @@ msgstr "interpreta como página cat" msgid "show whatis information" msgstr "muestra información whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "muestra series adivinadas de filtros de preprocesado" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "CODIFICACIÓN" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "emplee la codificación de salida seleccionada" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: opciones incompatibles" @@ -332,7 +332,7 @@ msgstr "%s: opciones incompatibles" msgid "command exited with status %d: %s" msgstr "la orden salió con estado %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[SECCIÓN] PÃGINA..." @@ -344,133 +344,133 @@ msgstr "restablece todas las opciones a sus valores predeterminados" msgid "WARNINGS" msgstr "AVISOS" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "activa avisos desde groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Modos principales de operación:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "equivalente a whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "equivalente a propósito" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "busca texto en todas las páginas" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "escribe localización fÃsica de página(s) man" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "escribe localización fÃsica de fichero(s) cat" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpreta argumento(s) PÃGINA como nombre(s) de fichero(s) local(es)" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "empleado por catman para reformatear páginas cat desactualizadas" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "página origen de salida codificada en CODIFICACIÓN" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Encontrando páginas del manual:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOCALIZACIÓN" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "define la localización para esta búsqueda de man particular" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SISTEMA" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "emplea páginas del manual desde otros sistemas" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LISTADO" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "emplea lista de secciones separadas por dos puntos" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "muestra todas las páginas coincidentes con expreg" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "muestra todas las páginas coincidentes con comodÃn" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "make --regex y --wildcard buscan coincidencia de nombres de página " "únicamente, no de descripciones" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "encuentra todas las páginas del manual coincidentes" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "fuerza una comprobación de consistencia de la caché" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "no intente subpáginas, p. e. 'man foo bar' => 'man foo-bar'" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Controlando formateado de salida:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PAGINADOR" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "emplea el programa PAGER para mostrar la salida" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "CADENA DE TEXTO" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "proporciona el paginador «less» con una petición" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "muestra la traducción a ASCII de ciertos caracteres latÃn1" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "apaga guión" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "apaga justificación" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -480,34 +480,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "emplee %s para formato de páginas" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "DISPOSITIVO" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "emplee %s con dispositivo seleccionado" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "EXPLORADOR" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "emplea %s o EXPLORADOR para mostrar salida HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "RESOLUCIÓN" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -515,87 +515,87 @@ msgstr "" "emplea groff y muestra a través de gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "utiliza groff y lo fuerza para producir ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Ninguna entrada del manual para %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Alternativamente, ¿qué página de manual quiere desde la sección %s?\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "¿Qué página del manual desea?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "Por ejemplo, pruebe 'man man'.\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Ningún registro del manual para %s en la sección %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" "Vea «%s» para obtener ayuda cuando las páginas del manual no estén " "disponibles.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "se ignora el preprocesador desconocido «%c»" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "no se puede renombrar %s a %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "no se puede establecer la hora en %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "no se puede desenlazar %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "no se puede crear cat temporal para %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "no se puede crear directorio temporal" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "no se puede abrir el fichero temporal %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "no se puede eliminar el directorio %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- siguiente: %s [ ver (return) | saltar (Ctrl-D) | salir (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -604,27 +604,27 @@ msgstr "" "\n" "no se puede escribir en %s en modo catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "No se puede convertir %s a un nombre de tipo cat" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: depender de las referencias de whatis está en desuso\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "orden mandb fallada con estado de salida %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "error interno: tipo candidato %d fuera de rango" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Página de manual " @@ -640,7 +640,7 @@ msgstr "CÓDIGO" msgid "encoding for output" msgstr "codificando para salida" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "SUFIJO" @@ -671,7 +671,7 @@ msgstr "debe utilizar --suffix o --in-place" msgid "--suffix and --in-place are mutually exclusive" msgstr "--suffix y --in-place son mutuamente excluyentes" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "no se puede quitar %s" @@ -697,70 +697,70 @@ msgstr "CÓDIGO[:...]" msgid "possible encodings of original text" msgstr "posible codificaciones del texto original" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[MANPATH]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "funciona silenciosamente, excepto para avisos 'espúreos'" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "no busca ni añade cats extraviados a las bbdd" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "no purgar entradas obsoletas desde las bbdd" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "produce solo bases de datos de usuario" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "crea bbdd desde cero en lugar de actualizar" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "comprueba corrección de las páginas de manual" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "NOMBREFICHERO" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "actualiza tan solo la entrada para este nombre de fichero" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "no puede escribir a %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "no puede leer desde %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Procesando las páginas de manual bajo %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Eliminando el directorio cat obsoleto %s...\n" # manpath es algo especÃfico, debe estar presente. nl -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "aviso: no hay directivas MANDB_MAP en %s, se utilizará su ruta man (manpath)" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" @@ -769,14 +769,14 @@ msgstr[0] "" "\n" msgstr[1] "%d subdirectorios man contenÃan páginas de manual más recientes.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "se ha añadido %d página del manual.\n" msgstr[1] "se han añadido %d páginas del manual.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" @@ -785,79 +785,79 @@ msgstr[1] "" "se han añadido %d cat extraviados.\n" "\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "Se ha eliminado %d entrada antigua en la base de datos.\n" msgstr[1] "Se han eliminado %d entradas antiguas en la base de datos.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Ninguna base de datos creada." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "no se puede comprender el fichero de configuración %s de rutas de man" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "aviso: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "aviso: %s no es un directorio" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "aviso: $PATH no asignada" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "aviso: ruta $PATH vacÃa" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "aviso: $MANPATH establecida, se antepondrá %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "aviso: $MANPATH establecida, agregando %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "aviso: $MANPATH establecida, insertando %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "aviso: $MANPATH establecida, ignorando %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "no se puede interpretar la lista de directorios «%s»" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "no se puede abrir el fichero de configuración de rutas de man %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "aviso: el directorio obligatorio %s no existe" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "aviso: %s no comienza con %s" @@ -870,114 +870,114 @@ msgstr "muestra rutas catpath relativas" msgid "show the entire global manpath" msgstr "muestra la ruta manpath global completa" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "aviso: no se han asignado rutas man globales en el fichero de configuración " "%s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Comprobando si hay páginas cat extraviadas bajo %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "aviso: %s es un enlace simbólico cuyo destino no existe" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "no se puede resolver %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Comprobando si hay páginas cat extraviadas bajo %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s se referencia a sà mismo" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "PALABRACLAVE..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "La opción --regex está activada por defecto." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "escribe mensajes de advertencia detallados" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "interpreta cada palabra clave como una expreg" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "busca cada palabra clave por coincidente exacta" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "la(s) palabra(s) clave contienen comodines" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "requiere que coincidan todas las palabras clave" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "no cortar salida para ancho del terminal" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "busca solo estas secciones (separados por dos puntos)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "define la localización para esta búsqueda" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s ¿qué?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "aviso: %s contiene un bucle de puntero" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(asunto desconocido)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nada apropiado.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "" "%s:%d: peticiones .so anidadas demasiado profundamente o son recursivas" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: aviso: petición .so fallada" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: advertencia: lÃnea nueva dentro de petición .so, ignorando" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: aviso: nueva lÃnea en petición .lf, ignorando" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: comilla no terminada en petición roff" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.7.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2015-07-28 21:52+0300\n" "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n" "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n" @@ -18,7 +18,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.3\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "nykyistä hakemistoa ei voi määrittää" @@ -38,39 +43,39 @@ msgstr "" msgid "fatal: regex `%s': %s" msgstr "" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "" msgstr[1] "" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "" @@ -100,9 +105,9 @@ msgstr "" msgid "The man database defaults to %s%s." msgstr "" -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "" @@ -112,179 +117,174 @@ msgstr "" msgid "can't open %s for reading" msgstr "" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[OSIO...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "POLKU" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "aseta opastesivujen hakupoluksi POLKU" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "TIEDOSTO" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 #, fuzzy msgid "use this user configuration file" msgstr "opastepolkujen asetustiedostoa %s ei voi avata" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" "Updating cat files for section %s of man hierarchy %s\n" msgstr "" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "tietokantaa %s ei voi lukea" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "varoitus: %s: ei huomioida tyhjää tiedostoa" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "" -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "valmis.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "sivun nimi sisältää jokerimerkkejä" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "" msgstr[1] "" -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "" @@ -309,19 +309,19 @@ msgstr "jäsennä cat-sivuna" msgid "show whatis information" msgstr "näytä whatis-tiedot" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "näytä arvattu sarja esikäsittelysuotimia" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "MERKISTÖ" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "käytä valittua tulosteen merkistöä" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, fuzzy, c-format msgid "%s: incompatible options" msgstr ": epäyhteensopivat valitsimet" @@ -331,7 +331,7 @@ msgstr ": epäyhteensopivat valitsimet" msgid "command exited with status %d: %s" msgstr "" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[OSIO] SIVU..." @@ -343,276 +343,276 @@ msgstr "palauta kaikki valitsimet oletusarvoihinsa" msgid "WARNINGS" msgstr "VAROITUKSET" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Päätoimintatilat:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "whatis-vastine" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "apropos-vastine" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "etsi tekstiä kaikilta sivuilta" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "näytä opastesivu(je)n fyysinen sijainti" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "näytä cat-sivu(je)n fyysinen sijainti" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "tulkitse SIVU-argumentti paikallisena tiedostonimenä" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "" -#: src/man.c:295 +#: src/man.c:300 #, fuzzy msgid "Finding manual pages:" msgstr " Opastesivu " -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "JÄRJESTELMÄ" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Muotoillun tulosteen hallinta:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "MERKKIJONO" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" msgstr "" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "LAITE" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "SELAIN" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "RESOLUUTIO" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" msgstr "" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, fuzzy, c-format msgid "No manual entry for %s\n" msgstr "Sovellukselle %s ei ole opastesivua" -#: src/man.c:610 +#: src/man.c:631 #, fuzzy, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "Minkä opastesivun haluat osiosta %s?\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Minkä opastesivun haluat?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "" -#: src/man.c:742 +#: src/man.c:771 #, fuzzy, c-format msgid "No manual entry for %s in section %s\n" msgstr "Sovellukselle %s ei ole opastesivua" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ei huomioida tuntematonta esikäsittelintä \"%c\"" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "" -#: src/man.c:1842 +#: src/man.c:1857 #, fuzzy, c-format msgid "can't create temporary cat for %s" msgstr "varoitus: väliaikaistiedostoa %s ei voi luoda" -#: src/man.c:1954 +#: src/man.c:1969 #, fuzzy, c-format msgid "can't create temporary directory" msgstr "nykyistä hakemistoa ei voi määrittää" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, fuzzy, c-format msgid "can't open temporary file %s" msgstr "opastepolkujen asetustiedostoa %s ei voi avata" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" "cannot write to %s in catman mode" msgstr "" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb-komento epäonnistui paluuarvolla %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Opastesivu " @@ -628,7 +628,7 @@ msgstr "" msgid "encoding for output" msgstr "tulosteen merkistö" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "" @@ -659,7 +659,7 @@ msgstr "" msgid "--suffix and --in-place are mutually exclusive" msgstr "" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "tiedostoa %s ei voi poistaa" @@ -685,161 +685,161 @@ msgstr "" msgid "possible encodings of original text" msgstr "alkuperäisen tekstin mahdolliset merkistöt" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "TIEDOSTONIMI" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "tiedostoon %s ei voi kirjoittaa" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "tiedostosta %s ei voi lukea" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Käsitellään opastesivuja hakemistossa %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Poistetaan vanhentunut cat-hakemisto %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "%d man-alihakemisto sisälsi uudempia opastesivuja.\n" msgstr[1] "%d man-alihakemistoa sisälsi uudempia opastesivuja.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, fuzzy, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] " Opastesivu " msgstr[1] " Opastesivu " -#: src/mandb.c:935 +#: src/mandb.c:997 #, fuzzy, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "%d jotain .. ööö.. kulkukissaa lisättiin.\n" msgstr[1] "%d jotain .. ööö.. kulkukissaa lisättiin.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, fuzzy, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d vanhaa tietokantamerkintää poistettiin.\n" msgstr[1] "%d vanhaa tietokantamerkintää poistettiin.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Tietokantoja ei luotu." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "varoitus: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "varoitus: %s ei ole hakemisto" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "varoitus: polkumuuttujaa $PATH ei ole asetettu" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "varoitus: tyhjä polkumuuttuja $PATH" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "varoitus: $MANPATH asetettu, lisätään loppuun %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "opastepolkujen asetustiedostoa %s ei voi avata" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "varoitus: välttämätön hakemisto %s ei ole olemassa" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "varoitus: %s ei ala merkkijonolla %s" @@ -852,113 +852,113 @@ msgstr "" msgid "show the entire global manpath" msgstr "" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "varoitus: asetustiedostossa %s ei ole asetettu järjestelmänlaajuisia " "opastepolkuja" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "varoitus: %s on rikkinäinen symlinkki" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s viittaa itseensä" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "AVAINSANA..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "" -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "avainsana(t) sisältävät jokerimerkkejä" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "älä katkaise tulostetta päätteen leveyteen" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s mikä?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "varoitus: %s sisältää osoitinsilmukan" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(tuntematon aihe)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: ei mitään sopivaa.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.9.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2019-10-02 04:21+0200\n" "Last-Translator: Stéphane Aulery <lkppo@free.fr>\n" "Language-Team: French <traduc@traduc.org>\n" @@ -22,7 +22,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=n > 1\n" "X-Generator: Lokalize 1.2\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "attention : %s : nom de fichier erroné, ignoré" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "impossible de déterminer quel est le répertoire courant" @@ -42,39 +47,39 @@ msgstr "l'utilisateur man privilégié (setuid) « %s » n'existe pas" msgid "fatal: regex `%s': %s" msgstr "erreur fatale : expression rationnelle « %s » : %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "la clef multiple %s n'existe pas" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "impossible de verrouiller le cache d'index %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "le cache d'index %s est endommagé" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "impossible de remplacer la clef %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "il n'y a qu'un champ dans le contenu" msgstr[1] "il n'y a que %d champs dans le contenu" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "mauvais accès sur la clef multiple %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "La base %s est corrompue, reconstruisez-la avec mandb --create" @@ -103,9 +108,9 @@ msgstr "[BASE DE DONNÉES DE MAN]" msgid "The man database defaults to %s%s." msgstr "La base de données par défaut est %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "affichage des messages de débogage" @@ -115,39 +120,39 @@ msgstr "affichage des messages de débogage" msgid "can't open %s for reading" msgstr "impossible d'ouvrir %s en lecture" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[SECTION...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "CHEMIN" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "configure le chemin de recherche des pages de manuel à CHEMIN" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "FICHIER" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "utilise ce fichier de configuration utilisateur" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "la commande man a échoué avec %d comme code de retour" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "contenu vide (NULL) pour la clef : %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -156,139 +161,134 @@ msgstr "" "\n" "Mise à jour des fichiers préformatés pour la section %s de %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "impossible d'écrire dans %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "impossible de lire la base de données %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "impossible de mettre %s à jour" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "attention : %s/man%s/%s.%s* : extensions en conflit" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "impossible de mettre à jour le cache d'index %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "attention : %s : lien symbolique ou directive ROFF « .so » incorrect" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "attention : %s : fichier vide ignoré" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "attention : %s : la recherche de whatis sur %s(%s) a échoué" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "impossible de chercher dans le répertoire %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "impossible de changer le propriétaire de %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "attention : impossible de créer le répertoire de pages préformatées %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "impossible de changer les droits de %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "impossible d'aller dans le répertoire %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "impossible de créer le cache d'index %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Mise à jour du cache d'index pour le chemin « %s/%s ». Attendez…" -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "terminé.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Effacement des entrées inutiles de %s en cours…\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "attention : impossible de stocker l'entrée pour %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "attention : %s : nom de fichier erroné, ignoré" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "CHEMIN SECTION NOM" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "EXTENSION" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "limite la recherche aux extensions EXTENSION" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "recherche les pages sans distinguer la casse (par défaut)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "recherche les pages en distinguant la casse" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "considère le nom de page comme une expression rationnelle" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "le nom de page contient des caractères joker" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "attention : whatis pour %s dépasse d'un octet, excédent tronqué." msgstr[1] "attention : whatis pour %s dépasse de %d octets, excédent tronqué." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "impossible d'ouvrir %s" @@ -313,19 +313,19 @@ msgstr "lit les fichiers en tant que pages préformattées" msgid "show whatis information" msgstr "affiche les renseignements comme whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "affiche la liste supposée des filtres de pré-traitement" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "ENCODAGE" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "utilise l'encodage d'affichage choisi" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s : options incompatibles" @@ -335,7 +335,7 @@ msgstr "%s : options incompatibles" msgid "command exited with status %d: %s" msgstr "commande terminée avec %d comme code de retour : %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[SECTION] PAGE..." @@ -347,135 +347,135 @@ msgstr "réinitialise les valeurs par défaut des options" msgid "WARNINGS" msgstr "AVERTISSEMENTS" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "active les avertissements de groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Modes opératoires principaux :" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "équivalent à whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "équivalent à apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "recherche le texte dans toutes les pages" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "affiche l'emplacement des pages du manuel" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "affiche l'emplacement des fichiers « cat »" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interprète l'argument PAGE comme un nom de fichier" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "utilisé par catman pour reformater les pages trop vieilles" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "affiche le code source converti en ENCODAGE" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Recherche des pages de manuel :" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOCALE" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "définit la locale pour cette recherche de manuel" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SYSTÈME" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "utilise les pages de manuel d'autres systèmes" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LISTE" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "utilise la liste des sections séparées par des deux-points" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "montre toutes les pages correspondant à l'expression rationnelle" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "montre toutes les pages correspondant au caractère joker" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "correspond seulement aux noms de pages avec --regex et --wildcard, pas aux " "descriptions" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "trouve toutes les pages correspondantes" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "force une vérification de cohérence du cache" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" "ne prend pas en compte les sous-commandes, par exemple « man truc bidule » " "=> « man truc-bidule »" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Contrôle du format d'affichage :" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "AFFICHEUR" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "utilise de programme AFFICHEUR pour l'affichage" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "CHAÃŽNE" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "donne une chaîne d'invite à « less »" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "affiche un équivalent ASCII de certains caractères latin1" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "désactive la césure" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "désactive la justification" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -485,34 +485,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "utilise %s pour formater les pages" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "PÉRIPHÉRIQUE" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "utilise %s avec le périphérique sélectionné" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "NAVIGATEUR" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "utilise %s ou NAVIGATEUR pour l'affichage HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "RÉSOLUTION" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -520,88 +520,88 @@ msgstr "" "utilise groff et affiche avec gditview (X11) :\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "utilise groff en le forçant à produire ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Aucune entrée de manuel pour %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Sinon, quelle page de manuel de la section %s voulez-vous ?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Quelle page de manuel voulez-vous ?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "Par exemple, essayez « man man ».\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Aucune entrée de manuel pour %s en section %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" "voir « %s » pour obtenir de l'aide quand les pages de manuel ne sont pas " "disponibles.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "le préprocesseur « %c » est inconnu et ignoré" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "impossible de renommer %s en %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "impossible de changer la date de %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "impossible de supprimer %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "impossible de créer une page « cat » temporaire pour %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "impossible de créer le répertoire temporaire" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "impossible d'ouvrir le fichier temporaire %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "impossible de supprimer le répertoire %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- prochain : %s [ voir (entrée) | passer (Ctrl-D) | quitter (Ctrl-" "C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -610,28 +610,28 @@ msgstr "" "\n" "impossible d'écrire vers %s en mode catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Impossible de convertir %s en nom de page préformatée" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "" "%s : il est conseillé de ne plus se baser sur les références de whatis\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "la commande mandb a échoué avec le code de retour %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "erreur interne : le type candidat %d est hors de portée" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Page de manuel " @@ -647,7 +647,7 @@ msgstr "CODE" msgid "encoding for output" msgstr "encodage de l'affichage" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "SUFFIXE" @@ -678,7 +678,7 @@ msgstr "vous devez utiliser soit --suffix soit --in-place" msgid "--suffix and --in-place are mutually exclusive" msgstr "--suffix et --in-place sont mutuellement exclusif" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "impossible de supprimer %s" @@ -704,165 +704,165 @@ msgstr "CODE[:...]" msgid "possible encodings of original text" msgstr "encodages possibles du texte d'origine" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[MANPATH]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "n'affiche rien à part les avertissement de dysfonctionnement" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "ne cherche ni n'ajoute de fichiers « cat » parasites dans la base" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "ne supprime pas les entrées obsolètes de la base" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "produit seulement les bases utilisateur" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "crée les bases du début plutôt qu'une mise à jour" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "vérifie la validité des pages de manuel" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "NOM_DE_FICHIER" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "met seulement à jour l'entrée correspondant à ce nom de fichier" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "impossible d'écrire dans %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "impossible de lire à partir de %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Traitement des pages du manuel sous %s…\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Suppression du répertoire « cat » obsolète %s…\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "attention : aucune directive MANDB_MAP dans %s, votre fichier manpath est " "utilisé" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "Un sous-répertoire de manuel contient de nouvelles pages.\n" msgstr[1] "%d sous-répertoires de manuel contiennent de nouvelles pages.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "Une page de manuel a été ajoutée.\n" msgstr[1] "%d pages de manuel ont été ajoutées.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "Une page sans source a été ajoutée.\n" msgstr[1] "%d pages sans source ont été ajoutées.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "Une entrée inutile de la base a été supprimée.\n" msgstr[1] "%d entrées inutiles de la base ont été supprimées.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Aucune base de données créée." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "le fichier de configuration de manpath %s est bizarre" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "attention : %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "attention : %s n'est pas un répertoire" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "attention : la variable $PATH n'est pas positionnée" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "attention : la variable $PATH est vide" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "" "attention : la variable $MANPATH est positionnée, elle est précédée de %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "" "attention : la variable $MANPATH est positionnée, elle est suivie de %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "attention : la variable $MANPATH est positionnée, %s est inséré" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "attention : la variable $MANPATH est positionnée, %s est ignoré" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "impossible de parcourir la liste de répertoire « %s »" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "impossible d'ouvrir le fichier de configuration de manpath %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "attention : le répertoire requis %s n'existe pas" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "attention : %s ne commence pas par %s" @@ -875,113 +875,113 @@ msgstr "affiche les chemins d'accès relatifs aux pages «\\ cat\\ »" msgid "show the entire global manpath" msgstr "affiche les chemins complets de pages de manuel" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "attention : aucun chemin de pages de manuel dans le fichier de configuration " "%s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Recherche des fichiers préformatés sans sources sous %s…\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "attention : %s est un lien symbolique flottant" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "impossible de résoudre %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Recherche des fichiers préformatés sans sources sous %s…\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s s'auto-référence" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "MOT-CLEF..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "L'option --regex est activée par défaut. " -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "affiche des messages d'avertissement étendus" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "interprète chaque mot-clef comme une expression régulière" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "recherche une correspondance exacte de chaque mot-clef" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "les mots-clefs contiennent des jokers" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "tous les mots-clefs doivent correspondre" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "ne réduit pas l'affichage à la largeur du terminal" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "recherche limitée à ces sections (séparées par des deux-points)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "définit la locale pour cette recherche" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s comment ?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "attention : %s contient une référence circulaire" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(sujet inconnu)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s : rien d'adéquat\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d : requêtes .so imbriquées trop profondément ou récursivement" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: attention : requête .so échouée" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: attention : retour à la ligne dans une requête .so, ignorée" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: attention : retour à la ligne dans une requête .lf, ignorée" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: guillemet non fermé dans une requête roff" Binary files differ@@ -1,23 +1,31 @@ # Pesan bahasa indonesia untuk man-db # Copyright (C) 2008 Colin Watson (msgids) # This file is distributed under the same license as the man-db package. -# Arif E. Nugroho <arif_endro@yahoo.com>, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Arif E. Nugroho <arif_endro@yahoo.com>, 2008-2014. +# Andika Triwidada <andika@gmail.com>, 2022. # msgid "" msgstr "" -"Project-Id-Version: man-db 2.6.6-pre2\n" +"Project-Id-Version: man-db 2.10.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" -"PO-Revision-Date: 2014-08-10 19:00+0700\n" -"Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" +"PO-Revision-Date: 2022-04-27 19:52+0700\n" +"Last-Translator: Andika Triwidada <andika@gmail.com>\n" "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n" "Language: id\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.0\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "peringatan: %s: mengabaikan nama berkas palsu" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "tidak dapat menentukan direktori sekarang" @@ -37,39 +45,38 @@ msgstr "setuid pengguna man \"%s\" tidak ada" msgid "fatal: regex `%s': %s" msgstr "fatal: regex `%s': %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "multi kunci %s tidak ada" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "tidak dapat mengunci persediaan indeks %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "persediaan indeks %s tidak lengkap" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "tidak dapat menggantikan kunci %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "hanya bagian %d ada dalam isi" -msgstr[1] "hanya bagian %d ada dalam isi" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "pengambilan buruk di multi kunci %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Basis data %s terkorupsi; membuat kembali dengan mandb --create" @@ -98,9 +105,9 @@ msgstr "[BASIS DATA MAN]" msgid "The man database defaults to %s%s." msgstr "Basis data man baku ke %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "keluarkan pesan penelusuran" @@ -110,39 +117,39 @@ msgstr "keluarkan pesan penelusuran" msgid "can't open %s for reading" msgstr "tidak dapat membuka %s untuk pembacaan" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[BAGIAN...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "JALUR" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "tentukan jalur pencarian untuk halaman buku panduan ke JALUR" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "BERKAS" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "gunakan berkas konfigurasi pengguna ini" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "perintah man gagal dengan status keluar %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" -msgstr "isi KOSONG untuk kunci: %s" +msgstr "isi NULL untuk kunci: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -151,139 +158,133 @@ msgstr "" "\n" "Memperbarui berkas cat untuk bagian %s dari struktur man %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "tidak dapat menulis didalam %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "tidak dapat membaca basis data %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "tidak dapat memperbarui %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "peringatan: %s/man%s/%s.%s*: ekstensi berkompetisi" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "tidak dapat mengupdate persediaan indeks %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "peringatan: %s: symlink buruk atau ROFF `.so' diminta" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "peringatan: %s: mengabaikan berkas kosong" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "peringatan: %s: whatis parse untuk %s(%s) gagal" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "tidak dapat mencari direktori %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "tidak dapat chown %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "peringatan: tidak dapat membuat catdir %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "tidak dapat chmod %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "tidak dapat mengubah direktori %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "tidak dapat membuat persediaan indeks %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Memperbarui persediaan indeks untuk jalur `%s/%s'. Mohon tunggu..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "selesai.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Menghapus masukan basis data lama dalam %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "peringatan: gagal untuk menyimpan masukan untuk %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "peringatan: %s: mengabaikan nama berkas palsu" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "NAMA JALUR BAGIAN" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "EKSTENSI" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "batasi pencarian ke tipe ekstensi EKSTENSI" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "cari untuk halaman dengan tidak membedakan besar huruf (baku)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "cari untuk halaman dengan membedakan besar huruf" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "intepretasikan nama halaman sebagai sebuah regex" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "nama halaman berisi huruf bebas" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "peringatan: whatis untuk %s melebihi %d bytes, dipotong." -msgstr[1] "peringatan: whatis untuk %s melebihi %d bytes, dipotong." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "tidak dapat membuka %s" @@ -308,19 +309,19 @@ msgstr "parse sebagai halaman cat" msgid "show whatis information" msgstr "tampilkan informasi whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "tampilkan urutan terkaan dari preproses penyaring" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "PENGKODEAN" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "gunakan pengkodean keluaran yang dipilih" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: pilihan tidak kompatibel" @@ -330,7 +331,7 @@ msgstr "%s: pilihan tidak kompatibel" msgid "command exited with status %d: %s" msgstr "perintah keluar dengan status %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[BAGIAN] HALAMAN..." @@ -342,133 +343,133 @@ msgstr "reset semua pilihan ke nilai bakunya" msgid "WARNINGS" msgstr "PERINGATAN" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "aktifkan peringatan dari groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Mode operasi utama:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "sama dengan whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "sama dengan apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "cari teks dalam seluruh halaman" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "tampilkan lokasi aktual dari halaman man" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "tampilkan lokasi aktual dari halaman cat" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpretasikan HALAMAN argumen sebagai nama berkas lokal" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "" "digunakan oleh catman untuk mereformat keluaran dari halaman tanggal cat" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "keluaran sumber halaman dikodekan dalam PENGKODEAN" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Mencari halaman manual:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOKAL" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "definisikan lokal untuk pencarian man ini" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SISTEM" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "gunakan halaman manual dari sistem lain" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "DAFTAR" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "gunakan daftar bagian dipisahkan oleh kolon" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "tampilkan seluruh halaman yang cocok dengan regex" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "tampilkan seluruh halaman yang cocok dengan huruf bebas" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "buat pencocokan nama halaman --regex dan --wildcard saja, bukan deskripsi" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "cari seluruh halaman buku panduan yang cocok" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "paksa sebuah pemeriksaan konsistensi persediaan" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "jangan coba halaman dalam, contoh 'man foo bar' => 'man foo-bar'" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Mengontrol keluaran terformat:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PAGER" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "gunakan aplikasi PAGER untuk menampilkan keluaran" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "STRING" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "sediakan pager `less' dengan sebuah prompt" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "tampilkan terjemahan ASCII dari beberapa karakter latin1" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "non-aktifkan hyphenasi" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "non-aktifkan hyphenasi" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -478,34 +479,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "gunakan %s untuk memformat halaman" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "PERANGKAT" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "gunakan %s dengan perangkat yang dipilih" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "BROWSER" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "gunakan %s atau BROWSER untuk menampilkan keluaran HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "RESOLUSI" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -513,88 +514,88 @@ msgstr "" "gunakan groff dan tampilkan melalui gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "gunakan groff dan paksa itu untuk menghasilkan ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Tidak ada masukan buku panduan untuk %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "" "(Secara alternatif, halaman buku panduan mana yang anda inginkan dari bagian " "%s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Halaman buku panduan mana yang anda inginkan?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" -msgstr "" +msgstr "Misalnya, coba 'man man'.\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Tidak ada masukan buku panduan untuk %s dalam bagian%s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Lihat '%s' untuk bantuan ketika halaman manual tidak tersedia.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "mengabaikan preprosesor tidak dikenal `%c'" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "tidak dapat mengubah nama %s ke %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "tidak dapat menset waktu di %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "tidak dapat unlink %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "tidak dapat membuat cat sementara untuk %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "tidak dapat membuat direktori sementara" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "tidak dapat membuka berkas sementara %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "tidak dapat menghapus direktori %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- selanjutnya: %s [ lihat (return) | lewat (Ctrl-D) | berhenti (Ctrl-" "C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -603,33 +604,33 @@ msgstr "" "\n" "tidak dapat menulis ke %s dalam mode catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Tidak dapat mengubah %s ke nama cat" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: bergantung ke referensi whatis sudah ditinggalkan\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "perintah mandb gagal dengan status keluar %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "internal error: tipe kandidat %d diluar dari jangkauan" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Halaman buku panduan " #: src/man-recode.c:110 msgid "-t CODE {--suffix SUFFIX | --in-place} FILENAME..." -msgstr "" +msgstr "-t KODE {--suffix AKHIRAN | --in-place} NAMABERKAS..." #: src/man-recode.c:113 src/manconv_main.c:99 msgid "CODE" @@ -639,17 +640,17 @@ msgstr "KODE" msgid "encoding for output" msgstr "pengkodean untuk keluaran" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" -msgstr "" +msgstr "AKHIRAN" #: src/man-recode.c:115 msgid "suffix to append to output file name" -msgstr "" +msgstr "akhiran untuk ditambahkan ke nama berkas keluaran" #: src/man-recode.c:117 msgid "overwrite input files in place" -msgstr "" +msgstr "menimpa berkas masukan di tempat" #: src/man-recode.c:119 src/manconv_main.c:101 src/manpath.c:68 msgid "produce fewer warnings" @@ -663,14 +664,14 @@ msgstr "harus menspesifikasikan sebuah pengkodean keluaran" #: src/man-recode.c:159 #, c-format msgid "must use either --suffix or --in-place" -msgstr "" +msgstr "harus menggunakan --suffix atau --in-place" #: src/man-recode.c:163 #, c-format msgid "--suffix and --in-place are mutually exclusive" -msgstr "" +msgstr "--sufiks dan --in-place saling eksklusif" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "tidak dapat menghapus %s" @@ -685,7 +686,6 @@ msgid "iconv: incomplete character at end of buffer" msgstr "iconv: karakter tidak lengkap di akhir dari penyangga" #: src/manconv_main.c:94 -#, fuzzy msgid "[-f CODE[:...]] -t CODE [FILENAME]" msgstr "-f KODE[:...] -t KODE [NAMA BERKAS]" @@ -697,166 +697,160 @@ msgstr "KODE[:...]" msgid "possible encodings of original text" msgstr "pengkodean yang memungkinkan dari teks asli" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[JALUR MAN]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" -msgstr "bekerja secara halus, kecuali untuk peringatan 'palsu'" +msgstr "bekerja secara senyap, kecuali untuk peringatan 'palsu'" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "jangan mencari atau menambahkan cats menyimpang ke basis data" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "jangan menghapus masukan yang sudah ditinggalkan dari basis data" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "hanya menghasilkan basis data pengguna" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" -msgstr "membuat basis data dari serpihan, daripada memperbaruinya" +msgstr "membuat basis data dari awal, daripada memperbaruinya" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "memeriksa halaman buku panduan untuk kebenarannya" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "NAMA BERKAS" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "perbarui hanya masukan untuk nama berkas ini" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "tidak dapat menulis ke %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "tidak dapat membaca dari %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Memproses halaman buku panduan dibawah %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Memeriksa untuk cats menyimpang dibawah %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "peringatan: tidak ada direktif MANDB_MAP dalam %s, menggunakan jalur man anda" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "" "%d man subdirektori berisi halaman buku panduan lebih baru. halaman buku " "panduan telah ditambahkan.\n" -msgstr[1] "" -"%d man subdirektori berisi halaman buku panduan lebih baru. halaman buku " -"panduan telah ditambahkan.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" -msgstr[0] "%d Halaman buku panduan \n" -msgstr[1] "%d Halaman buku panduan \n" +msgstr[0] "%d halaman buku panduan ditambahkan.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" -msgstr[0] "%d cats menyimpang telah ditambahkan.\n" -msgstr[1] "%d cats menyimpang telah ditambahkan.\n" +msgstr[0] "%d cat lepas telah ditambahkan.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d masukan basis data lama telah dihapus.\n" -msgstr[1] "%d masukan basis data lama telah dihapus.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Tidak ada basis data yang dibuat." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "tidak dapat menerima berkas konfigurasi manpath %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "peringatan: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "peringatan: %s bukan sebuah direktori" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "peringatan: $PATH belum diset" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "peringatan: $PATH kosong" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "peringatan: $MANPATH set, mengawali %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "peringatan: $MANPATH set, menambahkan %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "peringatan: $MANPATH set, memasukan %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "peringatan: $MANPATH set, mengabaikan %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "tidak dapat mengambil daftar direktori `%s'" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "tidak dapat membuka berkas konfigurasi manpath %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "peringatan: direktori wajib %s tidak ada" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "peringatan: %s tidak dimulai dengan %s" @@ -869,111 +863,111 @@ msgstr "tampilkan relative catpaths" msgid "show the entire global manpath" msgstr "tampilkan seluruh global manpath" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "peringatan: tidak ada global manpath diset dalam berkas konfigurasi %s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Memeriksa untuk cats menyimpang dibawah %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "peringatan: %s adalah sebuah sambungan simbolik yang rusak" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "tidak dapat meresolf %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Memeriksa untuk cats menyimpang dibawah %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s adalah mereferensikan dirinya sendiri" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "KATA KUNCI..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "Pilihan --regex aktif secara baku." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "tampikan pesan peringatan bertele-tele" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "intepretasikan setiap kata kunci sebagai sebuah regex" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "cari setiap kata kunci untuk pencocokan yang tepat" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "kata kunci berisi huruf bebas" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "membutuhkan semua kata kunci untuk mencocokan" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "jangan trim keluaran ke lebar terminal" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "hanya cari di bagian ini" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "definisikan lokal untuk pencarian ini" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s apa?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "peringatan: %s berisi sebuah penunjuk loop" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(subjek tidak diketahui)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: tidak ada yang sesuai.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: permintaan .so nested terlalu dalam atau rekursif" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: peringatan: permintaan .so gagal" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: peringatan: baris baru dalam permintaan .so, diabaikan" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: peringatan: baris baru dalam permintaan .lf, diabaikan" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: quote tidak terselesaikan dalam permintaan roff" @@ -985,95 +979,3 @@ msgstr "pilihan untuk kompabilitas saja (diabaikan)" #, c-format #~ msgid "warning: can't update index cache %s" #~ msgstr "peringatan: tidak dapat memperbarui persediaan indeks %s" - -#, c-format -#~ msgid "%s:%d: warning: malformed .lf request, ignoring" -#~ msgstr "%s:%d: peringatan: salah bentuk permintaan .lf, diabaikan" - -#~ msgid "must specify an input encoding" -#~ msgstr "harus menspesifikasikan sebuah pengkodean masukan" - -#~ msgid "manpath list too long" -#~ msgstr "daftar manpath terlalu panjang" - -#, fuzzy -#~ msgid "can't restore previous working directory" -#~ msgstr "tidak dapat membuat direktori sementara" - -#~ msgid "can't chdir to %s" -#~ msgstr "tidak dapat chdir ke %s" - -#~ msgid "badly formed configuration directive: '%s'" -#~ msgstr "konfigurasi direktif dibentuk secara buruk: '%s'" - -#~ msgid "pipeline input not open" -#~ msgstr "baris pipa masukan tidak terbuka" - -#~ msgid "pipeline output not open" -#~ msgstr "baris pipa keluaran tidak terbuka" - -#~ msgid "pipe failed" -#~ msgstr "pipa gagal" - -#~ msgid "fork failed" -#~ msgstr "fork gagal" - -#~ msgid "dup2 failed" -#~ msgstr "dup2 gagal" - -#~ msgid "close failed" -#~ msgstr "gagal menutup" - -#~ msgid "can't execute %s" -#~ msgstr "tidak dapat menjalankan %s" - -#~ msgid "closing pipeline input stream failed" -#~ msgstr "penutupan baris pipa masukan stream gagal" - -#~ msgid "closing pipeline input failed" -#~ msgstr "penutupan baris pipa masukan gagal" - -#~ msgid "closing pipeline output stream failed" -#~ msgstr "penutupan baris pipa aliran keluaran gagal" - -#~ msgid "closing pipeline output failed" -#~ msgstr "penutupan baris pipa keluaran gagal" - -#~ msgid "%s: %s (core dumped)" -#~ msgstr "%s: %s (core dikeluarkan)" - -#~ msgid "%s: %s" -#~ msgstr "%s: %s" - -#~ msgid "waitpid failed" -#~ msgstr "waitpid gagal" - -#~ msgid "can't install SIGCHLD handler" -#~ msgstr "tidak dapat memasang pengelola SIGCHLD" - -#~ msgid "cannot insert unused key %s" -#~ msgstr "tidak dapat memasukan kunci yang tidak digunakan %s" - -#~ msgid "can't get man command's exit status" -#~ msgstr "tidak dapat memperoleh status keluar perintah man" - -#~ msgid "unable to reset cursor position in %s" -#~ msgstr "tidak dapat mereset posisi kursor dalam %s" - -#~ msgid "can't get passwd structure for uid 0" -#~ msgstr "tidak dapat memperoleh struktur passwd untuk uid 0" - -#~ msgid "can't fork" -#~ msgstr "tidak dapat fork" - -#~ msgid "SECTION" -#~ msgstr "BAGIAN" - -#~ msgid "Don't know which program should I run being >%s<\n" -#~ msgstr "Tidak tahu aplikasi mana yang harus saya jalankan sebagai >%s<\n" - -#~ msgid "%s: Failed su to user %s\n" -#~ msgstr "%s: Gagal su ke pengguna %s\n" - -#~ msgid "can't create index cache directory %s" -#~ msgstr "tidak dapat membuat direktori persediaan cache %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.4.3\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2005-12-10 17:30+0100\n" "Last-Translator: Giuseppe Sacco <eppesuig@debian.org>\n" "Language-Team: Italian <tp@linux.it>\n" @@ -16,7 +16,12 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "attenzione: %s: vengono ignorati i nomi di file fasulli" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "impossibile determinare la directory corrente" @@ -36,39 +41,39 @@ msgstr "non esiste l'utente man con setuid \"%s\"" msgid "fatal: regex `%s': %s" msgstr "errore grave: regex \"%s\": %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "non esiste la chiave multipla %s" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "impossibile bloccare l'indice %s nella cache" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "indice %s della cache corrotto" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "impossibile rimpiazzare la chiave %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, fuzzy, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "trovati solo %d campi" msgstr[1] "trovati solo %d campi" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "fetch errato sulla chiave multipla %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Il database %s è corrotto; lo si ricrei con mandb --create" @@ -97,9 +102,9 @@ msgstr "" msgid "The man database defaults to %s%s." msgstr "" -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "" @@ -109,40 +114,40 @@ msgstr "" msgid "can't open %s for reading" msgstr "impossibile aprire %s in lettura" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 #, fuzzy msgid "use this user configuration file" msgstr "impossibile aprire il file di configurazione dei percorsi man %s" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "comando man fallito con stato d'uscita %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "contenuto NULL per la chiave: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -151,140 +156,135 @@ msgstr "" "\n" "Aggiornamento dei file cat della sezione %s della gerarchia di manuali %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "impossibile scrivere all'interno di %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "impossibile leggere il database %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "impossibile aggiornare %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "attenzione: %s/man%s/%s.%s*: estensioni in conflitto" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "impossibile aggiornare l'indice %s della cache" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "attenzione: %s: link simbolico o richiesta ROFF \".so\" errato(a)" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "attenzione: %s: viene ignorato un file vuoto" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "attenzione: %s: analisi whatis per %s(%s) fallita" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "impossibile ricercare nella directory %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "impossibile fare chown su %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "attenzione: impossibile creare la directory %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "impossibile fare chmod su %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "impossibile posizionarsi nella directory %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "impossibile creare l'indice %s della cache" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "" "Aggiornamento dell'indice della cache per il percorso \"%s/%s\". Attendere..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "fatto.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Rimozione delle vecchie voci di basi dati in %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "attenzione: c'è stato un errore memorizzando il dato %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "attenzione: %s: vengono ignorati i nomi di file fasulli" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, fuzzy, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "attenzione: whatis per %s eccede di %d byte, troncato." msgstr[1] "attenzione: whatis per %s eccede di %d byte, troncato." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "impossibile aprire %s" @@ -309,19 +309,19 @@ msgstr "" msgid "show whatis information" msgstr "" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, fuzzy, c-format msgid "%s: incompatible options" msgstr ": opzioni incompatibili" @@ -331,7 +331,7 @@ msgstr ": opzioni incompatibili" msgid "command exited with status %d: %s" msgstr "comando terminato con stato d'uscita %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "" @@ -343,251 +343,251 @@ msgstr "" msgid "WARNINGS" msgstr "" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "" -#: src/man.c:295 +#: src/man.c:300 #, fuzzy msgid "Finding manual pages:" msgstr " Pagina di manuale " -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" msgstr "" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" msgstr "" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Non c'è il manuale per %s\n" -#: src/man.c:610 +#: src/man.c:631 #, fuzzy, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "Quale pagina di manuale si desidera della sezione %s?\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Quale pagina di manuale si desidera?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Non c'è il manuale per %s nella sezione %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" "Si veda \"%s\" per l'aiuto quando le pagine di manuali non sono presenti.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "preprocessore \"%c\" sconosciuto, lo ignoro" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "impossibile rinominare %s in %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "impossibile impostare la data per %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "impossibile fare unlink di %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "impossibile creare un file 'cat' temporaneo per %s" -#: src/man.c:1954 +#: src/man.c:1969 #, fuzzy, c-format msgid "can't create temporary directory" msgstr "impossibile creare un file 'cat' temporaneo per %s" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "impossibile aprire il file temporaneo %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "impossibile rimuovere la directory %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- successivo: %s [ mostra (return) | salta (Ctrl-D) | esci (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -596,27 +596,27 @@ msgstr "" "\n" "impossibile scrivere in %s in modo catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Impossibile convertire %s nel nome cat" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: confidare nei whatis refs è obsoleto\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "comando mandb fallito con stato d'uscita %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "errore interno: il tipo %d candidato è oltre il limite" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Pagina di manuale " @@ -632,7 +632,7 @@ msgstr "" msgid "encoding for output" msgstr "" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "" @@ -663,7 +663,7 @@ msgstr "" msgid "--suffix and --in-place are mutually exclusive" msgstr "" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "impossibile rimuovere %s" @@ -689,68 +689,68 @@ msgstr "" msgid "possible encodings of original text" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "impossibile scrivere in %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "impossibile leggere da %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Lavorazione delle pagine di manuale sotto a %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, fuzzy, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Ricerca degli stray cat sotto a %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "attenzione: nessuna direttiva MANDB_MAP in %s, uso del tuo manpath" -#: src/mandb.c:926 +#: src/mandb.c:988 #, fuzzy, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" @@ -761,93 +761,93 @@ msgstr[1] "" "%d sottodirectory man contenevano nuove pagine di manuale.\n" "Sono state aggiunte %d pagine di manuale\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, fuzzy, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] " Pagina di manuale " msgstr[1] " Pagina di manuale " -#: src/mandb.c:935 +#: src/mandb.c:997 #, fuzzy, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "%d stray cat sono stati aggiunti.\n" msgstr[1] "%d stray cat sono stati aggiunti.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, fuzzy, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d vecchie voci di database sono state rimosse.\n" msgstr[1] "%d vecchie voci di database sono state rimosse.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, fuzzy, c-format msgid "No databases created." msgstr "Il database non è stato aggiornato." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "il file di configurazione dei percorsi man %s non ha senso" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "attenzione: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "attenzione: %s non è una directory" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "attenzione: $PATH non impostata" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "attenzione: $PATH vuota" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "attenzione: $MANPATH già impostata, aggiungo in testa %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "attenzione: $MANPATH già impostata, aggiungo in coda %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "attenzione: $MANPATH già impostata, inserisco %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "attenzione: $MANPATH già impostata, ignoro %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "impossibile analizzare la lista di directory \"%s\"" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "impossibile aprire il file di configurazione dei percorsi man %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "attenzione: la directory essenziale %s non esiste" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "attenzione: %s non inizia con %s" @@ -860,113 +860,113 @@ msgstr "" msgid "show the entire global manpath" msgstr "" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "attenzione: nessun percorso man globale impostato nel file di configurazione " "%s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Ricerca degli stray cat sotto a %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "attenzione: %s è un link simbolico spezzato" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "impossibile risolvere %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Ricerca degli stray cat sotto a %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s è auto referenziante" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "" -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "" -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s cosa?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "attenzione: %s contiene un riferimeno a se stesso" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(oggetto sconosciuto)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: niente di appropriato.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-2.8.0-pre2\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2019-08-24 23:30+0900\n" "Last-Translator: Takeshi Hamasaki <hmatrjp@users.sourceforge.jp>\n" "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n" @@ -23,7 +23,12 @@ msgstr "" "X-Poedit-Basepath: man-db-2.8.0-pre2\n" "X-Poedit-SearchPath-0: .\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "è¦å‘Š: %s: ãŠã‹ã—ãªãƒ•ã‚¡ã‚¤ãƒ«åを無視ã—ã¦ã„ã¾ã™" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "カレントディレクトリを決定ã§ãã¾ã›ã‚“" @@ -43,38 +48,38 @@ msgstr "setuid ã•ã‚ŒãŸ man ユーザー \"%s\" ã¯å˜åœ¨ã—ã¾ã›ã‚“" msgid "fatal: regex `%s': %s" msgstr "致命的: æ£è¦è¡¨ç¾ `%s': %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "複åˆã‚ー %s ã¯å˜åœ¨ã—ã¾ã›ã‚“" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "index ã‚ャッシュ %s ã‚’ãƒãƒƒã‚¯ã§ãã¾ã›ã‚“" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "index ã‚ャッシュ %s ãŒå£Šã‚Œã¦ã„ã¾ã™" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "ã‚ー %s ã‚’ç½®æ›ã§ãã¾ã›ã‚“" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "ä¸èº«ãŒ %d フィールドã—ã‹ã‚ã‚Šã¾ã›ã‚“" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "複åˆã‚ー %s ã¯ä¸æ£ãªå‘¼ã³å‡ºã—ã§ã™" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "" @@ -105,9 +110,9 @@ msgstr "[MAN DATABASE]" msgid "The man database defaults to %s%s." msgstr "man データベースã®ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã‚’ %s%s ã«ã—ã¾ã™ã€‚" -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "デãƒãƒƒã‚°ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã™ã‚‹" @@ -117,39 +122,39 @@ msgstr "デãƒãƒƒã‚°ãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã™ã‚‹" msgid "can't open %s for reading" msgstr "%s ã‚’èªã¿è¾¼ã¿ç”¨ã«é–‹ã‘ã¾ã›ã‚“" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[SECTION...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "PATH" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "man ページ用ã®æ¤œç´¢ãƒ‘スを PATH ã«è¨å®šã™ã‚‹" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "FILE" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "ã“ã®ãƒ¦ãƒ¼ã‚¶è¨å®šãƒ•ã‚¡ã‚¤ãƒ«ã‚’使用ã™ã‚‹" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "man コマンドãŒçµ‚了ステータス %d ã§å¤±æ•—ã—ã¾ã—ãŸ" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "ã‚ー %s ã®å†…容㯠NULL ã§ã™" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -158,139 +163,134 @@ msgstr "" "\n" "man 階層 %2$s ã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ %1$s ã® cat ファイルを更新ã—ã¦ã„ã¾ã™\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "%s ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "データベース %s ã‚’èªã¿è¾¼ã‚ã¾ã›ã‚“" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "%s ã‚’æ›´æ–°ã§ãã¾ã›ã‚“" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "è¦å‘Š: %s/man%s/%s.%s*: æ‹¡å¼µåãŒç«¶åˆã—ã¦ã„ã¾ã™" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "index ã‚ャッシュ %s ã‚’æ›´æ–°ã§ãã¾ã›ã‚“" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "" "è¦å‘Šï¼š %s： シンボリックリンクã¾ãŸã¯ ROFF ã® `.so' è¦æ±‚ã«èª¤ã‚ŠãŒã‚ã‚Šã¾ã™" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "è¦å‘Š: %s: 空ファイルを無視ã—ã¦ã„ã¾ã™" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "è¦å‘Š: %s: whatis ㌠%s(%s) ã®è§£é‡ˆã«å¤±æ•—ã—ã¾ã—ãŸ" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "ディレクトリー %s を検索ã§ãã¾ã›ã‚“" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "%s ã®æ‰€æœ‰è€…を変更 (chown) ã§ãã¾ã›ã‚“" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "è¦å‘Š: cat ディレクトリー %s を作æˆã§ãã¾ã›ã‚“" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "%s ã®è¨±å¯å±žæ€§ã‚’変更 (chmod) ã§ãã¾ã›ã‚“" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "ディレクトリ %s ã«ç§»å‹•ã§ãã¾ã›ã‚“" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "index ã‚ャッシュ %s を作æˆã§ãã¾ã›ã‚“" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "パス `%s/%s' ã® index ã‚ャッシュを更新ã—ã¦ã„ã¾ã™ã€‚ãŠå¾…ã¡ãã ã•ã„..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "完了ã—ã¾ã—ãŸã€‚\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "%s 内ã®å¤ã„データベースè¦ç´ ã‚’å–り除ã„ã¦ã„ã¾ã™...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "è¦å‘Š: %s(%s) 用ã®è¦ç´ ã®ä¿å˜ã«å¤±æ•—ã—ã¾ã—ãŸ" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "è¦å‘Š: %s: ãŠã‹ã—ãªãƒ•ã‚¡ã‚¤ãƒ«åを無視ã—ã¦ã„ã¾ã™" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "PATH SECTION NAME" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "EXTENSION" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "検索対象を拡張å EXTENSION ã«çµžã‚‹" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "大文å—å°æ–‡å—を区別ã—ãªã„ã§ãƒšãƒ¼ã‚¸ã‚’検索ã™ã‚‹ (デフォルト)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "大文å—å°æ–‡å—を区別ã—ã¦ãƒšãƒ¼ã‚¸ã‚’検索ã™ã‚‹" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "ページåã‚’æ£è¦è¡¨ç¾ã¨ã—ã¦è§£é‡ˆã™ã‚‹" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "ページåをワイルドカードã¨ã—ã¦è§£é‡ˆã™ã‚‹" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "è¦å‘Š: %s 用㮠whatis ㌠%d ãƒã‚¤ãƒˆã‚’超ãˆã¦ã„ã¾ã™ã€‚切り詰ã‚ã¾ã™ã€‚" -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "%s をオープンã§ãã¾ã›ã‚“" @@ -315,19 +315,19 @@ msgstr "cat ページã¨ã—ã¦æ§‹æ–‡è§£æžã™ã‚‹" msgid "show whatis information" msgstr "whatis æƒ…å ±ã‚’è¡¨ç¤ºã™ã‚‹" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "推定ã—ãŸä¸€é€£ã®å‰å‡¦ç†ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼ã‚’表示ã™ã‚‹" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "ENCODING" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "é¸æŠžã—ãŸå‡ºåŠ›ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ã‚’使用ã™ã‚‹" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: 相互ã«åˆ©ç”¨ã§ããªã„オプションã§ã™" @@ -337,7 +337,7 @@ msgstr "%s: 相互ã«åˆ©ç”¨ã§ããªã„オプションã§ã™" msgid "command exited with status %d: %s" msgstr "コマンドã¯ã‚¹ãƒ†ãƒ¼ã‚¿ã‚¹ %d ã§çµ‚了ã—ã¾ã—ãŸ: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[SECTION] PAGE..." @@ -349,133 +349,133 @@ msgstr "ã™ã¹ã¦ã®ã‚ªãƒ—ションをデフォルト値ã«ãƒªã‚»ãƒƒãƒˆã™ã‚‹" msgid "WARNINGS" msgstr "WARNINGS" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "groff ã‹ã‚‰ã®è¦å‘Šã‚’有効ã«ã™ã‚‹" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "æ“作ã®ä¸»ãªãƒ¢ãƒ¼ãƒ‰:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "whatis ã¨åŒæ§˜" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "apropos ã¨åŒæ§˜" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "ã™ã¹ã¦ã®ãƒšãƒ¼ã‚¸ã®ãƒ†ã‚ストを検索ã™ã‚‹" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "マニュアルページã®ç‰©ç†çš„ãªä½ç½®ã‚’表示ã™ã‚‹" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "整形済ã¿ãƒ•ã‚¡ã‚¤ãƒ«ã®ç‰©ç†çš„ãªä½ç½®ã‚’表示ã™ã‚‹" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "PAGE 引数をãƒãƒ¼ã‚«ãƒ«ãƒ•ã‚¡ã‚¤ãƒ«åã¨ã—ã¦è§£é‡ˆã™ã‚‹" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "catman ã«ã‚ˆã£ã¦å¤ã„整形済ã¿ãƒšãƒ¼ã‚¸ã‚’å†æ•´å½¢ã™ã‚‹ãŸã‚ã«ä½¿ç”¨ã•ã‚Œã‚‹" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "ソースページã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°ãŒ ENCODING ã§ã‚ã‚‹ã¨ã¿ãªã—ã¦å‡ºåŠ›ã™ã‚‹" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "マニュアルページã®æŽ¢ã—æ–¹:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOCALE" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "ã“ã® man ã®æ¤œç´¢ç”¨ã®ãƒã‚±ãƒ¼ãƒ«ã‚’定義ã™ã‚‹" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SYSTEM" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "ã»ã‹ã®ã‚·ã‚¹ãƒ†ãƒ ã‹ã‚‰ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’使用ã™ã‚‹" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LIST" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "セクションリストã¨ã—ã¦ã‚³ãƒãƒ³ (:) ã§åŒºåˆ‡ã‚‰ã‚ŒãŸ LIST を使用ã™ã‚‹" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "æ£è¦è¡¨ç¾ã«ä¸€è‡´ã—ãŸã™ã¹ã¦ã®ãƒšãƒ¼ã‚¸ã‚’表示ã™ã‚‹" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "ワイルドカードã«ä¸€è‡´ã—ãŸã™ã¹ã¦ã®ãƒšãƒ¼ã‚¸ã‚’表示ã™ã‚‹" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "--regex 㨠--wildcard ãŒãƒšãƒ¼ã‚¸åã®ã¿ã«ä¸€è‡´ã™ã‚‹ã‚ˆã†ã«ã—ã€èª¬æ˜Žã«ã¯ä¸€è‡´ã—ãªã„よ" "ã†ã«ã™ã‚‹" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "å…¨ã¦ã®ä¸€è‡´ã—ãŸãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’探ã—出ã™" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "ã‚ャッシュ一貫性ã®ç¢ºèªã‚’強制ã™ã‚‹" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "サブページを検索ã—ãªã„ (例 'man foo bar' => 'man foo-bar' ã®ã‚ˆã†ãª)" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "æ•´å½¢ã•ã‚ŒãŸå‡ºåŠ›ã®åˆ¶å¾¡:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PAGER" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "出力を表示ã™ã‚‹ãƒ—ãƒã‚°ãƒ©ãƒ ã¨ã—㦠PAGER を使用ã™ã‚‹" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "STRING" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "`less' ページャーã®ãƒ—ãƒãƒ³ãƒ—トを指定ã™ã‚‹" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "一部㮠latin1 æ–‡å—ã‚’ ASCII æ–‡å—ã«å¤‰æ›ã—ã¦è¡¨ç¤ºã™ã‚‹" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "ãƒã‚¤ãƒ•ãƒ³ã«ã‚ˆã‚‹è¡Œæœ«å‡¦ç†ã‚’無効ã«ã™ã‚‹" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "å‡ç‰å‰²ã‚Šä»˜ã‘を無効ã«ã™ã‚‹" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -485,34 +485,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "ページ整形㫠%s を使用ã™ã‚‹" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "DEVICE" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "é¸æŠžã—㟠DEVICE å‘ã‘ã« %s を使用ã™ã‚‹" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "BROWSER" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "HTML 出力を表示ã™ã‚‹ãŸã‚ã« %s ã¾ãŸã¯ BROWSER を使用ã™ã‚‹" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "RESOLUTION" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -520,85 +520,85 @@ msgstr "" "groff を使用ã—〠gxditview (X11) ã‚’ç‰ã—ã¦è¡¨ç¤ºã™ã‚‹:\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "groff を使用ã—ã€å¼·åˆ¶çš„ã« ditroff を生æˆã™ã‚‹" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "%s ã¨ã„ã†ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã¯ã‚ã‚Šã¾ã›ã‚“\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(代ã‚り㫠セクション %s ã®ã©ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’表示ã—ã¾ã™ã‹?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "マニュアルページを指定ã—ã¦ãã ã•ã„\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "%s ã¨ã„ã†ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ã¯ã‚»ã‚¯ã‚·ãƒ§ãƒ³ %s ã«ã¯ã‚ã‚Šã¾ã›ã‚“\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "マニュアルページãŒãªã„å ´åˆã«ã¯ '%s' ã‚’ã”覧ãã ã•ã„。\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ä¸æ˜Žãªå‰å‡¦ç†ç³» `%c' を無視ã—ã¦ã„ã¾ã™" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "%s ã®åå‰ã‚’ %s ã«å¤‰æ›´ã§ãã¾ã›ã‚“" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "%s ã®æ™‚刻をè¨å®šã§ãã¾ã›ã‚“" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "%s を削除(unlink)ã§ãã¾ã›ã‚“" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "%s 用ã®ä¸€æ™‚çš„ãªæ•´å½¢æ¸ˆã¿ãƒ•ã‚¡ã‚¤ãƒ«ã‚’作æˆã§ãã¾ã›ã‚“" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "一時ディレクトリを作æˆã§ãã¾ã›ã‚“" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "一時ファイル %s ã‚’é–‹ã‘ã¾ã›ã‚“" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "ディレクトリ %s を削除ã§ãã¾ã›ã‚“" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- 次ã¯: %s [ 閲覧 (return) | スã‚ップ (Ctrl-D) | 終了 (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -607,27 +607,27 @@ msgstr "" "\n" "catman モード㧠%s ã«æ›¸ãè¾¼ã¿ã§ãã¾ã›ã‚“" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "%s を整形済ã¿ãƒ•ã‚¡ã‚¤ãƒ«åã«å¤‰æ›ã§ãã¾ã›ã‚“" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: å‚ç…§ãŒéžæŽ¨å¥¨ã®whatis ã«ä¾å˜ã—ã¦ã„ã¾ã™\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb コマンドãŒçµ‚了ステータス %d ã§å¤±æ•—ã—ã¾ã—ãŸ" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "内部エラー: 候補タイプ %d ãŒç¯„囲外ã§ã™" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " マニュアルページ " @@ -643,7 +643,7 @@ msgstr "CODE" msgid "encoding for output" msgstr "出力ã®ã‚¨ãƒ³ã‚³ãƒ¼ãƒ‡ã‚£ãƒ³ã‚°" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "" @@ -674,7 +674,7 @@ msgstr "" msgid "--suffix and --in-place are mutually exclusive" msgstr "" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "%s を削除ã§ãã¾ã›ã‚“" @@ -701,69 +701,69 @@ msgstr "CODE[:...]" msgid "possible encodings of original text" msgstr "原文テã‚ストã®ã‚り得るエンコーディング" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[MANPATH]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "é™ã‹ã«å‹•ä½œã—ã¾ã™ã€ãŸã ã— 'bogus' è¦å‘Šã¯å‡ºåŠ›ã—ã¾ã™" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "è¿·åã® cat をデータベースã‹ã‚‰æŽ¢ã—ãŸã‚Šè¿½åŠ ã—ãŸã‚Šã—ã¾ã›ã‚“" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "データベースã«ã‚る廃æ¢ã•ã‚ŒãŸã‚¨ãƒ³ãƒˆãƒªãƒ¼ã‚’削除ã—ã¾ã›ã‚“" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "ユーザーã®ãƒ‡ãƒ¼ã‚¿ãƒ™ãƒ¼ã‚¹ã®ã¿ã‚’出力ã—ã¾ã™" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "データベースを更新ã§ãªãã€æœ€åˆã‹ã‚‰ä½œæˆã—ã¾ã™" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "マニュアルページã®æ£ç¢ºã•ã‚’ãƒã‚§ãƒƒã‚¯ã—ã¾ã™" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "FILENAME" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "ã“ã®ãƒ•ã‚¡ã‚¤ãƒ«åã«å¯¾å¿œã™ã‚‹ã‚¨ãƒ³ãƒˆãƒªãƒ¼ã®ã¿ã‚’æ›´æ–°ã—ã¾ã™" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "%s ã«æ›¸ãè¾¼ã‚ã¾ã›ã‚“" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "%s ã‹ã‚‰èªã¿è¾¼ã‚ã¾ã›ã‚“" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "%s é…下ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ã‚’処ç†ã—ã¦ã„ã¾ã™...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "å¤ã„ cat ディレクトリ %s を削除ã—ã¦ã„ã¾ã™...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "è¦å‘Š: %s ã« MANDB_MAP ã®æŒ‡å®šã¯ã‚ã‚Šã¾ã›ã‚“。ã‚ãªãŸã® manpath を使用ã—ã¾ã™" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" @@ -771,90 +771,90 @@ msgstr[0] "" "%d 個ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸åディレクトリã«æ–°ã—ã„マニュアルページãŒå«ã¾ã‚Œã¦ã„ã¾ã—" "ãŸã€‚\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "%d 個ã®ãƒžãƒ‹ãƒ¥ã‚¢ãƒ«ãƒšãƒ¼ã‚¸ãŒè¿½åŠ ã•ã‚Œã¾ã—ãŸã€‚\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "%d ã®è¿·åã® cat ãŒè¿½åŠ ã•ã‚Œã¾ã—ãŸã€‚\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d 個ã®å¤ã„データベースè¦ç´ ãŒé™¤åŽ»ã•ã‚Œã¾ã—ãŸã€‚\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "データベースã¯ä½œæˆã•ã‚Œã¾ã›ã‚“ã§ã—ãŸã€‚" -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "manpath è¨å®šãƒ•ã‚¡ã‚¤ãƒ« %s ã®å†…容を解釈ã§ãã¾ã›ã‚“" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "è¦å‘Š: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "è¦å‘Š: %s ã¯ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒªã§ã¯ã‚ã‚Šã¾ã›ã‚“" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "è¦å‘Š: $PATH ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "è¦å‘Š: $PATH ãŒå®šç¾©ã•ã‚Œã¦ã„ã¾ã›ã‚“" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "è¦å‘Š: $MANPATH ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚%s ã®è¨å®šã«è¿½åŠ ã—ã¾ã™" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "è¦å‘Š: $MANPATH ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚%s ã®è¨å®šã‚’è¿½åŠ ã—ã¾ã™" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "è¦å‘Š: $MANPATH ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚%s ã®è¨å®šã‚’挿入ã—ã¾ã™" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "è¦å‘Š: $MANPATH ãŒè¨å®šã•ã‚Œã¦ã„ã¾ã™ã€‚%s を無視ã—ã¾ã™" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "ディレクトリリスト `%s' を解æžã§ãã¾ã›ã‚“" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "manpath è¨å®šãƒ•ã‚¡ã‚¤ãƒ« %s をオープンã§ãã¾ã›ã‚“" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "è¦å‘Š: å¿…è¦ãªãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª %s ãŒå˜åœ¨ã—ã¾ã›ã‚“" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "è¦å‘Š: %s 㯠%s ã§å§‹ã¾ã£ã¦ã„ã¾ã›ã‚“" @@ -867,111 +867,111 @@ msgstr "相対 catpath を表示ã—ã¾ã™" msgid "show the entire global manpath" msgstr "ã‚°ãƒãƒ¼ãƒãƒ« manpath 全体を表示ã—ã¾ã™" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "è¦å‘Š: è¨å®šãƒ•ã‚¡ã‚¤ãƒ« %s ã«ã‚°ãƒãƒ¼ãƒãƒ«ãª manpath ã®è¨å®šãŒã‚ã‚Šã¾ã›ã‚“" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "%s é…下㮠roff ãŒãªã„ cat ファイルをãƒã‚§ãƒƒã‚¯ã—ã¦ã„ã¾ã™...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "è¦å‘Š: %s ã¯ã‚·ãƒ³ãƒœãƒªãƒƒã‚¯ãƒªãƒ³ã‚¯ãŒåˆ‡ã‚Œã¦ã„ã¾ã™" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "%s を解決ã§ãã¾ã›ã‚“" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "%s é…下㮠roff ãŒãªã„ cat ファイルをãƒã‚§ãƒƒã‚¯ã—ã¦ã„ã¾ã™...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s ã¯è‡ªåˆ†è‡ªèº«ã‚’å‚ç…§ã—ã¦ã„ã¾ã™" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "KEYWORD..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "--regex オプションã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã§æœ‰åŠ¹ã§ã™ã€‚" -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "冗長ãªè¦å‘Šãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã‚’表示ã™ã‚‹" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "å„ã‚ーワードをæ£è¦è¡¨ç¾ã¨ã—ã¦è§£é‡ˆã™ã‚‹" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "ãã‚Œãžã‚Œã®ã‚ーワードã«ã¤ã„ã¦å®Œå…¨ä¸€è‡´ã‚’検索ã™ã‚‹" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "ã‚ーワードã§ãƒ¯ã‚¤ãƒ«ãƒ‰ã‚«ãƒ¼ãƒ‰ã‚’使用ã™ã‚‹" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "ã™ã¹ã¦ã®ã‚ーワードãŒä¸€è‡´ã™ã‚‹å¿…è¦ã‚ã‚Š" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "出力を端末幅ã«åˆ‡ã‚Šè©°ã‚ãªã„" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "ã“れらã®ã‚»ã‚¯ã‚·ãƒ§ãƒ³ã®ã¿æ¤œç´¢ã™ã‚‹ (コãƒãƒ³åŒºåˆ‡ã‚Š)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "検索ã™ã‚‹ãƒã‚±ãƒ¼ãƒ«ã‚’定義ã™ã‚‹" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s ã‚ーワードã¯ä½•ã§ã™ã‹ï¼Ÿ\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "è¦å‘Š: %s ã«ã¯ãƒ«ãƒ¼ãƒ—ã—ã¦ã„ã‚‹ãƒã‚¤ãƒ³ã‚¿ãŒå«ã¾ã‚Œã¦ã„ã¾ã™" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(ä¸æ˜Žãªé¡Œåã§ã™)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: é©åˆ‡ãªã‚‚ã®ã¯ã‚ã‚Šã¾ã›ã‚“ã§ã—ãŸã€‚\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: .so è¦æ±‚ã®å…¥ã‚ŒåãŒæ·±ã™ãŽã‚‹ã€ã¾ãŸã¯å†å¸°ã—ã¦ã„ã¾ã™" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: è¦å‘Š: .so è¦æ±‚ã®å‡¦ç†ã«å¤±æ•—ã—ã¾ã—ãŸ" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: è¦å‘Š: .so è¦æ±‚ã®ä¸ã«æ”¹è¡ŒãŒã‚ã‚Šã¾ã™ã€‚無視ã—ã¦ã„ã¾ã™" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: è¦å‘Š: .lf è¦æ±‚ã®ä¸ã«æ”¹è¡ŒãŒã‚ã‚Šã¾ã™ã€‚無視ã—ã¦ã„ã¾ã™" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: roff è¦æ±‚ã®ä¸ã«çµ‚端ã•ã‚Œã¦ã„ãªã„クォートãŒã‚ã‚Šã¾ã™" diff --git a/po/man-db.pot b/po/man-db.pot index 370f67e6..95a5b788 100644 --- a/po/man-db.pot +++ b/po/man-db.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: man-db 2.10.2\n" +"Project-Id-Version: man-db 2.11.0\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,7 +18,12 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "" @@ -38,39 +43,39 @@ msgstr "" msgid "fatal: regex `%s': %s" msgstr "" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "" msgstr[1] "" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "" @@ -99,9 +104,9 @@ msgstr "" msgid "The man database defaults to %s%s." msgstr "" -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "" @@ -111,178 +116,173 @@ msgstr "" msgid "can't open %s for reading" msgstr "" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" "Updating cat files for section %s of man hierarchy %s\n" msgstr "" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "" -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "" msgstr[1] "" -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "" @@ -307,19 +307,19 @@ msgstr "" msgid "show whatis information" msgstr "" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "" @@ -329,7 +329,7 @@ msgstr "" msgid "command exited with status %d: %s" msgstr "" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "" @@ -341,275 +341,275 @@ msgstr "" msgid "WARNINGS" msgstr "" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" msgstr "" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" msgstr "" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" "cannot write to %s in catman mode" msgstr "" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr "" @@ -625,7 +625,7 @@ msgstr "" msgid "encoding for output" msgstr "" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "" @@ -656,7 +656,7 @@ msgstr "" msgid "--suffix and --in-place are mutually exclusive" msgstr "" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "" @@ -682,161 +682,161 @@ msgstr "" msgid "possible encodings of original text" msgstr "" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "" msgstr[1] "" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "" msgstr[1] "" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "" msgstr[1] "" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "" msgstr[1] "" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "" -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "" @@ -849,111 +849,111 @@ msgstr "" msgid "show the entire global manpath" msgstr "" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 #, c-format -msgid "warning: %s is a dangling symlink" +msgid "Checking for stray cats under %s...\n" msgstr "" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:74 #, c-format -msgid "can't resolve %s" +msgid "warning: %s is a dangling symlink" msgstr "" -#: src/straycats.c:304 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format -msgid "Checking for stray cats under %s...\n" +msgid "can't resolve %s" msgstr "" -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "" -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "" -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-2.5.7-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2009-11-16 08:36+0100\n" "Last-Translator: Erwin Poeze <erwin.poeze@gmail.com>\n" "Language-Team: Dutch <vertaling@vrijschrift.org>\n" @@ -19,7 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: KBabel 1.11.4\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "waarschuwing: %s: onjuiste bestandsnaam wordt genegeerd" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "kan huidige map niet bepalen" @@ -39,39 +44,39 @@ msgstr "de SETUID-gebruiker '%s' bestaat niet" msgid "fatal: regex `%s': %s" msgstr "fatale fout: reguliere expressie '%s': %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "multisleutel %s bestaat niet" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "kan index-cache %s niet vergrendelen" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "index-cache %s is beschadigd" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "kan sleutel %s niet vervangen" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, fuzzy, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "slechts %d velden in de inhoud" msgstr[1] "slechts %d velden in de inhoud" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "onjuiste treffer voor multisleutel %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Database %s is beschadigd; maak deze opnieuw aan met 'mandb --create'" @@ -100,9 +105,9 @@ msgstr "[MAN-GEGEVENSBANK]" msgid "The man database defaults to %s%s." msgstr "De standaard man-database is %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "debug-uitvoer produceren" @@ -112,39 +117,39 @@ msgstr "debug-uitvoer produceren" msgid "can't open %s for reading" msgstr "kan %s niet openen om te lezen" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[SECTIE...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "PAD" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "pad waarin naar man-pagina's gezocht moet worden" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "BESTAND" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "te gebruiken configuratiebestand" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "'man' is mislukt met afsluitwaarde %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "NULL-inhoud voor sleutel %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -153,141 +158,136 @@ msgstr "" "\n" "Bijwerken van cat-bestanden voor sectie %s van man-hiërachie %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "kan in %s niet schrijven" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "kan database %s niet lezen" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "kan %s niet bijwerken" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "waarschuwing: botsende subsecties in %s/man%s/%s.%s*" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "kan index-cache %s niet bijwerken" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "" "waarschuwing: %s: onjuiste symbolische koppeling of onjuist roff-'.so'-" "verzoek" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "waarschuwing: %s: leeg bestand wordt genegeerd" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "waarschuwing: %s: ontleden van %s(%s) voor 'whatis' is mislukt" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "kan map %s niet doorzoeken" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "kan eigenaar van %s niet wijzigen" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "waarschuwing: kan cat-map %s niet aanmaken" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "kan de toegangsrechten van %s niet wijzigen" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "kan niet naar map %s gaan" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "kan index-cache %s niet aanmaken" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Bijwerken van index-cache voor pad '%s/%s'. Even geduld..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "voltooid.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Verwijderen van oude databaseitems uit %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "waarschuwing: opslaan van item voor %s(%s) is mislukt" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "waarschuwing: %s: onjuiste bestandsnaam wordt genegeerd" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "PAD SECTIE NAAM" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "SUBSECTIE" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "het zoeken beperken tot deze subsectie" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "hoofdletterongevoelig naar pagina's zoeken" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "hoofdlettergevoelig naar pagina's zoeken" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "paginanaam als reguliere expressies begrijpen" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "de paginanaam bevat jokertekens" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, fuzzy, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "waarschuwing: de 'whatis' voor %s is meer dan %d bytes -- afgekapt" msgstr[1] "waarschuwing: de 'whatis' voor %s is meer dan %d bytes -- afgekapt" -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "kan %s niet openen" @@ -312,19 +312,19 @@ msgstr "argumenten begrijpen als 'cat'-pagina's" msgid "show whatis information" msgstr "'whatis'-informatie tonen" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "de gegokte reeks voorbewerkingsfilters tonen" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "CODERING" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "uitvoer in deze codering produceren" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: opties gaan niet samen" @@ -334,7 +334,7 @@ msgstr "%s: opties gaan niet samen" msgid "command exited with status %d: %s" msgstr "opdracht eindigde met afsluitwaarde %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[SECTIE] PAGINA..." @@ -346,132 +346,132 @@ msgstr "alle opties op hun standaardwaarden terugzetten" msgid "WARNINGS" msgstr "WAARSCHUWINGEN" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "(deze) waarschuwingen van 'groff' doorgeven" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Werkingsmodus:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "als 'whatis' fungeren" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "als 'apropos' fungeren" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "zoek de tekst in alle pagina's" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "de locatie van man-pagina's tonen" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "de locatie van cat-pagina's tonen" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "paginanaam als lokale bestandsnaam begrijpen" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "(gebruikt door 'catman' bij heropmaken)" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "brontekst uitvoeren omgezet naar deze codering" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Gevonden man-pagina's:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "TAALCODE" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "te gebruiken taalregio voor deze zoekopdracht" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SYSTEEMNAAM" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "man-pagina's van deze andere Unix-systemen tonen" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "SECTIES" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "te doorzoeken secties (scheiden met dubbele punten)" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "alle pagina's tonen die voldoen aan de reguliere expressie" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "alle pagina's tonen die voldoen aan het jokerteken" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "laat --regex en --wildcard alleen paginanamen weergeven, geen beschrijvingen" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "alle passende pagina's vinden, niet alleen eerste" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "een cache-consistentiecontrole afdwingen" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "probeer geen subpagina's, b.v. 'man foo bar' => 'man foo-bar'" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Uitvoerbesturing:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PROGRAMMA" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "dit programma gebruiken om de uitvoer te tonen" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "TEKENREEKS" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "deze tekens als prompt van 'less' gebruiken" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "een ASCII-versie van sommige Latin1-tekens tonen" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "woordafbreken uitschakelen" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "uitvullen uitschakelen" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -481,34 +481,34 @@ msgstr "" " e - [n]eqn p - pic t - tbl\n" " g - grap r - refer v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "'%s' gebruiken om pagina's op te maken" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "APPARAAT" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "'%s' gebruiken met dit apparaat" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "PROGRAMMA" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "'%s' of PROGRAMMA gebruiken voor HTML-uitvoer" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "RESOLUTIE" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -516,85 +516,85 @@ msgstr "" "'groff' gebruiken en uitvoer tonen via 'gxditview';\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "'groff' gebruiken en \"ditroff\" laten produceren" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Er is geen pagina over %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Of anders: welke man-pagina wilt u zien uit sectie %s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Welke man-pagina wilt u zien?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Er is geen pagina over %s in sectie %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Zie '%s' voor hulp als man-pagina's niet beschikbaar zijn.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "onbekende preprocessor '%c' wordt genegeerd" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "kan %s niet hernoemen naar %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "kan tijdsstempels van %s niet zetten" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "kan %s niet verwijderen" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "kan geen tijdelijk cat-bestand aanmaken voor %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "kan geen tijdelijk map aanmaken" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "kan tijdelijk bestand %s niet openen" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "kan map %s niet verwijderen" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- volgende: %s [ Enter=zien | Ctrl-D=overslaan | Ctrl-C=afsluiten ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -603,27 +603,27 @@ msgstr "" "\n" "kan niet naar %s schrijven in 'catman'-modus" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Kan %s niet omzetten naar een cat-naam" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: vertrouwen op 'whatis'-referenties wordt ontraden\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "'mandb' is mislukt met afsluitwaarde %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "**interne fout**: kandidaattype %d valt buiten bereik" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Handleidingspagina " @@ -639,7 +639,7 @@ msgstr "CODERING" msgid "encoding for output" msgstr "codering van de uitvoer" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "" @@ -670,7 +670,7 @@ msgstr "" msgid "--suffix and --in-place are mutually exclusive" msgstr "" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "kan %s niet verwijderen" @@ -697,69 +697,69 @@ msgstr "CODERING[:...]" msgid "possible encodings of original text" msgstr "mogelijke codering(en) van originele tekst" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[MANPAD]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "minder waarschuwingen produceren" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "losse cat-bestanden niet aan database toevoegen" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "verouderde items niet uit database verwijderen" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "alleen gebruikersdatabase produceren" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "database niet bijwerken maar opnieuw aanmaken" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "de man-pagina's op correctheid controleren" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "BESTAND" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "alleen het item voor dit bestand bijwerken" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "kan niet naar %s schrijven" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "kan niet uit %s lezen" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Verwerken van pagina's onder %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, fuzzy, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Zoeken naar losse cat-bestanden onder %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "waarschuwing: geen 'MANDB_MAP'-opdrachten in %s; uw man-pad wordt gebruikt" -#: src/mandb.c:926 +#: src/mandb.c:988 #, fuzzy, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" @@ -770,93 +770,93 @@ msgstr[1] "" "%d man-mappen bevatten nieuwere pagina's,\n" "%d man-pagina's werden toegevoegd.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, fuzzy, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] " Handleidingspagina " msgstr[1] " Handleidingspagina " -#: src/mandb.c:935 +#: src/mandb.c:997 #, fuzzy, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "%d losse cat-bestanden werden toegevoegd.\n" msgstr[1] "%d losse cat-bestanden werden toegevoegd.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, fuzzy, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d verouderde databaseitems werden verwijderd.\n" msgstr[1] "%d verouderde databaseitems werden verwijderd.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Geen databases aangemaakt." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "de inhoud van man-pad-configuratiebestand %s is onbegrijpelijk" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "waarschuwing: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "waarschuwing: %s is geen map" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "waarschuwing: $PATH is niet ingesteld" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "waarschuwing: $PATH is leeg" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "waarschuwing: $MANPATH is ingesteld -- %s wordt voorgevoegd" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "waarschuwing: $MANPATH is ingesteld -- %s wordt achtergevoegd" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "waarschuwing: $MANPATH is ingesteld -- %s wordt ingevoegd" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "waarschuwing: $MANPATH is ingesteld -- %s wordt genegeerd" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "kan mappenlijst '%s' niet ontleden" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "kan man-pad-configuratiebestand %s niet openen" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "waarschuwing: vereiste map %s bestaat niet" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "waarschuwing: %s begint niet met %s" @@ -869,113 +869,113 @@ msgstr "de relatieve cat-paden weergeven" msgid "show the entire global manpath" msgstr "het volledige globale man-pad weergeven" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "waarschuwing: geen algemeen man-pad ingesteld in configuratiebestand %s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Zoeken naar losse cat-bestanden onder %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "waarschuwing: %s is een doelloze symbolische koppeling" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "kan %s niet herleiden" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Zoeken naar losse cat-bestanden onder %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s refereert aan zichzelf" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "SLEUTELWOORD..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "De optie '--regex' is standaard." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "breedsprakige waarschuwingen produceren" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "sleutelwoorden als reguliere expressies begrijpen" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "sleutelwoorden moeten exact overeenkomen" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "de sleutelwoorden bevatten jokertekens" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "alle sleutelwoorden moeten gevonden worden" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "de uitvoer niet aan de terminalbreedte aanpassen" -#: src/whatis.c:133 +#: src/whatis.c:137 #, fuzzy msgid "search only these sections (colon-separated)" msgstr "alleen in deze sectie zoeken" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "te gebruiken taalregio voor deze zoekopdracht" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s wat?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "waarschuwing: %s bevat een pointer-lus" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(onderwerp onbekend)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: niets gevonden.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: '.so'-verzoeken zijn te diep genest of recursief" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: waarschuwing: '.so'-verzoek is mislukt" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: waarschuwing: regeleindeteken in '.so'-verzoek -- genegeerd" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: waarschuwing: regeleindeteken in '.lf'-verzoek -- genegeerd" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: onafgesloten aanhaling in 'roff'-verzoek" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.7.6.1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2016-12-21 20:46+0100\n" "Last-Translator: Robert Luberda <robert@debian.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" @@ -20,7 +20,12 @@ msgstr "" "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 2.0\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "ostrzeżenie: %s: ignorowanie niepoprawnej nazwy pliku" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "nie można okreÅ›lić katalogu bieżącego" @@ -40,27 +45,27 @@ msgstr "użytkownik \"%s\" nie istnieje" msgid "fatal: regex `%s': %s" msgstr "bÅ‚Ä…d krytyczny: wyrażenie regularne \"%s\": %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "wielowymiarowy klucz %s nie istnieje" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "nie można zablokować bufora indeksu %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "bufor indeksu %s uszkodzony" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "nie można zamienić klucza %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" @@ -68,12 +73,12 @@ msgstr[0] "tylko %d pole w zmiennej content" msgstr[1] "tylko %d pola w zmiennej content" msgstr[2] "tylko %d pól w zmiennej content" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "bÅ‚Ä…d pobierania klucza wielowymiarowego %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "" @@ -104,9 +109,9 @@ msgstr "[BAZA DANYCH MAN]" msgid "The man database defaults to %s%s." msgstr "DomyÅ›lnÄ… bazÄ… danych jest %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "wyÅ›wietla komunikaty diagnostyczne" @@ -116,40 +121,40 @@ msgstr "wyÅ›wietla komunikaty diagnostyczne" msgid "can't open %s for reading" msgstr "nie można otworzyć %s do odczytu" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[SEKCJA...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "ÅšCIEÅ»KA" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "ustawia Å›cieżkÄ™ wyszukiwania stron podrÄ™cznika na ÅšCIEÅ»KĘ" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "PLIK" # -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "używa tego pliku konfiguracyjnego użytkownika" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "polecenie man zakoÅ„czyÅ‚o siÄ™ bÅ‚Ä™dem %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "Pusta (NULL) zawartość klucza %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -158,131 +163,126 @@ msgstr "" "\n" "Aktualizowanie preformatowanych stron w sekcji %s hierarchii stron %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "nie można zapisać w %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "nie można odczytać bazy danych %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "nie można zaktualizować %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "ostrzeżenie: %s/man%s/%s.%s*: konkurujÄ…ce rozszerzenia" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "nie można zaktualizować bufora indeksu %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "" "ostrzeżenie: %s zÅ‚e dowiÄ…zanie symboliczne lub bÅ‚Ä™dne żądanie \".so\" ROFF" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "ostrzeżenie: %s: ignorowanie pustego pliku" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "ostrzeżenie: %s: przetwarzanie whatis %s(%s) siÄ™ nie powiodÅ‚o" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "nie można przeszukać katalogu %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "nie można zmienić wÅ‚aÅ›ciciela %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "ostrzeżenie: bÅ‚Ä…d tworzenia katalogu preformatowanych stron %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "nie można zmienić praw dostÄ™pu %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "nie można przejść do katalogu %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "nie można utworzyć bufora indeksu %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Aktualizowanie bufora indeksu dla Å›cieżki \"%s/%s\". ProszÄ™ czekać..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "zakoÅ„czono.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Usuwanie starych wpisów w bazie danych %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "ostrzeżenie: bÅ‚Ä…d podczas zachowywania wpisu dla %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "ostrzeżenie: %s: ignorowanie niepoprawnej nazwy pliku" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "ÅšCIEÅ»KA SEKCJA NAZWA" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "ROZSZERZENIE" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "ogranicza wyszukiwanie do podanego typu ROZSZERZENIA" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "wyszukuje strony ignorujÄ…c wielkość liter (domyÅ›lnie)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "wyszukuje strony biorÄ…c pod uwagÄ™ wielkość liter" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "interpretuje każde nazwÄ™ strony jako wyr. regularne" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "nazwa strony zawiera znaki dopasowywania" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." @@ -292,9 +292,9 @@ msgstr[1] "" msgstr[2] "" "ostrzeżenie: whatis dla argumentu %s przekracza %d bajtów, obcinanie." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "nie można otworzyć %s" @@ -319,19 +319,19 @@ msgstr "przetwarza jako stronÄ™ cat" msgid "show whatis information" msgstr "pokazuje informacje whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "pokazuje seriÄ™ odgadniÄ™tych filtrów preprocesora" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "KODOWANIE" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "używa wybranego wyjÅ›ciowego kodowania znaków" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: niekompatybilne opcje" @@ -341,7 +341,7 @@ msgstr "%s: niekompatybilne opcje" msgid "command exited with status %d: %s" msgstr "polecenie zwróciÅ‚o kod bÅ‚Ä™du %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[SEKCJA] STRONA..." @@ -353,134 +353,134 @@ msgstr "przywraca wszystkim opcjom ich wartoÅ›ci domyÅ›lne" msgid "WARNINGS" msgstr "OSTRZEÅ»ENIA" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "wÅ‚Ä…cza ostrzeżenia groffa" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Główne tryby dziaÅ‚ania:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "odpowiednik whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "odpowiednik apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "szuka tekstu we wszystkich stronach" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "wyÅ›wietla lokalizacje stron(y) podrÄ™cznika" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "wyÅ›wietla lokalizacje preformatowanych plików cat" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpretuje argumenty STRONA jako nazwy lokalnych plików" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "" "używane przez catman do ponownego sformatowania przestarzaÅ‚ych stron cat" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "wypisuje stronÄ™ źródÅ‚owÄ… przeksztaÅ‚conÄ… do KODOWANIA" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Wyszukiwanie stron podrÄ™cznika ekranowego:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "UST_JĘZYKOWE" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "okreÅ›la ustawienia jÄ™zykowe tego wyszukiwania stron" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SYSTEM" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "używa stron podrÄ™cznika z innych systemów" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LISTA" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "używa rozdzielonej dwukropkami listy sekcji" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "wyÅ›wietla wszystkie strony pasujÄ…ce do wyr. regularnego" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "wyÅ›wietla wszystkie strony pasujÄ…ce do maski dopasowania" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "powoduje, że --regex i --wildcard pasujÄ… tylko do nazw stron, a nie do opisów" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "wyszukuje wszystkie pasujÄ…ce strony podrÄ™cznika" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "wymusza sprawdzanie spójnoÅ›ci" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "nie próbuje podstron, np. \"man foo bar\" => \"man foo-bar\"" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Kontrolowanie sformatowanego wyjÅ›cia:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PAGER" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "używa programu PAGER do wyÅ›wietlenia wyjÅ›cia" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "ÅAŃCUCH" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "ustawia liniÄ™ zachÄ™ty programu \"less\"" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "wyÅ›wietla odpowiedniki ASCII pewnych znaków latin1" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "wyÅ‚Ä…cza podziaÅ‚ wyrazów na koÅ„cu linii" # -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "wyÅ‚Ä…cza wyrównywanie linii" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -490,34 +490,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "używa %s do formatowania stron" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "URZÄ„DZENIE" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "używa %s z podanym urzÄ…dzeniem" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "PRZEGLÄ„DARKA" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "używa %s lub PRZEGLÄ„DARKI do wyÅ›wietlenia wyjÅ›cia w HTML-u" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "ROZDZIELCZOŚĆ" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -525,88 +525,88 @@ msgstr "" "używa groffa i wyÅ›wietla przez gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "używa groffa i wymusza na nim wyprodukowanie ditroffa" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Brak podrÄ™cznika dla %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Albo: jakiej strony z sekcji %s podrÄ™cznika potrzebujesz?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Jakiej strony podrÄ™cznika potrzebujesz?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Brak podrÄ™cznika dla %s w sekcji %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" "ProszÄ™ przeczytać \"%s\", aby uzyskać pomoc,\n" " gdy strony podrÄ™cznika nie sÄ… dostÄ™pne.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ignorowanie nieznanego preprocesora \"%c\"" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "nie można zmienić nazwy %s na %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "nie można ustawić czasów na %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "nie można usunąć %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "nie można utworzyć tymczasowego pliku cat dla %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "nie można utworzyć katalogu tymczasowego" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "nie można otworzyć pliku tymczasowego %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "nie można usunąć katalogu %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- nastÄ™pna: %s [ przeglÄ…daj (return) | pomiÅ„ (Ctrl-D) | zakoÅ„cz (Ctrl-" "C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -615,28 +615,28 @@ msgstr "" "\n" "nie można zapisać do %s w trybie catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Nie można skonwertować %s do nazwy preformatowanej strony podrÄ™cznika" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: poleganie na odnoÅ›nikach whatis jest niezalecane\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "polecenie mandb zakoÅ„czyÅ‚o siÄ™ bÅ‚Ä™dem %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "" "bÅ‚Ä…d wewnÄ™trzny: typ kandydata %d poza zakresem dopuszczalnych wartoÅ›ci" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Strona podrÄ™cznika ekranowego " @@ -652,7 +652,7 @@ msgstr "KOD" msgid "encoding for output" msgstr "kodowanie wyjÅ›cia" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "" @@ -683,7 +683,7 @@ msgstr "" msgid "--suffix and --in-place are mutually exclusive" msgstr "" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "nie można usunąć %s" @@ -710,68 +710,68 @@ msgstr "KOD[:...]" msgid "possible encodings of original text" msgstr "możliwe kodowania oryginalnego tekstu" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[MANPATH]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "tryb cichy, poza ostrzeżeniami o nieprawidÅ‚owoÅ›ciach" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "nie szuka i nie dodaje zabÅ‚Ä…kanych plików cat do db" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "nie czyÅ›ci przestarzaÅ‚ych wpisów z bazy danych" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "tworzy tylko bazy danych użytkownika" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "tworzy nowe bazy danych, zamiast aktualizować istniejÄ…ce" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "sprawdza poprawność stron podrÄ™cznika" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "NAZWA_PLIKU" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "aktualizuje wpis dotyczÄ…cy tej nazwy pliku" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "nie można pisać do %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "nie można czytać z %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Przetwarzanie stron podrÄ™cznika w %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Usuwanie przestarzaÅ‚ego katalogu stron preformatowanych %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "ostrzeżenie: w %s brak dyrektyw MANDB_MAP, używanie Å›cieżki manpath" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" @@ -779,7 +779,7 @@ msgstr[0] "%d podkatalog man zawieraÅ‚ nowsze strony podrÄ™cznika.\n" msgstr[1] "%d podkatalogi man zawieraÅ‚y nowsze strony podrÄ™cznika.\n" msgstr[2] "%d podkatalogów man zawieraÅ‚o nowsze strony podrÄ™cznika.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" @@ -787,7 +787,7 @@ msgstr[0] "Dodano %d stronÄ™ podrÄ™cznika.\n" msgstr[1] "Dodano %d strony podrÄ™cznika.\n" msgstr[2] "Dodano %d stron podrÄ™cznika.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" @@ -795,7 +795,7 @@ msgstr[0] "Dodano %d zabÅ‚Ä…kanÄ… preformatowanÄ… stronÄ™ podrÄ™cznika.\n" msgstr[1] "Dodano %d zabÅ‚Ä…kane preformatowane strony podrÄ™cznika.\n" msgstr[2] "Dodano %d zabÅ‚Ä…kanych preformatowanych stron podrÄ™cznika.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" @@ -803,72 +803,72 @@ msgstr[0] "UsuniÄ™to %d stary wpis z bazy danych.\n" msgstr[1] "UsuniÄ™to %d stare wpisy z bazy danych.\n" msgstr[2] "UsuniÄ™to %d starych wpisów z bazy danych.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Nie utworzono żadnej bazy danych." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "plik konfiguracyjny manpath %s jest pozbawiony sensu" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "ostrzeżenie: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "ostrzeżenie: %s nie jest katalogiem" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "ostrzeżenie: nie ustawiono zmiennej $PATH" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "ostrzeżenie: zmienna $PATH jest pusta" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "ostrzeżenie: zmienna $MANPATH jest ustawiona, dodawanie %s na poczÄ…tku" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "ostrzeżenie: zmienna $MANPATH jest ustawiona, dodawania %s na koÅ„cu" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "ostrzeżenie: zmienna $MANPATH jest ustawiona, wstawianie %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "ostrzeżenie: zmienna $MANPATH jest ustawiona, %s zignorowane" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "nie można przetworzyć listy katalogów \"%s\"" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "nie można otworzyć pliku konfiguracyjnego %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "ostrzeżenie: obowiÄ…zkowy katalog %s nie istnieje" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "ostrzeżenie: %s nie zaczyna siÄ™ od %s" @@ -881,112 +881,112 @@ msgstr "wyÅ›wietla wzglÄ™dne Å›cieżki cat" msgid "show the entire global manpath" msgstr "pokazuje caÅ‚Ä… globalnÄ… Å›cieżkÄ™ manpath" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "ostrzeżenie: w pliku konfiguracyjnym %s nie ustawiono systemowych Å›cieżek man" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Poszukiwanie nie powiÄ…zanych stron preformatowanych w %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "ostrzeżenie: %s jest wiszÄ…cym dowiÄ…zaniem symbolicznym" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "nie można rozwiÄ…zać %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Poszukiwanie nie powiÄ…zanych stron preformatowanych w %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s odwoÅ‚uje siÄ™ do samego siebie" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "SÅOWO_KLUCZ..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "Opcja --regex jest domyÅ›lnie wÅ‚Ä…czona." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "wyÅ›wietla szczegółowe ostrzeżenia" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "interpretuje każde sÅ‚owo kluczowe jako wyr. regularne" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "szuka każdego sÅ‚owa kluczowego dla peÅ‚nego dopasowania" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "sÅ‚owa kluczowe zawierajÄ… znaki dopasowywania" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "żąda dopasowania wszystkich słów kluczowych" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "nie przycina wyjÅ›cia do szerokoÅ›ci terminalu" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "przeszukuje tylko te sekcje (rozdzielone Å›rednikami)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "ustawienia jÄ™zykowe tego wyszukiwania" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "co %s?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "ostrzeżenie: %s zawiera pÄ™tlÄ™ wskaźników" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(temat nieznany)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nic odpowiedniego.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: żądania.so zbyt gÅ‚Ä™bokie lub rekurencyjne" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: ostrzeżenie: bÅ‚Ä™dne żądanie .so" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: ostrzeżenie: znak nowej linii w żądaniu .so, ignorowanie" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: ostrzeżenie: znak nowej linii w żądaniu .lf, ignorowanie" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: niedopasowany cudzysłów w żądaniu roff" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.9.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2019-10-03 06:47+0100\n" "Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n" "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n" @@ -19,7 +19,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Gtranslator 2.91.7\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "aviso: %s: a ignorar nome de ficheiro fictÃcio" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "impossÃvel determinar a pasta actual" @@ -39,39 +44,39 @@ msgstr "o utilizador setuid \"%s\" não existe" msgid "fatal: regex `%s': %s" msgstr "fatal: regex `%s': %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "chave múltipla %s não existe" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "impossÃvel bloquear a cache de Ãndice %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "cache de Ãndice %s corrompida" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "impossÃvel substituir chave %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "só %d campo no conteúdo" msgstr[1] "só %d campos no conteúdo" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "má obtenção em chave múltipla %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Base de dados %s corrompida; refaça-a com mando --create" @@ -100,9 +105,9 @@ msgstr "[BASE DE DADOS MAN]" msgid "The man database defaults to %s%s." msgstr "A base de dados man predefinida é %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "emite mensagens de depuração" @@ -112,39 +117,39 @@ msgstr "emite mensagens de depuração" msgid "can't open %s for reading" msgstr "ImpossÃvel abrir %s para leitura" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[SECÇÃO...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "CAMINHO" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "define caminho para páginas do manual para CAMINHO" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "FICHEIRO" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "usa este ficheiro de configuração do utilizador" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "comando man falhou com estado de saÃda %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "Conteúdo NULL para chave: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -153,139 +158,134 @@ msgstr "" "\n" "A actualizar ficheiros cat para a secção %s da hierarquia man %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "impossÃvel escrever dentro de %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "impossÃvel ler base de dados %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "impossÃvel actualizar %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "aviso: %s/man%s/%s.%s*: extensões concorrentes" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "impossÃvel actualizar a cache de Ãndice %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "aviso: %s: má ligação simbólica ou pedido ROFF \".so\"" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "aviso: %s: a ignorar ficheiro vazio" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "aviso: %s: falha na análise whatis para %s(%s)" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "impossÃvel procurar na pasta %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "impossÃvel chown %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "aviso: impossÃvel criar catdir %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "impossÃvel chmod %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "impossÃvel mudar para a pasta %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "impossÃvel criar cache de Ãndice %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "A actualizar cache de Ãndice para caminho \"%s/%s\". Aguarde..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "feito.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "A purgar entradas da base de dados antigas em %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "aviso: falha ao armazenar entrada para %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "aviso: %s: a ignorar nome de ficheiro fictÃcio" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "CAMINHO SECÇÃO NOME" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "EXTENSÃO" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "limita procura a extensão de tipo EXTENSÃO" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "procura páginas sem diferenciar maiúsculas (predefinição)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "procura páginas diferenciando maiúsculas" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "interpreta o nome da página como regex" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "o nome da página contém caracteres universais" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "aviso: whatis para %s excede %d byte, a truncar" msgstr[1] "aviso: whatis para %s excede %d bytes, a truncar." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "impossÃvel abrir %s" @@ -310,19 +310,19 @@ msgstr "analisa como página cat" msgid "show whatis information" msgstr "mostra informação whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "mostra série adivinhada de filtros de pré-processamento" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "CODIFICAÇÃO" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "usa a codificação de saÃda seleccionada" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: opções incompatÃveis" @@ -332,7 +332,7 @@ msgstr "%s: opções incompatÃveis" msgid "command exited with status %d: %s" msgstr "comando saiu com estado %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[SECÇÃO] PÃGINA..." @@ -344,133 +344,133 @@ msgstr "repõe as predefinições de todas as opções" msgid "WARNINGS" msgstr "AVISOS" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "activa avisos de groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Principais modos de operação:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "equivalente a whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "equivalente a apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "procura texto em todas as páginas" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "imprime localização fÃsica da(s) página(s) man" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "imprime localização fÃsica da(s) página(s) cat" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpreta argumento(s) de PÃGINA como nome(s) de ficheiros local(is)" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "usado por catman para reformatar páginas cat fora do prazo" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "imprime página fonte codificada em CODIFICAÇÃO" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Procurar páginas do manual:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "IDIOMA" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "define o idioma para esta procura man em particular" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SISTEMA" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "usa páginas do manual de outros sistemas" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LISTA" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "usa lista de secções separadas por vÃrgula" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "mostra todas as páginas que cumpram a regex" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "mostra todas as páginas que cumpram o carácter universal" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "faz com que --regex e --wildcard correspondam só a nomes de página, não " "descrições" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "encontra todas as páginas do manual correspondentes" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "força uma verificação de consistência da cache" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "não tenta sub-páginas, e.g. \"man foo bar\" => \"man foo-bar\"" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "A controlar saÃda formatada:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PAGINADOR" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "usa o programa PAGINADOR para mostrar a saÃda" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "CADEIA" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "fornece um prompt ao paginador \"less\"" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "mostra tradução ASCII de certos caracteres latin1" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "desliga a hifenização" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "desliga a justificação" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -480,34 +480,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "usa %s para formatar as páginas" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "DISPOSITIVO" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "usa %s com o dispositivo seleccionado" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "NAVEGADOR" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "usa %s ou NAVEGADOR para mostrar saÃda HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "RESOLUÇÃO" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -515,86 +515,86 @@ msgstr "" "usa o groff e mostra através de gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "usa o groff e força-o a produzir ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Sem entrada de manual para %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(em alternativa, que página do manual deseja para a secção %s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Que página do manual deseja?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "Por exemplo, tente \"man man\".\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Sem entrada de manual para %s na secção %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" "Veja \"%s\" para ajuda quando as páginas do manual não estão disponÃveis.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "a ignorar pré-processador \"%c\" desconhecido" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "impossÃvel renomear %s para %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "impossÃvel definir horas em %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "impossÃvel desligar %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "impossÃvel criar cat temporário para %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "impossÃvel criar pasta temporária" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "impossÃvel abrir ficheiro temporário %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "impossÃvel remover pasta %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- seguinte: %s [ ver (return) | saltar (Ctrl-D) | sair (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -603,27 +603,27 @@ msgstr "" "\n" "impossÃvel escrever em %s em modo catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "ImpossÃvel converter %s para nome cat" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: confiar em refs whatis está obsoleto\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "comando mandb falhou com estado de saÃda %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "erro interno: tipo de candidato %d fora do intervalo" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Página do manual " @@ -639,7 +639,7 @@ msgstr "CÓDIGO" msgid "encoding for output" msgstr "codificação para saÃda" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "SUFIXO" @@ -670,7 +670,7 @@ msgstr "tem de usar --suffix ou --in-place" msgid "--suffix and --in-place are mutually exclusive" msgstr "--suffix e --in-place são mutuamente exclusivas" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "impossÃvel remover %s" @@ -696,161 +696,161 @@ msgstr "CÓDIGO[:...]" msgid "possible encodings of original text" msgstr "possÃveis codificações do texto original" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[CAMINHOMAN]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "trabalha em silêncio, excepto para aviso \"fictÃcio\"" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "não procura ou adiciona cats perdidos à s bases de dados" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "não purga entradas obsoletas das bases de dados" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "produz só bases de dados do utilizador" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "cria bases de dados de raiz, em vez de actualizar" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "verificar páginas do manual por correcção" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "NOMEFICHEIRO" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "actualiza só a entrada para este nome de ficheiro" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "impossÃvel escrever em %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "impossÃvel ler de %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "A processar páginas do manual sob %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "A remover pasta cat obsoleta %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "aviso: sem directivas MANDB_MAP em %s, a usar o seu manpath" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "%d sub-pasta man continha páginas do manual mais recentes.\n" msgstr[1] "%d sub-pastas man continham páginas do manual mais recentes.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "%d página do manual adicionada.\n" msgstr[1] "%d páginas do manual adicionadas.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "%d cat perdido adicionado.\n" msgstr[1] "%d cats perdidos adicionados.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d entrada de base de dados antiga purgada.\n" msgstr[1] "%d entradas de base de dados antigas purgadas.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Não se criaram bases de dados." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "impossÃvel fazer sentido do ficheiro de configuração manpath %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "aviso: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "aviso: %s não é uma pasta" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "aviso: $PATH não definido" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "aviso: $PATH vazio" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "aviso: $MANPATH definido, a prepor %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "aviso: $MANPATH definido, a anexar %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "aviso: $MANPATH definido, a inserir %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "aviso: $MANPATH definido, a ignorar %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "impossÃvel analisar lista de pastas \"%s\"" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "impossÃvel abrir o ficheiro de configuração manpath %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "aviso: pasta obrigatória %s não existe" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "aviso: %s não começa com %s" @@ -863,111 +863,111 @@ msgstr "mostrar catpaths relativos" msgid "show the entire global manpath" msgstr "mostrar todo o manpath global" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "aviso: sem manpath globais definidos no ficheiro de configuração %s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "A procurar cats perdidos sob %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "aviso: %s é uma ligação simbólica pendente" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "impossÃvel resolver %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "A procurar cats perdidos sob %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s referencia-se a si própria" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "PALAVRA-CHAVE..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "A opção --regex está activa por predefinição." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "imprime mensagens de aviso verbosas" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "interpreta cada palavra-chave como regex" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "procura cada palavra-chave por correspondência exacta" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "as palavras-chave contêm caracteres universais" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "requer que todas as palavra-chave correspondam" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "não cortar saÃda para a largura do terminal" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "procurar só nestas secções (separado por dois-pontos)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "define o idioma para esta procura" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s o quê?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "aviso: %s contém um ciclo de ponteiro" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(assunto desconhecido)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nada apropriado.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: pedidos .so aninhados demais ou são recursivos" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: aviso: pedido .so falhou" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: aviso: newline em pedido .so, a ignorar" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: avido: newline em pedido .lf, a ignorar" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: aspa não terminada em pedido roff" diff --git a/po/pt_BR.po b/po/pt_BR.po index 39c95b60..37f4aaa7 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.9.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2019-10-01 09:10-0200\n" "Last-Translator: Rafael Fontenelle <rafaelff@gnome.org>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation@lists.sourceforge." @@ -26,7 +26,12 @@ msgstr "" "X-Generator: Virtaal 1.0.0-beta1\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "aviso: %s: ignorando nome de arquivo inválido" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "não foi possÃvel determinar o diretório atual" @@ -46,39 +51,39 @@ msgstr "o usuário man setuid \"%s\" não existe" msgid "fatal: regex `%s': %s" msgstr "fatal: regex \"%s\": %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "a multichave %s não existe" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "não foi possÃvel travar o cache de Ãndice %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "o cache de Ãndice %s está corrompido" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "não foi possÃvel substituir a chave %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "apenas %d campo no conteúdo" msgstr[1] "apenas %d campos no conteúdo" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "busca ruim na multichave %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Banco de dados %s corrompido; reconstrua-o com mandb --create" @@ -107,9 +112,9 @@ msgstr "[BANDO-DE-DADOS MAN]" msgid "The man database defaults to %s%s." msgstr "O banco de dados man tem como padrão %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "emite mensagens de depuração" @@ -119,39 +124,39 @@ msgstr "emite mensagens de depuração" msgid "can't open %s for reading" msgstr "não foi possÃvel abrir %s para leitura" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[SEÇÃO...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "CAMINHO" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "define o caminho de pesquisa por páginas de manual com CAMINHO" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "ARQUIVO" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "usa esse arquivo de configuração de usuário" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "o comando man falhou com estado de saÃda %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "conteúdo NULL para a chave: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -160,139 +165,134 @@ msgstr "" "\n" "Atualizando arquivos cat para seção %s da hierarquia man %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "não foi possÃvel escrever dentro de %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "não foi possÃvel ler o banco de dados %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "não foi possÃvel de atualizar %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "aviso: %s/man%s/%s.%s*: extensões conflitantes" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "não foi possÃvel atualizar cache de Ãndice %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "aviso: %s: link simbólico ruim ou requisição \".so\" ROFF" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "aviso: %s: ignorando arquivo vazio" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "aviso: %s: análise por whatis para %s(%s) falhou" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "não foi possÃvel pesquisar no diretório %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "não foi possÃvel fazer chown em %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "aviso: não foi possÃvel criar o catdir %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "não foi possÃvel fazer chmod em %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "não foi possÃvel mudar para o diretório %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "não foi possÃvel criar cache de Ãndice %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Atualizando o cache de Ãndice para o caminho \"%s/%s\". Aguarde..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "feito.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Descartando entradas antigas de banco de dados em %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "aviso: falha ao armazenar entradas para %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "aviso: %s: ignorando nome de arquivo inválido" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "CAMINHO SEÇÃO NOME" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "EXTENSÃO" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "limita a pesquisa ao tipo de extensão EXTENSÃO" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "procura por páginas sem diferenciar maiúsculo de minúsculo (padrão)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "procura por páginas diferenciando maiúsculo de minúsculo" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "interpreta o nome da páginas como uma expressão regular" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "o nome da página contém caracteres curingas" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "aviso: whatis para %s excede %d byte, truncando." msgstr[1] "aviso: whatis para %s excede %d bytes, truncando." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "não foi possÃvel abrir %s" @@ -317,19 +317,19 @@ msgstr "analisa como uma página cat" msgid "show whatis information" msgstr "mostra informação whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "mostra séries adivinhadas de filtros de pré-processamento" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "CODIFICAÇÃO" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "usa a codificação de saÃda selecionada" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: opções incompatÃveis" @@ -339,7 +339,7 @@ msgstr "%s: opções incompatÃveis" msgid "command exited with status %d: %s" msgstr "o comando saiu com status %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[SEÇÃO] PÃGINA..." @@ -351,133 +351,133 @@ msgstr "redefine todas opções para seus valores padrão" msgid "WARNINGS" msgstr "AVISOS" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "habilita avisos do groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Modos principais de operação:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "equivalente a whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "equivalente a apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "pesquisa pelo texto em todas as páginas" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "emite localização fÃsica da(s) página(s) man" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "emite localização fÃsica do(s) arquivo(s) cat" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpreta argumento(s) PÃGINA como nome(s) de arquivo(s) local(is)" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "usado por catman para reformatar páginas cat desatualizadas" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "emite a página fonte codificada em CODIFICAÇÃO" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Localizando as páginas de manual:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOCALIDADE" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "define a localidade para esta pesquisa de man em particular" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SISTEMA" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "usa páginas de manual para outros sistemas" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LISTA" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "usa lista de seções separada por dois-pontos" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "mostra todas as páginas que coincidem com a expressão regular" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "mostra todas as páginas que coincidem com o caractere curinga" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "faz --regex e --wildcard coincidirem apenas nomes de páginas, e não " "descrições" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "localiza todas as páginas de manual correspondentes" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "força uma verificação de consistência de cache" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "não tenta subpáginas, ex.: \"man foo bar\" => \"man foo-bar\"" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Controlando saÃda formatada:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PAGINADOR" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "usa o programa PAGINADOR para exibir a saÃda" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "TEXTO" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "fornece ao paginador \"less\" com uma pergunta" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "exibe a tradução ASCII de certos caracteres latin1" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "desliga hifenização" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "desliga justificação" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -487,34 +487,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "usa %s para formatar páginas" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "DISPOSITIVO" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "usa %s com o dispositivo selecionado" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "NAVEGADOR" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "usa %s ou NAVEGADOR para exibir a saÃda HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "RESOLUÇÃO" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -522,86 +522,86 @@ msgstr "" "usa groff e exibe por meio de gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "usa groff e força-o a produzir ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Nenhuma entrada de manual para %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Alternativamente, qual a página de manual desejada da seção %s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Qual a página de manual desejada?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "Por exemplo, tente \"man man\".\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Nenhuma entrada de manual para %s na seção %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" "Veja \"%s\" para ajuda quando as páginas de manual não estiverem " "disponÃveis.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ignorando pré-processador desconhecido \"%c\"" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "não foi possÃvel renomear %s para %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "não foi possÃvel definir os horários de %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "não foi possÃvel remover o link %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "não foi possÃvel criar o cat temporário para %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "não foi possÃvel criar o diretório temporário" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "não foi possÃvel abrir o arquivo temporário %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "não foi possÃvel remover o diretório %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "--Man-- próxima: %s [ ver (Enter) | pular (Ctrl-D) | sair (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -610,27 +610,27 @@ msgstr "" "\n" "não foi possÃvel escrever em %s no modo catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Não foi possÃvel converter %s para um nome cat" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: o uso de whatis refs está obsoleto\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "o comando mandb falhou com status de saÃda %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "erro interno: tipo de candidato %d fora da faixa" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Página de manual " @@ -646,7 +646,7 @@ msgstr "CÓDIGO" msgid "encoding for output" msgstr "codificação para a saÃda" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "SUFIXO" @@ -677,7 +677,7 @@ msgstr "deve-se usar --suffix ou --in-place" msgid "--suffix and --in-place are mutually exclusive" msgstr "--suffix e --in-place são mutuamente exclusivos" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "não foi possÃvel remover %s" @@ -703,161 +703,161 @@ msgstr "CÓDIGO[:...]" msgid "possible encodings of original text" msgstr "codificações possÃveis do texto original" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[CAMINHO-MAN]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "trabalha silenciosamente, exceto para aviso de erro" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "não procura ou adiciona cats errantes aos bancos de dados" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "não descarta entradas obsoletas dos bancos de dados" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "produz apenas bancos de dados de usuário" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "cria banco de dados do zero, ao invés de atualizá-los" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "verifica a exatidão de páginas de manual" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "NOME-DE-ARQUIVO" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "atualiza apenas a entrada deste nome de arquivo" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "não posso escrever em %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "não foi possÃvel ler de %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Processando as páginas de manual sob %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Removendo diretório cat obsoleto %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "aviso: nenhuma diretiva MANDB_MAP em %s, usando o seu caminho man" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "%d subdiretório man continha páginas de manual novas.\n" msgstr[1] "%d subdiretórios man continham páginas de manual novas.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "%d página de manual foi adicionada.\n" msgstr[1] "%d páginas de manual foram adicionadas.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "%d cat errante foi adicionado.\n" msgstr[1] "%d cats errantes foram adicionados.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d entrada antiga no banco de dados foi descartada.\n" msgstr[1] "%d entradas antigas no banco de dados foram descartadas.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Nenhum banco de dados criado." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "não há sentido algum no arquivo de configuração de caminho man %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "aviso: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "aviso: %s não é um diretório" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "aviso: $PATH não definido" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "aviso: $PATH vazio" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "aviso: $MANPATH definido, acrescentando %s ao inÃcio" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "aviso: $MANPATH definido, acrescentando %s ao final" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "aviso: $MANPATH definido, inserindo %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "aviso: $MANPATH definido, ignorando %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "não foi possÃvel analisar a lista de diretórios \"%s\"" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "não foi possÃvel abrir o arquivo de configuração do caminho man %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "aviso: diretório obrigatório %s não existe" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "aviso: %s não começa com %s" @@ -870,113 +870,113 @@ msgstr "mostra caminhos cat relativos" msgid "show the entire global manpath" msgstr "mostra o caminho man global inteiro" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "aviso: nenhum caminho man global definido no arquivo de configuração %s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Verificando por cats errantes sob %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "aviso: %s é um link simbólico perdido" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "não foi possÃvel resolver %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Verificando por cats errantes sob %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s referencia a si mesmo" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "PALAVRA-CHAVE..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "A opção --regex está habilitada por padrão." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "emite mensagens de aviso detalhadas" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "interpreta cada palavra-chave como uma expressão regular" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "pesquisa cada palavra-chave por correspondência exata" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "a(s) palavra-chave(s) não podem conter caracteres coringas" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "exige correspondência de todas as palavra-chaves" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "não corta a saÃda para a largura do terminal" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "pesquisa apenas nestas seções (separadas por dois-pontos)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "define a localidade para esta pesquisa" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s o quê?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "aviso: %s contém um laço de ponteiros" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(assunto desconhecido)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nada apropriado.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "" "%s:%d: requisições de .so aninhadas com muita profundidade ou são recursivas" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: aviso: requisição .so falhou" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: aviso: nova-linha na requisição de .so, ignorando" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: aviso: nova-linha na requisição de .lf, ignorando" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: aspas não terminadas na requisição de roff" Binary files differ@@ -1,16 +1,23 @@ # Mesajele în limba română pentru pachetul man-db # Copyright (C) 2003 Colin Watson (msgids) # This file is distributed under the same license as the man-db package. +# # Eugen Hoanca <eugenh@urban-grafx.ro>, 2003. # Florentina MuÈ™at <florentina.musat.28@gmail.com>, 2020. # Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>, 2022. # +# Cronologia traducerii fiÈ™ierului „man-dbâ€: +# Traducerea iniÈ›ială, făcută de EH, pentru versiunea man-db 2.4.2-pre1. +# Actualizare a traducerii pentru versiunea 2.9.0-pre1, făcută de FM. +# Actualizare a traducerii pentru versiunea 2.10.0-pre1, făcută de R-GC. +# Actualizare a traducerii pentru versiunea 2.11.0-pre1, făcută de R-GC. +# msgid "" msgstr "" -"Project-Id-Version: man-db 2.10.0-pre1\n" +"Project-Id-Version: man-db 2.11.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" -"PO-Revision-Date: 2022-02-17 10:09+0100\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" +"PO-Revision-Date: 2022-10-03 18:46+0200\n" "Last-Translator: Remus-Gabriel Chelu <remusgabriel.chelu@disroot.org>\n" "Language-Team: Romanian <translation-team-ro@lists.sourceforge.net>\n" "Language: ro\n" @@ -20,9 +27,14 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2);\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -"X-Generator: Poedit 3.0.1\n" +"X-Generator: Poedit 3.1.1\n" + +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "avertisment: %s: se ignoră numele de fiÈ™ier fals(bogus)" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "nu se poate determina directorul curent" @@ -42,27 +54,27 @@ msgstr "utilizatorul «man» privilegiat(setuid) „%sâ€, nu există" msgid "fatal: regex `%s': %s" msgstr "eroare fatală: expreg „%sâ€: %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "cheia multiplă %s nu există" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "nu se poate bloca memoria tampon a indexului %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "memoria tampon a indexului %s este coruptă" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "nu s-a putut înlocui cheia %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" @@ -70,12 +82,12 @@ msgstr[0] "doar un câmp în conÈ›inut" msgstr[1] "doar %d câmpuri în conÈ›inut" msgstr[2] "doar %d de câmpuri în conÈ›inut" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "preluare incorectă pentru cheia multiplă %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Baza de date %s este coruptă; reconstruiÈ›i-o cu «mandb --create»" @@ -113,9 +125,9 @@ msgstr "[BAZÄ‚ DE DATE MAN]" msgid "The man database defaults to %s%s." msgstr "Baza de date »man« implicită este %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "emite mesaje de depanare" @@ -125,20 +137,20 @@ msgstr "emite mesaje de depanare" msgid "can't open %s for reading" msgstr "nu se poate deschide %s pentru citire" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[SECÈšIUNE...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "CALE" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "stabileÈ™te calea de căutare pentru paginile de manual la CALE" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "FIȘIER" @@ -150,23 +162,23 @@ msgstr "FIȘIER" # Acest spaÈ›iu este utilizat pentru a # „echilibraâ€, a asigura alinierea textului # afiÈ™at la rularea comenzilor: -# „»catman, man, mandb, manpath, whatis« --help†-#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +# „«catman, man, mandb, manpath, whatis --helpȠ+#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr " utilizează acest fiÈ™ier de configurare al utilizatorului" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "comanda «man» a eÈ™uat cu starea de ieÈ™ire %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "ConÈ›inut NULL pentru cheia: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -175,133 +187,128 @@ msgstr "" "\n" "Se actualizează fiÈ™ierele cat pentru secÈ›iunea %s din ierarhia man %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "nu se poate scrie în %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "nu se poate citi baza de date %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "nu se poate actualiza %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "avertisment: %s/man%s/%s.%s*: extensii în conflict" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "nu se poate actualiza memoria tampon a indexului %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "avertisment: %s: legătură simbolică sau cerere ROFF „.so†eronată" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "avertisment: %s: se ignoră fiÈ™ierul gol" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "avertisment: %s: analiza whatis pentru %s(%s) a eÈ™uat" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "nu se poate căuta directorul %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "nu se poate schimba proprietarul lui %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "avertisment: nu se poate crea directorul cat %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "nu se pot modifica permisiunile lui %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "nu se poate schimba la directorul %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "nu se poate crea memoria tampon a indexului %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "" "Se actualizează memoria tampon a indexului pentru calea „%s/%sâ€. AÈ™teptaÈ›i..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "efectuat.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Se înlătură intrările vechi ale bazei de date din %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "avertisment: nu s-a putut stoca intrarea pentru %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "avertisment: %s: se ignoră numele de fiÈ™ier fals(bogus)" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "CALE SECÈšIUNE NUME" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "EXTENSIE" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "limitează căutarea la tipul de extensie EXTENSIE" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "" "caută paginile fără să facă distincÈ›ie între majuscule È™i minuscule " "(implicit)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "caută paginile făcând distincÈ›ie între majuscule È™i minuscule" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "interpretează numele paginii ca o expresie regulată" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "numele paginii conÈ›ine metacaractere" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." @@ -310,9 +317,9 @@ msgstr[1] "avertisment: whatis pentru %s depășeÈ™te %d octeÈ›i, se trunchiază msgstr[2] "" "avertisment: whatis pentru %s depășeÈ™te %d de octeÈ›i, se trunchiază." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "nu se poate deschide %s" @@ -342,19 +349,19 @@ msgstr "analizează ca pagină cat" msgid "show whatis information" msgstr "arată informaÈ›iile whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "afiÈ™ează setul ghicit de filtre de preprocesare" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "CODIFICAREA" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "utilizează codificarea de ieÈ™ire selectată" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: opÈ›iuni incompatibile" @@ -364,7 +371,7 @@ msgstr "%s: opÈ›iuni incompatibile" msgid "command exited with status %d: %s" msgstr "comanda a ieÈ™it cu starea %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[SECÈšIUNE] PAGINÄ‚..." @@ -376,67 +383,67 @@ msgstr "restabileÈ™te toate opÈ›iunile la valorile lor implicite" msgid "WARNINGS" msgstr "AVERTISMENTE" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "activează avertismentele de la «groff»" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Modurile principale de operare:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "echivalent cu whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "echivalent cu apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "caută după text în toate paginile" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "tipăreÈ™te locaÈ›ia fizică a paginii(lor) de manual" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "tipăreÈ™te locaÈ›ia fizică a fiÈ™ierului/fiÈ™ierelor cat" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "interpretează argument(ul/ele) paginii ca nume de fiÈ™ier(e) local(e)" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "utilizat de catman pentru a reformata pagini cat expirate" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "afiÈ™ează pagina sursei codificată în CODIFICAREA" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Găsirea paginilor de manual:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOCALIZAREA" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "defineÈ™te limba pentru această căutare de manual particulară" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SISTEM" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "utilizează pagini de manual de la alte sisteme" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LISTÄ‚" @@ -449,49 +456,49 @@ msgstr "LISTÄ‚" # „echilibraâ€, a asigura alinierea textului # afiÈ™at la rularea comenzii: # „»man« --help†-#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr " utilizează o listă de secÈ›iuni separate prin două puncte" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "afiÈ™ează toate paginile care se potrivesc cu expresia regulată" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "arată toate expresiile care se potrivesc cu metacaracterul" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "face ca --regex È™i --wildcard să se potrivească doar cu numele paginilor, nu " "È™i cu descrierile" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "găseÈ™te toate paginile de manual care se potrivesc" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "forÈ›ează o verificare a consistenÈ›ei memoriei tampon" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "nu probează subpaginile, de ex. „man foo bar†=> „man foo-barâ€" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Controlul formatului de afiÈ™are:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" -msgstr "PAGER" +msgstr "PAGINATOR" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" -msgstr "utilizează programul PAGER pentru a afiÈ™a ieÈ™irea" +msgstr "utilizează programul PAGINATOR pentru a afiÈ™a ieÈ™irea" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "ȘIR" @@ -503,20 +510,20 @@ msgstr "ȘIR" # Acest spaÈ›iu este utilizat pentru a # „echilibraâ€, a asigura alinierea textului # afiÈ™at la rularea comenzii: -# „»man« --help†-#: src/man.c:316 +# „«man --helpȠ+#: src/man.c:332 msgid "provide the `less' pager with a prompt" -msgstr " furnizează pager-ul „less†cu un prompter" +msgstr " furnizează paginatorul „less†cu un prompter" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "afiÈ™ează traducerea ASCII a anumitor caractere latin1" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "dezactivează despărÈ›irea în silabe" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "dezactivează alinierea textului la margini" @@ -527,8 +534,8 @@ msgstr "dezactivează alinierea textului la margini" # «man-db» - software # Acest spaÈ›iu este utilizat pentru a # „echilibraâ€, a asigura alinierea textului afiÈ™at la rularea comenzii: -# „»man« --help†-#: src/man.c:325 +# „«man --helpȠ+#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -538,34 +545,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "utilizează %s pentru a formata paginile" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "DISPOZITIV" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "utilizează %s cu dispozitivul selectat" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "NAVIGATOR" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "utilizează %s sau NAVIGATOR pentru a afiÈ™a ieÈ™irea HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "REZOLUÈšIE" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -573,88 +580,88 @@ msgstr "" "utilizează groff È™i afiÈ™ează prin gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "utilizează groff È™i îl forÈ›ează să producă ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Nu există intrare în manual pentru %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Alternativ, ce pagină de manual doriÈ›i de la secÈ›iunea %s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Ce pagină de manual doriÈ›i?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "De exemplu, încercaÈ›i „man manâ€.\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Nu există intrare de manual pentru %s în secÈ›iunea %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "" "ConsultaÈ›i „%s†pentru ajutor în caz că paginile de manual nu sunt " "disponibile.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "se ignoră preprocesorul necunoscut „%câ€" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "nu se poate redenumi %s în %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "nu se poate stabili ora pe %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "nu se poate desface legătura(unlink) %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "nu se poate crea un cat temporar pentru %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "nu se poate crea directorul temporar" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "nu se poate deschide fiÈ™ierul temporar %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "nu se poate È™terge directorul %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- următor: %s [ vizualizare (return) | omitere (Ctrl-D) | ieÅŸire (Ctrl-" "C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -663,27 +670,27 @@ msgstr "" "\n" "nu se poate scrie în %s în modul catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Nu se poate converti %s în nume cat" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: încrederea în referinÈ›ele whatis este învechită\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "comanda «mandb» a eÈ™uat cu starea de ieÈ™ire %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "eroare internă: tipul de candidat %d în afara intervalului" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Pagină de manual " @@ -699,7 +706,7 @@ msgstr "COD" msgid "encoding for output" msgstr "codificarea pentru ieÈ™ire" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "SUFIX" @@ -730,7 +737,7 @@ msgstr "trebuie să utilizaÈ›i ori --suffix ori --in-place" msgid "--suffix and --in-place are mutually exclusive" msgstr "--suffix È™i --in-place se exclud reciproc" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "nu se poate È™terge %s" @@ -756,70 +763,70 @@ msgstr "COD[:...]" msgid "possible encodings of original text" msgstr "codificări posibile ale textului original" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[CALEMAN]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "lucrează silenÈ›ios, cu excepÈ›ia avertismentului „falsâ€(bogus)" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "nu căutaÈ›i sau adăugaÈ›i cat-uri rătăcite la bazele de date" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "nu înlăturaÈ›i intrările învechite de la bazele de date" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "produce baze de date numai pentru utilizator" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "creează baze de date de la zero, mai degrabă decât să actualizeze" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "verifică paginile manualului pentru corectitudine" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "NUMEFIȘIER" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "actualizează doar intrarea pentru acest nume de fiÈ™ier" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "nu se poate scrie în %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "nu se poate citi din %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Se procesează paginile de manual sub %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Se elimină directorul cat învechit %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "avertisment: nu există directive MANDB_MAP în %s, se utilizează calea " "voastră de man" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" @@ -827,7 +834,7 @@ msgstr[0] "un subdirector man conÈ›inea pagini de manual mai noi.\n" msgstr[1] "%d subdirectoare man conÈ›ineau pagini de manual mai noi.\n" msgstr[2] "%d de subdirectoare man conÈ›ineau pagini de manual mai noi.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" @@ -835,7 +842,7 @@ msgstr[0] "o pagină de manual a fost adăugată.\n" msgstr[1] "%d pagini de manual au fost adăugate.\n" msgstr[2] "%d de pagini de manual au fost adăugate.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" @@ -843,7 +850,7 @@ msgstr[0] "un cat rătăcit a fost adăugat.\n" msgstr[1] "%d cat-uri rătăcite au fost adăugate.\n" msgstr[2] "%d de cat-uri rătăcite au fost adăugate.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" @@ -851,73 +858,73 @@ msgstr[0] "o intrare de bază de date veche a fost înlăturată.\n" msgstr[1] "%d intrări de bază de date vechi au fost înlăturate.\n" msgstr[2] "%d de intrări de bază de date vechi au fost curățate.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Nu s-au creat baze de date." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "" "nu se poate înÈ›elege fiÈ™ierul de configuraÈ›ie pentru calea de manual %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "avertisment: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "avertisment: %s nu este un director" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "avertisment: variabila $PATH nu este stabilită" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "avertisment: variabila $PATH este goală" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "avertisment: variabila $MANPATH a fost stabilită, înainte de %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "avertisment: variabila $MANPATH a fost stabilită, se adaugă %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "avertisment: variabila $MANPATH a fost stabilită, se inserează %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "avertisment: variabila $MANPATH a fost stabilită, se ignoră %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "nu se poate analiza lista de directoare „%sâ€" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "nu se poate deschide fiÈ™ierul de configurare al căii de manual %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "avertisment: directorul necesar %s nu există" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "avertisment: %s nu începe cu %s" @@ -930,113 +937,113 @@ msgstr "afiÈ™ează căile cat relative" msgid "show the entire global manpath" msgstr "afiÈ™ează calea globală completă către manual" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "avertisment: nu există căi de manual globale stabilite în fiÈ™ierul de " "configurare %s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Se verifică cat-urile rătăcite sub %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "avertisment: %s este o legătură simbolică ruptă(dangling)" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "nu se poate rezolva %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Se verifică cat-urile rătăcite sub %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s este auto-referinţă(self-referencing)" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "CUVÂNTCHEIE..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "OpÈ›iunea --regex este activată implicit." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "imprimă mesaje de avertisment detaliate" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "interpretează fiecare cuvânt cheie ca o expresie regulată" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "caută fiecare cuvânt cheie pentru potrivirea exactă" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "cuvântul(ele) cheie conÈ›ine metacaractere" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "solicită ca toate cuvintele cheie să se potrivească" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "nu potriveÈ™te afiÈ™area textului la lățimea terminalului" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "caută numai aceste secÈ›iuni (separate prin două puncte)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "defineÈ™te localizarea pentru această căutare" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s ce?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "avertisment: %s conÈ›ine o referință circulară" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(subiect necunoscut)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: nimic potrivit.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: cererile .so sunt la niveluri prea profunde sau sunt recursive" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: avertisment: a eÈ™uat cererea .so" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: avertisment: linie nouă în cererea .so, se ignoră" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: avertisment: linie nouă în cererea .lf, se ignoră" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: citat neterminat în cererea «roff»" @@ -1045,6 +1052,5 @@ msgstr "%s:%d: citat neterminat în cererea «roff»" msgid "compatibility switch (ignored)" msgstr "comutator de compatibilitate (ignorat)" -#, c-format #~ msgid "warning: can't update index cache %s" #~ msgstr "avertisment: nu se poate actualiza memoria tampon a indexului %s" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.9.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2019-10-01 18:48+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <gnu@d07.ru>\n" @@ -20,7 +20,12 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "предупреждение: %s: игнорируетÑÑ Ñ„Ð°Ð»ÑŒÑˆÐ¸Ð²Ð¾Ðµ Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "не удалоÑÑŒ определить текущий каталог" @@ -40,27 +45,27 @@ msgstr "setuid man пользователь \"%s\" не ÑущеÑтвует" msgid "fatal: regex `%s': %s" msgstr "неуÑÑ‚Ñ€Ð°Ð½Ð¸Ð¼Ð°Ñ Ð¾ÑˆÐ¸Ð±ÐºÐ°: regex `%s': %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "многомерный ключ %s не ÑущеÑтвует" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "не удалоÑÑŒ заблокировать индекÑный кÑш %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "индекÑный кÑш %s повреждён" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "не удалоÑÑŒ заменить ключ %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" @@ -68,12 +73,12 @@ msgstr[0] "в Ñодержимом только %d поле" msgstr[1] "в Ñодержимом только %d полÑ" msgstr[2] "в Ñодержимом только %d полей" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ Ð²Ñ‹Ð±Ð¾Ñ€ÐºÐ° по многомерному ключу %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "База данных %s повреждена; переÑборка командой mandb --create" @@ -102,9 +107,9 @@ msgstr "[БÐЗРДÐÐÐЫХ MAN]" msgid "The man database defaults to %s%s." msgstr "По умолчанию база данных man раÑположена в %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "показывать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸" @@ -114,39 +119,39 @@ msgstr "показывать ÑÐ¾Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¾Ñ‚Ð»Ð°Ð´ÐºÐ¸" msgid "can't open %s for reading" msgstr "не удалоÑÑŒ открыть %s на чтение" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[СЕКЦИЯ...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "ПУТЬ" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "уÑтановить путь поиÑка Ñправочных Ñтраниц в значение ПУТЬ" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "ФÐЙЛ" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "иÑпользовать указанный пользовательÑких файл наÑтроек" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "команда man завершилаÑÑŒ неудачно (код выхода %d)" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "Ñодержимое ключа равно NULL: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -155,131 +160,126 @@ msgstr "" "\n" "Обновление cat файлов в разделе %s man иерархии %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "не удалоÑÑŒ запиÑать в %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "не удалоÑÑŒ прочитать базу данных %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "не удалоÑÑŒ обновить %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "предупреждение: %s/man%s/%s.%s*: конкурирующие раÑширениÑ" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "не удалоÑÑŒ обновить индекÑный кÑш %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "" "предупреждение: %s: Ð½ÐµÐ²ÐµÑ€Ð½Ð°Ñ ÑимволичеÑÐºÐ°Ñ ÑÑылка или Ð·Ð°Ð¿Ñ€Ð¾Ñ ROFF `.so'" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "предупреждение: %s: игнорируетÑÑ Ð¿ÑƒÑтой файл" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "предупреждение: %s: whatis анализ %s(%s) не удалÑÑ" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "не удалоÑÑŒ найти каталог %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "не удалоÑÑŒ выполнить функцию chown %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "предупреждение: не удалоÑÑŒ Ñоздать cat каталог %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "не удалоÑÑŒ выполнить функцию chmod %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "не удалоÑÑŒ Ñменить каталог на %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "не удалоÑÑŒ Ñоздать индекÑный кÑш %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Обновление индекÑного кÑша Ð´Ð»Ñ Ð¿ÑƒÑ‚Ð¸ `%s/%s'. Ждите..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "завершено.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Удаление Ñтарых запиÑей базы данных в %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "предупреждение: не удалоÑÑŒ Ñохранить запиÑÑŒ Ð´Ð»Ñ %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "предупреждение: %s: игнорируетÑÑ Ñ„Ð°Ð»ÑŒÑˆÐ¸Ð²Ð¾Ðµ Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»Ð°" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "ПУТЬ СЕКЦИЯ ИМЯ" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "Ð ÐСШИРЕÐИЕ" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "иÑкать только Ñ Ð·Ð°Ð´Ð°Ð½Ð½Ñ‹Ð¼ Ð ÐСШИРЕÐИЕМ" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "не учитывать региÑÑ‚Ñ€ при поиÑке (по умолчанию)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "учитывать региÑÑ‚Ñ€ при поиÑке" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "Ñчитать Ð¸Ð¼Ñ Ñтраницы регулÑрным выражением" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "Ð¸Ð¼Ñ Ñтраницы Ñодержит групповые Ñимволы" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." @@ -290,9 +290,9 @@ msgstr[1] "" msgstr[2] "" "предупреждение: результат whatis Ð´Ð»Ñ %s превыÑил %d байт, обрезаетÑÑ." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "не удалоÑÑŒ открыть %s" @@ -317,19 +317,19 @@ msgstr "анализировать как cat-Ñтраницу" msgid "show whatis information" msgstr "показать информацию whatis" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "показать Ñерию предположений фильтров предварительной обработки" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "КОДИРОВКÐ" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "иÑпользовать выбранную кодировку выходных данных" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: неÑовмеÑтимые параметры" @@ -339,7 +339,7 @@ msgstr "%s: неÑовмеÑтимые параметры" msgid "command exited with status %d: %s" msgstr "команда завершилаÑÑŒ Ñ ÐºÐ¾Ð´Ð¾Ð¼ %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[СЕКЦИЯ] СТРÐÐИЦÐ..." @@ -351,132 +351,132 @@ msgstr "ÑброÑить вÑе параметры в Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾ ум msgid "WARNINGS" msgstr "ПРЕДУПРЕЖДЕÐИЯ" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "включить Ð¿Ñ€ÐµÐ´ÑƒÐ¿Ñ€ÐµÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¾Ñ‚ groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "ОÑновные режимы работы:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "Ñквивалентно whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "Ñквивалентно apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "иÑкать текÑÑ‚ по вÑем Ñправочным Ñтраницам" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "показывать физичеÑкое раÑположение man Ñтраницы" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "показывать физичеÑкое раÑположение cat файла(ов)" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "воÑпринимать аргумент(Ñ‹) СТРÐÐИЦРкак Ð¸Ð¼Ñ Ñ„Ð°Ð¹Ð»(ов)" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "иÑпользуетÑÑ catman Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÑ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑƒÑтаревших cat Ñтраниц" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "вывеÑти иÑходную Ñтраницу в КОДИРОВКЕ" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "ПоиÑк Ñправочных Ñтраниц:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "ЛОКÐЛЬ" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "задать локаль Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "СИСТЕМÐ" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "иÑпользовать Ñправочные Ñтраницы от других ÑиÑтем" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "СПИСОК" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "иÑпользовать ÑпиÑок Ñекций, указанных через двоеточие" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "показать вÑе Ñтраницы, удовлетворÑющие регулÑрному выражению" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "показать вÑе Ñтраницы, удовлетворÑющие групповым Ñимволам" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "иÑкать Ñовпадение --regex и --wildcard только в именах Ñтраниц, без опиÑаний" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "поиÑк вÑех подходÑщих Ñправочных Ñтраниц" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "выполнить проверку целоÑтноÑти кÑша" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "не затрагивать подÑтраницы, например, 'man foo bar' => 'man foo-bar'" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Управление форматированием вывода:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "ПЕЙДЖЕР" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "иÑпользовать программу ÐŸÐ•Ð™Ð”Ð–Ð•Ð Ð´Ð»Ñ Ð²Ñ‹Ð²Ð¾Ð´Ð° на Ñкран" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "СТРОКÐ" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "иÑпользовать пейджер `less' Ñ Ð¿Ð¾Ð´Ñказкой" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "показать транÑлÑцию ASCII определённых Ñимволов latin1" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "выключить Ð¿ÐµÑ€ÐµÐ½Ð¾Ñ Ñлов" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "выключить выравнивание" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -486,34 +486,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "иÑпользовать %s Ð´Ð»Ñ Ñ„Ð¾Ñ€Ð¼Ð°Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ñтраниц" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "УСТРОЙСТВО" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "иÑпользовать %s на выбранном уÑтройÑтве" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "БРÐУЗЕР" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "иÑпользовать %s или БРÐÐ£Ð—Ð•Ð Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "Ð ÐЗРЕШЕÐИЕ" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -521,85 +521,85 @@ msgstr "" "иÑпользовать groff и показывать Ñ Ð¿Ð¾Ð¼Ð¾Ñ‰ÑŒÑŽ gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "иÑпользовать groff и заÑтавить его генерировать ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Ðет Ñправочной Ñтраницы Ð´Ð»Ñ %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Или же, ÐºÐ°ÐºÐ°Ñ Ð¸Ð¼ÐµÐ½Ð½Ð¾ из Ñправочных Ñтраниц раздела %s вам нужна?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "ÐšÐ°ÐºÐ°Ñ ÑÐ¿Ñ€Ð°Ð²Ð¾Ñ‡Ð½Ð°Ñ Ñтраница вам нужна?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "Ðапример, попробуйте ввеÑти «man man».\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Ðет Ñправочной Ñтраницы Ð´Ð»Ñ %s в разделе %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Смотрите «%s» в Ñправке, еÑли недоÑтупны Ñправочные Ñтраницы.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "игнорирование неизвеÑтного препроцеÑÑора «%c»" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "не удалоÑÑŒ переименовать %s в %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "не удалоÑÑŒ уÑтановить Ð²Ñ€ÐµÐ¼Ñ Ð´Ð¾Ñтупа Ð´Ð»Ñ %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "не удалоÑÑŒ выполнить функцию unlink %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "не удалоÑÑŒ Ñоздать временный cat файл %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "не удалоÑÑŒ Ñоздать временный каталог" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "не удалоÑÑŒ открыть временный файл %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "не удалоÑÑŒ удалить каталог %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- Ñлед: %s [ проÑм (ввод) | пропуÑк (Ctrl-D) | выход (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -608,27 +608,27 @@ msgstr "" "\n" "не удалоÑÑŒ запиÑать в %s в режиме catman" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Ðе удалоÑÑŒ преобразовать %s в cat имÑ" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: полагатьÑÑ Ð½Ð° ÑÑылки whatis наÑтоÑтельно не рекомендуетÑÑ\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "команда mandb завершилаÑÑŒ неудачно (код выхода %d)" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "внутреннÑÑ Ð¾ÑˆÐ¸Ð±ÐºÐ°: тип кандидата %d вне диапазона" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Ð¡Ð¿Ñ€Ð°Ð²Ð¾Ñ‡Ð½Ð°Ñ Ñтраница " @@ -644,7 +644,7 @@ msgstr "КОДИРОВКÐ" msgid "encoding for output" msgstr "кодировка вывода" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "СУФФИКС" @@ -675,7 +675,7 @@ msgstr "должен быть указан --suffix или --in-place" msgid "--suffix and --in-place are mutually exclusive" msgstr "--suffix и --in-place ÑвлÑÑŽÑ‚ÑÑ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð¸Ñключающими" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "не удалоÑÑŒ удалить %s" @@ -701,68 +701,68 @@ msgstr "КОДИРОВКÐ[:...]" msgid "possible encodings of original text" msgstr "возможные кодировки иÑходного текÑта" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[MANPATH]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "не выводить ÑообщениÑ, за иÑключением 'фиктивных' предупреждений" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "не иÑкать или добавлÑÑ‚ÑŒ побочные cat в dbs" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "не вычищать уÑтаревшие запиÑи из dbs" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "Ñоздать только пользовательÑкие базы данных" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "Ñоздать dbs Ñ Ð½ÑƒÐ»Ñ, а не обновлÑÑ‚ÑŒ" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "проверить Ñправочные Ñтраницы на правильноÑÑ‚ÑŒ" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "ИМЯ-ФÐЙЛÐ" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "обновить запиÑÑŒ только Ð´Ð»Ñ Ñтого файла" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "не удалоÑÑŒ запиÑать в %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "не удалоÑÑŒ прочитать из %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Обработка Ñправочных Ñтраниц в %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "УдалÑетÑÑ ÑƒÑтаревший каталог cat %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "предупреждение: нет директивы MANDB_MAP в %s, иÑпользуетÑÑ Ð²Ð°Ñˆ manpath" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" @@ -770,7 +770,7 @@ msgstr[0] "Ð’ %d man-подкаталоге ÑодержатÑÑ Ð±Ð¾Ð»ÐµÐµ но msgstr[1] "Ð’ %d man-подкаталогах ÑодержатÑÑ Ð±Ð¾Ð»ÐµÐµ новые Ñправочные Ñтраницы.\n" msgstr[2] "Ð’ %d man-подкаталогах ÑодержатÑÑ Ð±Ð¾Ð»ÐµÐµ новые Ñправочные Ñтраницы.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" @@ -778,7 +778,7 @@ msgstr[0] "Добавлена %d ÑÐ¿Ñ€Ð°Ð²Ð¾Ñ‡Ð½Ð°Ñ Ñтраница.\n" msgstr[1] "Добавлено %d Ñправочные Ñтраницы.\n" msgstr[2] "Добавлено %d Ñправочных Ñтраниц.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" @@ -786,7 +786,7 @@ msgstr[0] "Добавлена %d Ð¿Ð¾Ð±Ð¾Ñ‡Ð½Ð°Ñ cat-Ñтраница.\n" msgstr[1] "Добавлено %d побочные cat-Ñтраницы.\n" msgstr[2] "Добавлено %d побочных cat-Ñтраниц.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" @@ -794,74 +794,74 @@ msgstr[0] "Вычищена %d ÑÑ‚Ð°Ñ€Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ базы данных.\ msgstr[1] "Вычищено %d Ñтарые запиÑи базы данных.\n" msgstr[2] "Вычищено %d Ñтарых запиÑей базы данных.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Базы данных не Ñозданы." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "нет правильного manpath файла наÑтроек %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "предупреждение: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "предупреждение: %s не ÑвлÑетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð¼" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "предупреждение: Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ñреды $PATH не уÑтановлена" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "предупреждение: Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ñреды $PATH пуÑта" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "" "предупреждение: найдена Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ñреды $MANPATH, добавлÑетÑÑ Ðº началу %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "" "предупреждение: найдена Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ñреды $MANPATH, добавлÑетÑÑ Ð² конец %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "предупреждение: найдена Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ñреды $MANPATH, вÑтавлÑетÑÑ Ð² %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "предупреждение: найдена Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ð°Ñ Ñреды $MANPATH, игнорируетÑÑ %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "не удалоÑÑŒ разобрать ÑпиÑок каталогов `%s'" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "не удалоÑÑŒ открыть manpath файл наÑтроек %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "предупреждение: обÑзательный каталог %s не ÑущеÑтвует" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "предупреждение: %s не начинаетÑÑ Ñ %s" @@ -874,111 +874,111 @@ msgstr "показать отноÑительные catpath" msgid "show the entire global manpath" msgstr "показать веÑÑŒ глобальный manpath" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "предупреждение: не уÑтановлены глобальные manpath в файле наÑтроек %s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Проверка побочных cat в %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "предупреждение: %s ÑÑылаетÑÑ Ð½Ð° неÑущеÑтвующий объект" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "не удалоÑÑŒ определить %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Проверка побочных cat в %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s ÑÑылаетÑÑ Ð½Ð° ÑебÑ" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "КЛЮЧ..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "Параметр --regex включён по умолчанию." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "выводить подробные предупреждающие ÑообщениÑ" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "Ñчитать каждый ключ регулÑрным выражением" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "иÑкать точное ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ ключа" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "ключ(и) Ñодержит групповые Ñимволы" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "требуетÑÑ Ñовпадение вÑех ключей" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "не обрезать вывод по ширине терминала" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "иÑкать только в Ñтих ÑекциÑÑ… (разделÑÑŽÑ‚ÑÑ Ð´Ð²Ð¾ÐµÑ‚Ð¾Ñ‡Ð¸Ñми)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "задать локаль Ð´Ð»Ñ Ñтого поиÑка" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s что?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "warning: %s Ñодержит цикличеÑкий указатель" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(неизвеÑтный объект)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: ничего подходÑщего не найдено.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: .so запрашивает Ñлишком глубокую вложенноÑÑ‚ÑŒ или Ñто рекурÑиÑ" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: предупреждение: .so Ð·Ð°Ð¿Ñ€Ð¾Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»ÑÑ Ð½ÐµÑƒÐ´Ð°Ñ‡Ð½Ð¾" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: предупреждение: Ð½Ð¾Ð²Ð°Ñ Ñтрока в .so запроÑе, игнорируетÑÑ" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: предупреждение: Ð½Ð¾Ð²Ð°Ñ Ñтрока в .lf запроÑе, игнорируетÑÑ" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: Ð½ÐµÐ·Ð°ÐºÑ€Ñ‹Ñ‚Ð°Ñ ÐºÐ°Ð²Ñ‹Ñ‡ÐºÐ° в roff запроÑе" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db-2.9.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2020-04-02 15:51+0200\n" "Last-Translator: МироÑлав Ðиколић <miroslavnikolic@rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" @@ -19,7 +19,12 @@ msgstr "" "X-Generator: Virtaal 0.7.1\n" "X-Bugs: Report translation errors to the Language-Team address.\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "упозорење: %s: занемарујем нетачан назив датотеке" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "не могу да одредим текући директоријум" @@ -39,27 +44,27 @@ msgstr "подеÑииб ман кориÑник „%s“ не поÑтоји" msgid "fatal: regex `%s': %s" msgstr "кобно: регизр „%s“: %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "вишеÑтруки кључ %s не поÑтоји" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "не могу да закључам оÑтаву индекÑа „%s“" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "оÑтава индекÑа „%s“ је оштећена" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "не могу да заменим кључ „%s“" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" @@ -67,12 +72,12 @@ msgstr[0] "Ñамо %d поље у Ñадржају" msgstr[1] "Ñамо %d поља у Ñадржају" msgstr[2] "Ñамо %d поља у Ñадржају" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "лоша набавка на вишеÑтруком кључу „%s“" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "База података „%s“ је оштећена; изградите поново Ñа „mandb --create“" @@ -101,9 +106,9 @@ msgstr "[БÐЗРПОДÐТÐКРМÐÐ-а]" msgid "The man database defaults to %s%s." msgstr "База података мана Ñе пребацује на %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "иÑпиÑује поруке за иÑправљање грешака" @@ -113,39 +118,39 @@ msgstr "иÑпиÑује поруке за иÑправљање грешака" msgid "can't open %s for reading" msgstr "не могу да отворим „%s“ за читање" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[ОДЕЉÐК...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "ПУТÐЊÐ" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "поÑтавља путању претраге за Ñтранице упутÑтва на ПУТÐЊУ" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "ДÐТОТЕКÐ" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "кориÑти ову кориÑничку датотеку подешавања" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "наредба мана није уÑпела Ñа излазним Ñтањем „%d“" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "ÐИШТÐÐ’ÐÐ Ñадржај за кључ: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -154,130 +159,125 @@ msgstr "" "\n" "Ðжурирам кат датотеке за одељак %s манове хијерархије %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "не могу да пишем у „%s“" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "не могу да прочитам базу података „%s“" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "не могу да ажурирам „%s“" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "упозорење: %s/man%s/%s.%s*: конкурентна проширења" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "не могу да ажурирам оÑтаву индекÑа „%s“" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "упозорење: %s: лоша Ñимболичка веза или РОФФ „.so“ захтев" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "упозорење: %s: занемарујем празну датотеку" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "упозорење: %s: није уÑпела обрада шта-је за %s(%s)" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "не могу да претражим директоријум „%s“" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "не могу да променим влаÑника „%s“" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "упозорење: не могу да направим катдир „%s“" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "не могу да променим режим „%s“" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "не могу да пређем у директоријум „%s“" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "не могу да направим оÑтаву индекÑа „%s“" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Ðжурирам оÑтаву индекÑа за путању „%s/%s“. Сачекајте..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "готово.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Избацујем Ñтаре уноÑе базе података у „%s“...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "упозорење: ниÑам уÑпео да уÑкладиштим ÑƒÐ½Ð¾Ñ Ð·Ð° %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "упозорење: %s: занемарујем нетачан назив датотеке" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "ПУТÐЊРОДЕЉÐК ÐÐЗИВ" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "ПРОШИРЕЊЕ" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "ограничава претрагу на врÑту проширења ПРОШИРЕЊЕ" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "тражи Ñтранице без обзира на величину Ñлова (оÑновно)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "тражи Ñтранице Ñ Ð¾Ð±Ð·Ð¸Ñ€Ð¾Ð¼ на величину Ñлова" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "тумачи назив Ñтранице као регуларни израз" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "назив Ñтранице Ñадржи џокере" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." @@ -285,9 +285,9 @@ msgstr[0] "упозорење: шта-је за „%s“ премашује %d Ð msgstr[1] "упозорење: шта-је за „%s“ премашује %d бајта, Ñкраћујем." msgstr[2] "упозорење: шта-је за „%s“ премашује %d бајтова, Ñкраћујем." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "не могу да отворим „%s“" @@ -312,19 +312,19 @@ msgstr "обрађује као кат Ñтраницу" msgid "show whatis information" msgstr "приказује шта-је податке" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "приказује погођене Ñерије пропуÑника предобраде" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "КОДИРÐЊЕ" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "кориÑти изабрано кодирање излаза" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: неÑаглаÑне опције" @@ -334,7 +334,7 @@ msgstr "%s: неÑаглаÑне опције" msgid "command exited with status %d: %s" msgstr "наредба је изашла Ñа Ñтањем %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[ОДЕЉÐК] СТРÐÐИЦÐ..." @@ -346,132 +346,132 @@ msgstr "враћа Ñве опције на њихове оÑновне вред msgid "WARNINGS" msgstr "УПОЗОРЕЊÐ" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "укључује упозорења из гроф-а" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Главни режими рада:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "иÑто што и шта-је" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "иÑто што и „apropos“" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "тражи текÑÑ‚ на Ñвим Ñтраницама" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "иÑпиÑује физичко меÑто ман Ñтранице(а)" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "иÑпиÑује физичко меÑто кат датотеке(а)" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "тумачи аргумент(е) СТРÐÐИЦЕ као меÑни(е) назив(е) датотеке" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "кориÑти га катман да поново обликује заÑтареле кат Ñтранице" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "излазна Ñтраница извора је кодирана у КОДИРÐЊУ" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Проналажење Ñтраница упутÑтва:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "ЈЕЗИК" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "одређује језик за ову нарочиту претрагу мана" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "СИСТЕМ" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "кориÑти Ñтранице упутÑтва Ñа других ÑиÑтема" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "СПИСÐК" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "кориÑти двотачком раздвојени ÑпиÑак одељка" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "приказује Ñве Ñтранице које одговарају регуларном изразу" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "приказује Ñве Ñтранице које одговарају џокерима" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "„make --regex“ и „--wildcard“ поклапају Ñамо називе Ñтраница, а не опиÑе" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "проналази Ñве одговарајуће Ñтранице упутÑтва" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "приморава проверу доÑледноÑти оÑтаве" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "не покушава подÑтранице, нпр. „man foo bar“ => „man foo-bar“" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Управљање обликованим излазом:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "СТРÐÐИЧÐÐ " -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "кориÑти програм СТРÐÐИЧÐРза приказивање излаза" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "ÐИСКÐ" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "обезбеђује Ñтраничара „less“ Ñа упитом" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "приказује ÐСКРИ превод неких латин1 знакова" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "иÑкључује преламање" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "иÑкључује поравнавање" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -481,34 +481,34 @@ msgstr "" "e — [n]eqn, p — pic, t — tbl,\n" "g — grap, r — refer, v — vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "кориÑти „%s“ за обликовање Ñтраница" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "УРЕЂÐЈ" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "кориÑти „%s“ Ñа изабраним уређајем" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "ПРЕГЛЕДÐИК" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "кориÑти „%s“ или ПРЕГЛЕДÐИК за приказивање ХТМЛ излаза" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "РЕЗОЛУЦИЈÐ" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -516,86 +516,86 @@ msgstr "" "кориÑти грофа и приказује кроз гикÑдитпреглед (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "кориÑти гроф и приморава га да произведе дитроф" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Ðема уноÑа упутÑтва за „%s“\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Илити, коју Ñтраницу упутÑтва желите из одељка %s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Коју Ñтраницу упутÑтва желите?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "Ðа пример, пробајте „man man“.\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Ðема уноÑа упутÑтва за „%s“ у одељку %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Погледајте „%s“ за помоћ када Ñтранице упутÑтва ниÑу доÑтупне.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "занемарујем неознати препроцеÑор „%c“" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "не могу да преименујем „%s“ у „%s“" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "не могу да подеÑим времена на „%s“" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "не могу да развежем „%s“" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "не могу да направим привремени кат за „%s“" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "не могу да направим привремени директоријум" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "не могу да отворим привремену датотеку „%s“" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "не могу да уклоним директоријум „%s“" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Ман-- Ñледеће: %s [ преглед (повратница) | преÑкочи (Ктрл-Д) | изађи (Ктрл-" "Ц) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -604,27 +604,27 @@ msgstr "" "\n" "не могу да пишем у „%s“ у катман режиму" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Ðе могу да претворим „%s“ у кат назив" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: оÑлањање на упуте шта-је је заÑтарело\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "наредба мандб није уÑпела Ñа излазним Ñтањем „%d“" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "унутрашња грешка: врÑта кандидата „%d“ је ван опÑега" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Страница упутÑтва " @@ -640,7 +640,7 @@ msgstr "КОД" msgid "encoding for output" msgstr "кодирање за излаз" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "СУФИКС" @@ -671,7 +671,7 @@ msgstr "треба да кориÑтите „--suffix“ или „--in-place†msgid "--suffix and --in-place are mutually exclusive" msgstr "„--suffix“ и „--in-place“ Ñе узајамно иÑључују" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "не могу да уклоним „%s“" @@ -697,68 +697,68 @@ msgstr "КОД[:...]" msgid "possible encodings of original text" msgstr "могућа кодирања изворног текÑта" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[ÐœÐÐПУТÐЊÐ]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "ради тихо, оÑим за „bogus“ упозорење" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "не тражи или не додаје залутале катÑе у базе података" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "не избацује заÑтареле уноÑе из база података" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "производи Ñамо кориÑничке базе података" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "прави базе података од почетка, умеÑто да их оÑвежава" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "проверава Ñтранице упутÑтва за иÑправношћу" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "ДÐТОТЕКÐ" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "ажурира Ñамо ÑƒÐ½Ð¾Ñ Ð·Ð° ову датотеку" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "не могу да пишем у „%s“" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "не могу да читам из „%s“" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Обрађујем Ñтранице упутÑтва под „%s“...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Уклањам заÑтареле кат директоријуме „%s“...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "упозорење: нема ÐœÐÐБП_ÐœÐП Ñмерница у „%s“, кориÑтим вашу ман-путању" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" @@ -766,7 +766,7 @@ msgstr[0] "%d ман подиректоријум је Ñадржао новиј msgstr[1] "%d ман подиректоријума Ñу Ñадржала новије Ñтранице упутÑтва.\n" msgstr[2] "%d ман подиректоријума је Ñадржало новије Ñтранице упутÑтва.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" @@ -774,7 +774,7 @@ msgstr[0] "%d Ñтраница упутÑтва је додата.\n" msgstr[1] "%d Ñтранице упутÑтва Ñу додате.\n" msgstr[2] "%d Ñтраница упутÑтва је додато.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" @@ -782,7 +782,7 @@ msgstr[0] "%d залутали кат је додат.\n" msgstr[1] "%d залутала ката Ñу додата.\n" msgstr[2] "%d залуталих катова је додато.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" @@ -790,72 +790,72 @@ msgstr[0] "%d Ñтари ÑƒÐ½Ð¾Ñ Ð±Ð°Ð·Ðµ података је избачен. msgstr[1] "%d Ñтара уноÑа базе података Ñу избачена.\n" msgstr[2] "%d Ñтарих уноÑа базе података је избачено.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "ÐиÑу направљене базе података." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "не могу да направим ÑмиÑао датотеке подешавања манпутање „%s“" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "упозорење: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "упозорење: „%s“ није директоријум" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "упозорење: $ПУТÐЊРније подешено" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "упозорење: празно $ПУТÐЊÐ" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "упозорење: $ÐœÐÐПУТÐЊРје подешено, поÑтављам иÑпред „%s“" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "упозорење: $ÐœÐÐПУТÐЊРје подешено, поÑтављам иза „%s“" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "упозорење: $ÐœÐÐПУТÐЊРје подешено, умећем „%s“" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "упозорење: $ÐœÐÐПУТÐЊРје подешено, занемарујем „%s“" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "не могу да обрадим ÑпиÑак директоријума „%s“" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "не могу да отворим датотеку подешавања манпутање „%s“" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "упозорење: обавезан директоријум „%s“ не поÑтоји" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "упозорење: „%s“ не почиње Ñа „%s“" @@ -868,111 +868,111 @@ msgstr "показује одноÑне катпутање" msgid "show the entire global manpath" msgstr "показује читаву општу манпутању" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "упозорење: ниÑу подешене опште манпутање у датотеци подешавања „%s“" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Тражим залутале катÑе под „%s“...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "упозорење: „%s“ је апÑолутна Ñимболичка веза" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "не могу да решим „%s“" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Тражим залутале катÑе под „%s“...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "„%s“ је Ñамо упутна" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "КЉУЧÐРРЕЧ..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "Опција „--regex“ је унапред изабрана." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "иÑпиÑује опширне поруке упозорења" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "тумачи Ñваку кључну реч као регуларни израз" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "тражи Ñваку кључну реч за тачним поклапањем" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "кључна реч Ñадржи џокера" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "захтева Ñве кључне речи за подударање" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "не крати излаз на ширину терминала" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "претаржује Ñамо ове одељке (раздвојене двотачком)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "одређује језик за ову претрагу" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s шта?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "упозорење: „%s“ Ñадржи петљу показивача" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(непознат Ñубјекат)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: ништа одговарајуће.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: „.so“ захтеви Ñу угнежђени превише дубоко или Ñу дубинÑки" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: упозорење: није уÑпео „.so“ захтев" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: упозорење: нови ред у „.so“ захтеву, занемарујем" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: упозорење: нови ред у „.lf“ захтеву, занемарујем" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: неокончани цитат у роф захтеву" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.9.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2019-12-25 13:50+0800\n" "Last-Translator: Sebastian Rasmussen <sebras@gmail.com>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" @@ -21,7 +21,12 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 2.2.4\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "varning: %s: ignorerar felaktigt filnamn" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "kan inte avgöra aktuell katalog" @@ -41,39 +46,39 @@ msgstr "en manualanvändare \"%s\" som är setuid finns inte" msgid "fatal: regex `%s': %s" msgstr "ödesdigert: reguljärt uttryck \"%s\": %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "multinyckeln %s finns inte" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "kan inte lÃ¥sa indexcachen %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "indexcachen %s är trasig" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "kan inte ersätta nyckeln %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "endast %d fält i innehÃ¥ll" msgstr[1] "endast %d fält i innehÃ¥ll" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "felaktig hämtning pÃ¥ multinyckel %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "Databasen %s är skadad; bygg om med mandb --create" @@ -103,9 +108,9 @@ msgstr "[MANUALDATABAS]" msgid "The man database defaults to %s%s." msgstr "Manualdatabasen är som standard %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "avge felsökningsmeddelanden" @@ -115,39 +120,39 @@ msgstr "avge felsökningsmeddelanden" msgid "can't open %s for reading" msgstr "kan inte öppna %s för läsning" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[AVSNITT…]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "SÖKVÄG" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "ställ in sökväg för manualsidor till SÖKVÄG" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "FIL" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "använd denna användarkonfigurationsfil" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "manualkommandot misslyckades med slutstatus %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "NULL-innehÃ¥ll för nyckel: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -156,139 +161,134 @@ msgstr "" "\n" "Uppdaterar cat-filer för avsnitt %s i man-hierarkin %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "kan inte skriva inom %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "kan inte läsa databasen %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "kan inte uppdatera %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "varning: %s/man%s/%s.%s*: filändelser i konflikt" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "kan inte uppdatera indexcachen %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "varning: %s: felaktig symbolisk länk eller ROFF \".so\"-begäran" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "varning: %s: ignorerar tom fil" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "varning: %s: whatis-tolkning för %s(%s) misslyckades" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "kan inte söka i katalogen %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "kan inte byta ägare pÃ¥ %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "varning: kan inte skapa cat-katalog %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "kan inte ändra rättigheter pÃ¥ %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "kan inte byta till katalogen %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "kan inte skapa indexcachen %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "Uppdaterar indexcache för sökvägen \"%s/%s\". Vänta..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "klar.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Tömmer gamla databasposter i %s...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "varning: misslyckades med att lagra post för %s(%s)" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "varning: %s: ignorerar felaktigt filnamn" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "SÖKVÄG AVSNITT NAMN" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "ÄNDELSE" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "begränsa sökning till ändelsetyp ÄNDELSE" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "leta efter sidor skiftlägesoberoende (standard)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "leta efter sidor skiftlägesberoende" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "tolka sidnamn som ett reguljärt uttryck" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "sidnamnet innehÃ¥ller jokertecken" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "varning: whatis för %s överskrider %d byte, förkortar." msgstr[1] "varning: whatis för %s överskrider %d byte, förkortar." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "kan inte öppna %s" @@ -313,19 +313,19 @@ msgstr "tolka som cat-sida" msgid "show whatis information" msgstr "visa whatis-information" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "visa gissade serier av preprocessorfilter" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "KODNING" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "använd vald utmatningskodning" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: inkompatibla flaggor" @@ -335,7 +335,7 @@ msgstr "%s: inkompatibla flaggor" msgid "command exited with status %d: %s" msgstr "kommandot avslutade med status %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[AVSNITT] SIDA…" @@ -347,132 +347,132 @@ msgstr "Ã¥terställ alla flaggor till deras standardvärden" msgid "WARNINGS" msgstr "VARNINGAR" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "aktivera varningar frÃ¥n groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Huvudlägen för drift:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "ekvivalent med whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "ekvivalent med apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "sök efter text i alla sidor" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "skriv ut manualsidors fysiska platser" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "skriv ut fysiska platser för cat-filer" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "tolka SIDA-argument som lokala filnamn" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "används av catman för att omformatera för gamla cat-sidor" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "mata ut källsida kodad i KODNING" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Hittar manualsidor:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "LOKAL" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "definiera lokalen för denna specifika manualsökning" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SYSTEM" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "använd manualsidor frÃ¥n andra system" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LISTA" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "använd kolonseparerad avsnittslista" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "visa alla sidor som matchar reguljärt uttryck" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "visa alla sidor som matchar jokertecken" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "fÃ¥ --regex och --wildcard att matcha endast sidnamn, inte beskrivningar" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "hitta alla matchande manualsidor" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "tvinga fram en konsistenskontroll av cachen" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "prova inte med undersidor, t.ex. â€man foo bar†=> â€man foo-barâ€" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Kontrollerar formaterad utmatning:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "SIDVISARE" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "använd programmet SIDVISARE för att visa utmatning" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "STRÄNG" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "tillhandahÃ¥ll â€lessâ€-sidvisaren med en prompt" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "visa ASCII-översättningen av vissa latin1-tecken" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "stäng av avstavning" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "stäng av justering" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -482,34 +482,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "använd %s för att formatera sidor" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "ENHET" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "använd %s med vald enhet" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "WEBBLÄSARE" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "använd %s eller WEBBLÄSARE för att visa HTML-utmatning" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "UPPLÖSNING" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -517,87 +517,87 @@ msgstr "" "använd groff och visa via gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "använd groff och tvinga det att skapa ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Ingen manualpost för %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Alternativt, vilken manualsida vill du ha frÃ¥n avsnittet %s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Vilken manualsida vill du ha?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "Prova till exempel â€man manâ€.\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Ingen manualpost för %s i avsnittet %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Se \"%s\" för hjälp när manualsidor inte är tillgängliga.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "ignorerar okänd preprocessor \"%c\"" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "kan inte byta namn pÃ¥ %s till %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "kan inte ställa in tider pÃ¥ %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "kan inte avlänka %s" # cat är vad? catalogue? kommandot "cat"? -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "kan inte skapa temporär cat för %s" # cat är vad? catalogue? kommandot "cat"? -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "kan inte skapa temporärkatalog" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "kan inte öppna temporärfil %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "kan inte ta bort katalogen %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "" "--Man-- nästa: %s [ visa (retur) | hoppa över (Ctrl-D) | avsluta (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -606,27 +606,27 @@ msgstr "" "\n" "kan inte skriva till %s i catman-läge" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Kan inte konvertera %s till cat-namn" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: förlitande pÃ¥ whatis-referenser är förÃ¥ldrat\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb-kommandot misslyckades med slutstatus %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "internt fel: kandidattypen %d utanför intervallet" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Manualsida " @@ -642,7 +642,7 @@ msgstr "KOD" msgid "encoding for output" msgstr "kodning för utmatning" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "SUFFIX" @@ -673,7 +673,7 @@ msgstr "mÃ¥ste använda antingen --suffix eller --in-place" msgid "--suffix and --in-place are mutually exclusive" msgstr "--suffix och --in-place är ömsesidigt uteslutande" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "kan inte ta bort %s" @@ -699,161 +699,161 @@ msgstr "KOD[:…]" msgid "possible encodings of original text" msgstr "möjliga kodningar av originaltext" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[MANUALSÖKVÄG]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "arbeta tyst, förutom vid felaktig varning" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "leta inte efter eller lägg till lösa cat-sidor i databasen" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "rensa inte bort förÃ¥ldrade poster frÃ¥n databasen" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "producera endast användardatabaser" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "skapa databaser frÃ¥n grunden, istället för att uppdatera dem" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "kontrollera att manualsidor är korrekta" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "FILNAMN" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "uppdatera bara posten för detta filnamn" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "kan inte skriva till %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "kan inte läsa frÃ¥n %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Bearbetar manualsidor under %s...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Tar bort förÃ¥ldrad cat-katalog %s…\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "varning: inga MANDB_MAP-direktiv i %s, använder din manualsökväg" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "%d manualunderkatalog innehöll nyare manualsidor.\n" msgstr[1] "%d manualunderkataloger innehöll nyare manualsidor.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "%d manualsida lades till.\n" msgstr[1] "%d manualsidor lades till.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "%d lös cat-sida lades till.\n" msgstr[1] "%d lösa cat-sidor lades till.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d gammal databaspost rensades.\n" msgstr[1] "%d gamla databasposter rensades.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "Inga databaser skapade." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "kan inte förstÃ¥ mig pÃ¥ konfigurationsfilen för manualsökväg %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "varning: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "varning: %s är inte en katalog" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "varning: $PATH är inte satt" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "varning: tom $PATH" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "varning: $MANPATH är satt, lägger till %s före" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "varning: $MANPATH är satt, lägger till %s efter" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "varning: $MANPATH är satt, infogar %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "varning: $MANPATH är satt, ignorerar %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "kan inte tolka kataloglista \"%s\"" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "kan inte öppna konfigurationsfilen för manualsökväg %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "varning: obligatoriska katalogen %s finns inte" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "varning: %s börjar inte med %s" @@ -866,111 +866,111 @@ msgstr "visa relativa cat-sökvägar" msgid "show the entire global manpath" msgstr "visa hela den globala manualsökvägen" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "varning: inga globala manualsökvägar angivna i konfigurationsfilen %s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Undersöker lösa cat-sidor under %s...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "varning: %s är en lös symbolisk länk" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "kan inte slÃ¥ upp %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Undersöker lösa cat-sidor under %s...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s refererar till sig själv" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "NYCKELORD…" -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "--regex-flaggan är aktiverad som standard." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "skriv ut utförliga varningsmeddelanden" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "tolka varje nyckelord som ett reguljärt uttryck" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "sök efter exakt matchning för varje nyckelord" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "nyckelord(en) innehÃ¥ller jokertecken" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "kräv att alla nyckelord matchar" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "justera inte utmatning till terminalbredd" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "sök endast i dessa avsnitt (kolonseparerade)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "definiera lokalen för denna sökning" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s vad?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "varning: %s innehÃ¥ller en pekarslinga" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(okänt ämne)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: ingenting lämpligt.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: .so-begäran nästlade för djupt eller är rekursiva" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: varning: misslyckades med .so-begäran" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: varning: nyrad i .so-begäran, ignorerar" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: varning: nyrad i .lf-begäran, ignorerar" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: oavslutat citat i roff-begäran" Binary files differ@@ -3,14 +3,16 @@ # This file is distributed under the same license as the man-db package. # # Volkan Gezer <volkangezer@gmail.com>, 2017. +# Emir SARI <emir_sari@icloud.com>, 2022. +# msgid "" msgstr "" -"Project-Id-Version: man-db 2.7.6.1\n" +"Project-Id-Version: man-db-2.11.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" -"PO-Revision-Date: 2017-04-05 11:33+0100\n" -"Last-Translator: Volkan Gezer <volkangezer@gmail.com>\n" -"Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" +"PO-Revision-Date: 2022-10-05 12:00+0300\n" +"Last-Translator: Emir SARI <emir_sari@icloud.com>\n" +"Language-Team: Turkish <gnome-turk@gnome.org>\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,10 +21,15 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 2.0\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "uyarı: %s: sahte dosya adı yok sayılıyor" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" -msgstr "geçerli dizine karar verilemiyor" +msgstr "geçerli dizin algılanamıyor" #: lib/security.c:80 #, c-format @@ -37,41 +44,41 @@ msgstr "setuid man kullanıcısı \"%s\" mevcut deÄŸil" #: lib/xregcomp.c:50 #, c-format msgid "fatal: regex `%s': %s" -msgstr "ciddi: düzenli ifade `%s': %s" +msgstr "onulmaz: düzenli ifade `%s': %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "çoklu anahtar %s mevcut deÄŸil" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "%s içerik önbelleÄŸi kilitlenemez" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "%s içerik önbelleÄŸi bozuk" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "%s anahtarı deÄŸiÅŸtirilemez" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "içerikteki sadece %d alanı" msgstr[1] "içerikteki sadece %d alanı" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "çoklu anahtar %s bozuk getirildi" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "%s veritabanı bozuk; mandb --create ile tekrar oluÅŸturun" @@ -89,7 +96,7 @@ msgstr "uyarı: %s sürümü %s, beklenen %s\n" #: libdb/db_ver.c:82 #, c-format msgid "fatal: unable to insert version identifier into %s" -msgstr "ciddi: %s içine sürüm tanıtıcısı eklenemiyor" +msgstr "onulmaz: %s içine sürüm tanıtıcısı eklenemiyor" #: src/accessdb.c:62 msgid "[MAN DATABASE]" @@ -98,194 +105,189 @@ msgstr "[MAN VERÄ°TABANI]" #: src/accessdb.c:63 #, c-format msgid "The man database defaults to %s%s." -msgstr "Man veritabanı ÅŸuna sıfırlanıyor: %s%s." +msgstr "Man veritabanı öntanımlısı ÅŸudur: %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" -msgstr "hata ayıklama iletilerini yay" +msgstr "hata ayıklama iletileri yay" #: src/accessdb.c:140 #, c-format msgid "can't open %s for reading" msgstr "%s okumak için açılamıyor" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[BÖLÃœM...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "YOL" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "kılavuz sayfaları için arama yolunu YOL olarak ayarla" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "DOSYA" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "bu kullanıcı yapılandırma dosyasını kullan" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" -msgstr "çıkış durumu %d ile man komutu baÅŸarısız oldu" +msgstr "man komutu %d çıkış durumu ile baÅŸarısız oldu" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "Anahtar için boÅŸ içerik: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" "Updating cat files for section %s of man hierarchy %s\n" msgstr "" "\n" -"man hiyerarÅŸi %s, %s bölümü için cat dosyaları güncelleniyor\n" +"%2$s man hiyerarÅŸisinin %1$s bölümü için cat dosyaları güncelleniyor\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "%s içine yazılamıyor" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "%s veritabanı okunamıyor" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "%s güncellenemiyor" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "uyarı: %s/man%s/%s.%s*: uzantıları çakışıyor" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "%s içerik önbelleÄŸi güncellenemedi" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" -msgstr "uyarı: %s: bozuk sembolik baÄŸlantı veya ROFF `.so' talebi" +msgstr "uyarı: %s: bozuk sembolik baÄŸ veya ROFF `.so' talebi" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" -msgstr "uyarı: %s: boÅŸ dosya yoksayılıyor" +msgstr "uyarı: %s: boÅŸ dosya yok sayılıyor" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "uyarı: %s: %s(%s) için whatis ayıklaması baÅŸarısız" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "%s dizini aranamıyor" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "%s üzerinde chown komutu kullanılamadı" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "uyarı: catdir %s oluÅŸturulamıyor" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "%s için chmod yapılamıyor" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "%s dizinine deÄŸiÅŸtirilemiyor" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "%s dizin önbelleÄŸi oluÅŸturulamıyor" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "`%s/%s' yolunun dizin önbelleÄŸi güncelleniyor. Bekleyin..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "tamamlandı.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "%s içindeki eski veritabanı girdileri temizleniyor...\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "uyarı: %s(%s) girdisini saklama baÅŸarısız oldu" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "uyarı: %s: sahte dosya adı yoksayılıyor" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "YOL BÖLÃœM ADI" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "UZANTI" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "aramayı UZANTI uzantı türüne sınırla" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "sayfaları harf duyarlılığı olmadan ara (öntanımlı)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "sayfaları harf duyarlılığı ile ara" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "sayfa adını düzenli ifade olarak yorumla" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "sayfa adı özel semboller içeriyor" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "uyarı: %s için whatis %d baytı aÅŸtı, kırpılıyor." msgstr[1] "uyarı: %s için whatis %d baytı aÅŸtı, kırpılıyor." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "%s açılamıyor" @@ -310,19 +312,19 @@ msgstr "cat sayfası olarak ayrıştır" msgid "show whatis information" msgstr "whatis bilgisini göster" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "ön iÅŸleme filtrelerinin tahmin serilerini göster" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "KODLAMA" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "seçilen çıktı kodlamasını kullan" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: uyumsuz seçenekler" @@ -332,7 +334,7 @@ msgstr "%s: uyumsuz seçenekler" msgid "command exited with status %d: %s" msgstr "komut %d durumu ile çıktı: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[BÖLÃœM] SAYFA..." @@ -344,171 +346,171 @@ msgstr "tüm seçenekleri öntanımlı deÄŸerlerine çevir" msgid "WARNINGS" msgstr "UYARILAR" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "groff uyarılarını etkinleÅŸtir" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Ana iÅŸlem kipleri:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "whatis ile eÅŸdeÄŸer" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "apropos ile eÅŸdeÄŸer" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "metni tüm sayfalarda ara" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "man sayfa(larının) fiziksel konumlarını yazdır" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "cat dosya(larının) fiziksel konumlarını yazdır" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "DOSYA argüman(lar)ını yerel dosya(lar) olarak yorumla" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "" "eski cat sayfalarını tekrar biçimlendirmek için catman tarafından " "kullanılıyor" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "KODLAMA olarak kodlanmış çıktı kaynak dosyası" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Kılavuz sayfalarında arama:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "YEREL" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "bu özel man araması için yereli tanımla" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "SÄ°STEM" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "diÄŸer sistemlerden kılavuz sayfalarını kullan" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "LÄ°STE" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "iki nokta ile ayrılmış bölüm listesini kullan" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "düzenli ifade ile eÅŸleÅŸen tüm sayfaları göster" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "özel karakter ile eÅŸleÅŸen tüm sayfaları göster" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "--regex ve --wildcard sadece sayfa adlarını eÅŸleÅŸtirsin, açıklamaları deÄŸil" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "tüm eÅŸleÅŸen kılavuz sayfalarını bul" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "zorunlu bir önbellek düzenlilik denetimi yap" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "alt sayfaları deneme, örn. 'man foo bar' => 'man foo-bar'" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "BiçimlendirilmiÅŸ çıktı denetlenmesi:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" -msgstr "ÇAÄžRI CÄ°HAZI" +msgstr "ÇAÄžRI AYGITI" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" -msgstr "çıktı görüntülemek için program ÇAÄžRI CÄ°HAZI kullan" +msgstr "çıktı görüntülemek için program ÇAÄžRI AYGITI kullan" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" -msgstr "DÄ°ZGÄ°" +msgstr "DÄ°ZÄ°" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "`less' sayfalayıcıyı istek ile sun" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "bazı latin1 karakterlerinin ASCII çevirisini kullan" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" -msgstr "satır sonu karakterini kapat" +msgstr "hecelemeyi kapat" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" -msgstr "hizalamayı kapat" +msgstr "iki yana yaslamayı kapat" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" msgstr "" -"DÄ°ZGÄ° çalıştırılacak ön iÅŸleyicileri belirtir:\n" +"DÄ°ZÄ° çalıştırılacak ön iÅŸleyicileri belirtir:\n" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "sayfaları biçimlemek için %s kullan" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "AYGIT" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "seçilen aygıt ile %s kullan" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "TARAYICI" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "HTML çıktısını görüntülemek için %s veya TARAYICI kullan" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "ÇÖZÃœNÃœRLÃœK" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -516,84 +518,84 @@ msgstr "" "groff kullan ve gxditview (X11) aracılığı ile görüntüle:\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "groff kullan ve ditroff üretmesi için zorla" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Åžunun için kılavuz girdisi yok: %s\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Ek olarak, %s bölümünden hangi kılavuz sayfasını istersiniz?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Hangi kılavuz sayfasını istersiniz?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" -msgstr "" +msgstr "ÖrneÄŸin, 'man man' deneyin.\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "%s için %s bölümünde kılavuz girdisi yok\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Kılavuz sayfaları mevcut olmadığında yardım için bkz. '%s'.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" -msgstr "bilinmeyen ön iÅŸleyici yoksayılıyor `%c'" +msgstr "bilinmeyen ön iÅŸleyici yok sayılıyor `%c'" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "%s, %s olarak adlandırılamıyor" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "%s üzerinde zamanlar ayarlanamıyor" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "%s baÄŸlantısı kaldırılamıyor" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "%s için geçici kategori oluÅŸturulamıyor" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "geçici dizin oluÅŸturulamıyor" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "%s geçici dosyası açılamıyor" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "%s dizini kaldırılamıyor" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "--Man-- sonraki: %s [ bak (enter) | atla (Ctrl-D) | çık (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -602,33 +604,33 @@ msgstr "" "\n" "catman kipinde %s içine yazılamıyor" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "%s cat adına dönüştürülemiyor" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: whatis refs'e dayanmak artık kullanılmıyor\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb komutu %d çıktı durumu ile baÅŸarısız oldu" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" -msgstr "dahili hata: aday türü %d aralık dışında" +msgstr "iç hata: aday türü %d aralık dışında" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " -msgstr "Kılavuz sayfası" +msgstr " Kılavuz sayfası " #: src/man-recode.c:110 msgid "-t CODE {--suffix SUFFIX | --in-place} FILENAME..." -msgstr "" +msgstr "-t KOD {--suffix SONEK | --in-place} DOSYAADI..." #: src/man-recode.c:113 src/manconv_main.c:99 msgid "CODE" @@ -638,17 +640,17 @@ msgstr "KOD" msgid "encoding for output" msgstr "çıktı için kodlama" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" -msgstr "" +msgstr "SONEK" #: src/man-recode.c:115 msgid "suffix to append to output file name" -msgstr "" +msgstr "çıktı dosyası adına iliÅŸtirilecek sonek" #: src/man-recode.c:117 msgid "overwrite input files in place" -msgstr "" +msgstr "girdi dosyalarının yerinde üzerine yaz" #: src/man-recode.c:119 src/manconv_main.c:101 src/manpath.c:68 msgid "produce fewer warnings" @@ -662,14 +664,14 @@ msgstr "bir çıktı kodlaması belirtilmeli" #: src/man-recode.c:159 #, c-format msgid "must use either --suffix or --in-place" -msgstr "" +msgstr "ya --suffix ya da --in-place kullanmalı" #: src/man-recode.c:163 #, c-format msgid "--suffix and --in-place are mutually exclusive" -msgstr "" +msgstr "--suffix ve --in-place birlikte kullanılamaz" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "%s kaldırılamıyor" @@ -684,9 +686,8 @@ msgid "iconv: incomplete character at end of buffer" msgstr "iconv: tampon sonunda eksik karakter" #: src/manconv_main.c:94 -#, fuzzy msgid "[-f CODE[:...]] -t CODE [FILENAME]" -msgstr "-f KOD[:...] -t KOD [DOSYAADI]" +msgstr "[-f KOD[:...]] -t KOD [DOSYAADI]" #: src/manconv_main.c:97 msgid "CODE[:...]" @@ -696,162 +697,162 @@ msgstr "KOD[:...]" msgid "possible encodings of original text" msgstr "özgün metnin muhtemel kodlamaları" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" -msgstr "[MANYOLU]" +msgstr "[MAN YOLU]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "'sahte' uyarılar hariç sessiz çalış" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "veritabanlarında stray cat arama veya ekleme" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "veritabanlarından gereksiz girdileri budama" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "sadece kullanıcı veritabanlarını üret" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "veritabanlarını güncellemek yerine sıfırdan üret" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "doÄŸrulukları için kılavuz sayfalarını denetle" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" -msgstr "DOSYAADI" +msgstr "DOSYA ADI" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "bu dosya adı için sadece girdiyi güncelle" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "%s ögesine yazılamıyor" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "%s ögesinden okunamıyor" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "%s altındaki kılavuz sayfaları iÅŸleniyor...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "%s gereksiz cat dizini kaldırılıyor...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "uyarı: %s içinde MANDB_MAP yönergesi yok, yazdığınız manpath kullanılıyor" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "%d man alt dizini daha yeni kılavuz sayfaları içeriyor.\n" msgstr[1] "%d man alt dizini daha yeni kılavuz sayfaları içeriyor.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "%d kılavuz sayfası eklendi.\n" msgstr[1] "%d kılavuz sayfası eklendi.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" -msgstr[0] "%d stray cat eklendi.\n" -msgstr[1] "%d stray cat eklendi.\n" +msgstr[0] "%d başıboÅŸ cat eklendi.\n" +msgstr[1] "%d başıboÅŸ cat eklendi.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d eski veritabanı girdisi budandı.\n" msgstr[1] "%d eski veritabanı girdisi budandı.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." -msgstr "Hiç veritabanı oluÅŸturulmadı." +msgstr "Bir veritabanı oluÅŸturulmadı." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "%s manpath yapılandırma dosyası anlaşılamıyor" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "uyarı: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "uyarı: %s bir dizin deÄŸil" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "uyarı: $PATH ayarlanmamış" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "uyarı: boÅŸ $PATH" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "uyarı: $MANPATH ayarlanmış, %s öne ekleniyor" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "uyarı: $MANPATH ayarlanmış, %s sona ekleniyor" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" -msgstr "uyarı: $MANPATH ayarlanmış,%s ekleniyor" +msgstr "uyarı: $MANPATH ayarlanmış, %s ekleniyor" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" -msgstr "uyarı: $MANPATH ayarlanmış,%s yoksayılıyor" +msgstr "uyarı: $MANPATH ayarlanmış, %s yok sayılıyor" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "`%s' dizin listesi ayrıştırılamıyor" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "%s manpath yapılandırma dosyası açılamıyor" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "uyarı: zorunlu dizin %s mevcut deÄŸil" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "uyarı: %s, %s ile baÅŸlamıyor" @@ -862,137 +863,117 @@ msgstr "iliÅŸkili catpath'leri göster" #: src/manpath.c:66 msgid "show the entire global manpath" -msgstr "tüm evrensel manpath'i göster" +msgstr "tüm global manpath'i göster" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" -msgstr "uyarı: %s yapılandırma dosyasında ayarlanmış evrensel hiç manpath yok." +msgstr "uyarı: %s yapılandırma dosyasında ayarlanmış global bir manpath yok" + +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "%s altında başıboÅŸ cat'ler aranıyor...\n" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" -msgstr "uyarı: %s sarkan bir sembolik baÄŸlantı" +msgstr "uyarı: %s sarkan bir sembolik baÄŸ" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "%s çözülemiyor" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "%s altında stray cat'ler aranıyor...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" -msgstr "%s kendini iÅŸaret ediyor" +msgstr "%s kendine baÅŸvuruyor" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." -msgstr "ANAHTARKELÄ°ME..." +msgstr "ANAHTAR SÖZCÃœK..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "--regex seçeneÄŸi öntanımlı olarak etkindir." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "ayrıntılı uyarı iletilerini göster" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" -msgstr "her anahtar kelimeyi düzenli ifade olarak yorumla" +msgstr "her anahtar sözcüğü düzenli ifade olarak yorumla" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" -msgstr "her anahtar kelimeyi tam eÅŸleÅŸme ile ara" +msgstr "her anahtar sözcüğü tam eÅŸleÅŸme ile ara" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" -msgstr "anahtar kelime(ler) özel sembol içeriyor" +msgstr "anahtar sözcük(ler) özel sembol içeriyor" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" -msgstr "tüm anahtar kelimelerin eÅŸleÅŸmesini gerektir" +msgstr "tüm anahtar sözcüklerin eÅŸleÅŸmesini gerektir" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "çıktıyı uçbirim geniÅŸliÄŸine kısıtlama" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "sadece ÅŸu alanlarda ara (iki nokta ile ayrılmış)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "bu arama için dili tanımla" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s ne?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "uyarı: %s bir iÅŸaretçi döngüsü içeriyor" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(bilinmeyen konu)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: uygun bir ÅŸey yok.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: .so istekleri çok derin yuvalanmış veya içiçe çaÄŸrışım yapıyor" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: uyarı: baÅŸarısız .so isteÄŸi" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" -msgstr "%s:%d: uyarı: .so isteÄŸinde yeni satır, yoksayılıyor" +msgstr "%s:%d: uyarı: .so isteÄŸinde yeni satır, yok sayılıyor" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" -msgstr "%s:%d: uyarı: .lf isteÄŸi içinde yeni satır, yoksayılıyor" +msgstr "%s:%d: uyarı: .lf isteÄŸi içinde yeni satır, yok sayılıyor" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: roff isteÄŸinde kapatılmamış kesme iÅŸareti" #: src/zsoelim_main.c:73 msgid "compatibility switch (ignored)" -msgstr "uyumluluk anahtarı (yoksayıldı)" - -#, c-format -#~ msgid "warning: can't update index cache %s" -#~ msgstr "uyarı: %s dizin önbelleÄŸi güncellenemiyor" - -#, c-format -#~ msgid "%s:%d: warning: malformed .lf request, ignoring" -#~ msgstr "%s:%d: uyarı: bozuk .lf isteÄŸi, yoksayılıyor" - -#~ msgid "must specify an input encoding" -#~ msgstr "bir girdi kodlaması belirtilmeli" - -#~ msgid "manpath list too long" -#~ msgstr "manpath listesi çok uzun" - -#~ msgid "can't restore previous working directory" -#~ msgstr "önceki çalışma dizini geri yüklenemiyor" - -#~ msgid "can't chdir to %s" -#~ msgstr "%s için chdir yapılamıyor" +msgstr "uyumluluk anahtarı (yok sayıldı)" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.7.6.1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2016-12-13 08:08+0700\n" "Last-Translator: Trần Ngá»c Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" @@ -23,7 +23,12 @@ msgstr "" "X-Generator: Gtranslator 2.91.7\n" "X-Poedit-SourceCharset: utf-8\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "cảnh báo: %s: Ä‘ang bá» qua tên táºp tin giả" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "không thể tháo gỡ thÆ° mục hiện có" @@ -43,38 +48,38 @@ msgstr "không có ngÆ°á»i dùng hÆ°á»›ng dẫn \"setuid\" \"%s\"" msgid "fatal: regex `%s': %s" msgstr "lá»—i nghiêm trá»ng: biểu thức chÃnh quy “%sâ€: %s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "Ä‘a khóa %s không tồn tại" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "không thể khóa bá»™ nhá»› tạm mục lục %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "bá»™ nhá»› tạm mục lục %s bị há»ng" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "không thể thay thế khóa %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "chỉ có %d trÆ°á»ng trong ná»™i dung" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "tiến trình gá»i (fetch) sai vá»›i Ä‘a khóa %s" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "" @@ -104,9 +109,9 @@ msgstr "[CÆ SỞ Dá»® LIỆU MAN]" msgid "The man database defaults to %s%s." msgstr "CÆ¡ sở dữ liệu chÃnh có giá trị mặc định là %s%s." -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "phát ra các thông Ä‘iệp để gỡ lá»—i" @@ -116,39 +121,39 @@ msgstr "phát ra các thông Ä‘iệp để gỡ lá»—i" msgid "can't open %s for reading" msgstr "không thể mở %s để Ä‘á»c" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[PHẦN…]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "ÄƯỜNG_DẪN" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "đặt ÄƯỜNG_DẪN Ä‘Æ°á»ng dẫn để tìm kiếm các trang hÆ°á»›ng dẫn" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "TẬP_TIN" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "dùng táºp tin cấu hình nà y" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "lệnh \"man\" đã thất bại vá»›i trạng thái thoát là %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "ná»™i dung VÔ GIà TRỊ cho khóa: %s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -157,132 +162,127 @@ msgstr "" "\n" "Äang cáºp nháºt các táºp tin \"cat\" cho phần %s của cây phân cấp \"man\" %s\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "không thể ghi ở trong %s" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "không thể Ä‘á»c cÆ¡ sở dữ liệu %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "không thể cáºp nháºt %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "cảnh báo: \"%s/man%s/%s.%s*\": phần mở rá»™ng cạnh tranh vá»›i nhau" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "không thể cáºp nháºt bá»™ nhá»› tạm mục lục %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "cảnh báo: %s: liên kết má»m sai, hoặc yêu cầu \".so\" ROFF sai" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "cảnh báo: %s: Ä‘ang bá» qua táºp tin rá»—ng" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "" "cảnh báo: %s: việc phân tách kiểu \"whatis\" (là gì?) cho \"%s(%s)\" bị lá»—i" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "không thể tìm kiếm trong danh mục %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "không thể \"chown\" (thay đổi quyá»n sở hữu) %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "cảnh báo: không thể tạo catdir (thÆ° mục \"cat\") %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "không thể \"chmod\" (thay đổi chế Ä‘á»™ Ä‘á»c ghi) %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "không thể chuyển sang thÆ° mục %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "không thể tạo bá»™ nhá»› tạm mục lục %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "" "Äang cáºp nháºt bá»™ nhá»› tạm mục lục cho Ä‘Æ°á»ng dẫn \"%s/%s\". Vui lòng chá»â€¦" -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "hoà n tất.\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "Äang tẩy các mục tin cÆ¡ sở dữ liệu cÅ© trong %s…\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "cảnh báo: gặp lá»—i khi lÆ°u trữ mục tin cho \"%s(%s)\"" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "cảnh báo: %s: Ä‘ang bá» qua tên táºp tin giả" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "ÄƯỜNG DẪN PHẦN TÊN" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "PHẦN_MỞ_RỘNG" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "chỉ tìm kiếm phần mở rá»™ng kiểu PHẦN MỞ RỘNG" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "không phân biệt chữ HOA/thÆ°á»ng khi tìm (mặc định)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "phân biệt chữ HOA/thÆ°á»ng khi tìm" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "phiên dịch tên trang nhÆ° là má»™t biểu thức chÃnh quy" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "tên trang chứa ký tá»± đại diện (? * v.v.)" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." @@ -290,9 +290,9 @@ msgstr[0] "" "cảnh báo: thông tin \"whatis\" (là gì?) cho %s vượt quá %d byte nên Ä‘ang cắt " "bá»›t nó." -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "không thể mở %s" @@ -317,19 +317,19 @@ msgstr "phân tÃch dạng trang cat" msgid "show whatis information" msgstr "hiển thị thông tin whatis (là gì)" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "hiển thị dãy bá»™ lá»c tiá»n xá» lý đã Ä‘oán" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "BẢNG_MÃ" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "dùng bảng mã xuất đã chá»n" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s: các tùy chá»n không tÆ°Æ¡ng thÃch vá»›i nhau" @@ -339,7 +339,7 @@ msgstr "%s: các tùy chá»n không tÆ°Æ¡ng thÃch vá»›i nhau" msgid "command exited with status %d: %s" msgstr "lệnh đã thoát vá»›i trạng thái %d: %s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[PHẦN] TRANG…" @@ -351,133 +351,133 @@ msgstr "đặt lại má»i tùy chá»n vá» giá trị mặc định" msgid "WARNINGS" msgstr "CẢNH_BÃO" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "báºt cảnh báo từ groff" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "Chế Ä‘á»™ thao tác chÃnh:" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "tÆ°Æ¡ng Ä‘Æ°Æ¡ng vá»›i whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "tÆ°Æ¡ng Ä‘Æ°Æ¡ng vá»›i apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "quét má»i trang tìm chuá»—i" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "in ra vị trà váºt lý của (các) trang man" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "in ra vị trà váºt lý của (các) trang cat" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "biên dịch má»—i đối số TRANG là tên táºp tin cục bá»™" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "được catman dùng để định dạng lại các trang cat cÅ©" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "xuất trang mã nguồn đã mã hóa bằng BẢNG_MÃ" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "Äang tìm trang hÆ°á»›ng dẫn:" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "MIỀN_ÄỊA_PHÆ¯Æ NG" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "xác định miá»n địa phÆ°Æ¡ng cho việc tìm kiếm man đặc biệt" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "HỆ_THá»NG" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "dùng trang man từ hệ thống khác" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "DANH_SÃCH" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "dùng danh sách các phần định giá»›i bằng dấu hai chấm" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "hiển thị tất cả các trang khá»›p mẫu biểu thức chÃnh quy" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "hiển thị tất cả các trang khá»›p mẫu vá»›i ký tá»± đại diện" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "" "là m cho tùy chá»n \"--regex\" và \"--wildcard\" chỉ khá»›p vá»›i tên trang, không " "phải vá»›i phần mô tả" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "tìm tất cả các trang hÆ°á»›ng dẫn tÆ°Æ¡ng ứng" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "ép buá»™c kiểm tra tÃnh nhất quán của bá»™ nhá»› tạm" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "đừng thá» trang con, v.d. “man foo bar†=> “man foo-barâ€" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "Äiá»u khiển định dạng cho kết xuất:" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "DÀN_TRANG" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "dùng chÆ°Æ¡ng trình DÀN TRANG để hiển thị kết xuất" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "CHUá»–I" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "cung cấp má»™t dấu nhắc cho bá»™ dà n trang \"less\"" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "hiển thị bản dịch ASCII của má»™t số ký tá»± Latin-1 nà o đó" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "tắt chức năng gạch nối từ" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "tắt chức năng canh lá»" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -487,34 +487,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "dùng %s để định dạng trang" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "THIẾT_BỊ" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "dùng %s vá»›i thiết bị đã chá»n" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "TRÃŒNH_DUYỆT" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "dùng %s hoặc TRÃŒNH DUYỆT để hiển thị kết xuất HTML" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "ÄỘ_PHÂN_GIẢI" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -522,84 +522,84 @@ msgstr "" "dùng groff và hiển thị thông qua gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "dùng groff và ép buá»™c nó sản sinh ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "Không có trang hÆ°á»›ng dẫn cho \"%s\"\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(Thay vì váºy, bạn muốn trang hÆ°á»›ng dẫn nà o từ phần %s?)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "Bạn muốn trang hÆ°á»›ng dẫn nà o?\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "Không có trang hÆ°á»›ng dẫn cho %s trong phần %s\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "Hãy xem \"%s\" để tìm trợ giúp khi trang hÆ°á»›ng dẫn không sẵn sà ng.\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "Ä‘ang bá» qua bá»™ tiá»n xá» lý trÆ°á»›c không hiểu \"%c\"" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "không thể thay đổi tên %s thà nh %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "không thể đặt thá»i gian trên %s" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "không thể bá» liên kết %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "không thể tạo \"cat\" tạm cho %s" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "không thể tạo thÆ° mục tạm thá»i" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "không thể mở táºp tin tạm %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "không thể gỡ bá» thÆ° mục %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "--Man-- kế: %s [ xem (enter) | nhảy qua (Ctrl-D) | thoát (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -608,28 +608,28 @@ msgstr "" "\n" "không thể ghi và o %s trong chế Ä‘á»™ \"catman\"" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "Không thể chuyển đổi %s sang tên \"cat\"" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s: nhá» các \"ref\" (tham chiếu) của lệnh \"whatis\" bị phản đối\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "" "lệnh \"mandb\" (cÆ¡ sở dữ liệu hÆ°á»›ng dẫn) gặp lá»—i vá»›i trạng thái thoát là %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "lá»—i ná»™i bá»™: kiểu ứng cá» %d nằm ngoà i phạm vi" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Trang hÆ°á»›ng dẫn " @@ -645,7 +645,7 @@ msgstr "MÃ" msgid "encoding for output" msgstr "bảng mã cho kết xuất" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "" @@ -676,7 +676,7 @@ msgstr "" msgid "--suffix and --in-place are mutually exclusive" msgstr "" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "không thể gỡ bá» %s" @@ -703,162 +703,162 @@ msgstr "MÃ[:…]" msgid "possible encodings of original text" msgstr "bảng mã có thể của văn bản gốc" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[ÄƯỜNG_DẪN_MAN]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "chạy im, trừ xuất cảnh báo \"giả\"" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "đừng tìm hay thêm và o cÆ¡ sở dữ liệu các cat rải rác" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "đừng tẩy khá»i cÆ¡ sở dữ liệu các mục tin cÅ©" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "chỉ tạo các cÆ¡ sở dữ liệu ngÆ°á»i dùng" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "tạo lại cÆ¡ sở dữ liệu từ đầu thay cho cáºp nháºt" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "kiểm tra các trang hÆ°á»›ng dẫn xem có đúng không" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "TÊN_TẬP_TIN" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "chỉ cáºp nháºt mục tin cho tên táºp tin nà y" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "không thể ghi và o %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "không thể Ä‘á»c từ %s" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "Äang xá» lý các trang hÆ°á»›ng dẫn dÆ°á»›i %s…\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "Äang gỡ bá» các thÆ° mục “cat†không dùng nữa %s…\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "" "cảnh báo: không có chỉ thị \"MANDB_MAP\" trong “%s†nên sẽ dùng Ä‘Æ°á»ng dẫn " "hÆ°á»›ng dẫn của bạn." -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "%d thÆ° mục con hÆ°á»›ng dẫn chứa trang hÆ°á»›ng dẫn má»›i hÆ¡n.\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "%d trang hÆ°á»›ng dẫn được thêm và o.\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "%d trang \"cat\" thất lạc đã được thêm và o.\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "%d mục tin cÆ¡ sở dữ liệu cÅ© bị tẩy.\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "ChÆ°a tạo cÆ¡ sở dữ liệu." -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "không thể hiểu táºp tin cấu hình Ä‘Æ°á»ng dẫn hÆ°á»›ng dẫn %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "cảnh báo: %s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "cảnh báo: %s không phải là thÆ° mục" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "" "cảnh báo: chÆ°a đặt biến môi trÆ°á»ng \"$PATH\"\n" "(Ä‘Æ°á»ng dẫn thÆ° mục chứa chÆ°Æ¡ng trình thi hà nh được)" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "cảnh báo: biến môi trÆ°á»ng \"$PATH\" (Ä‘Æ°á»ng dẫn) trống rá»—ng" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "" "cảnh báo: táºp hợp \"$MANPATH\" (Ä‘Æ°á»ng dẫn hÆ°á»›ng dẫn), Ä‘ang thêm %s và o đầu" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "cảnh báo: táºp hợp \"$MANPATH\" (Ä‘Æ°á»ng dẫn hÆ°á»›ng dẫn), Ä‘ang phụ thêm %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "cảnh báo: táºp hợp \"$MANPATH\" (Ä‘Æ°á»ng dẫn hÆ°á»›ng dẫn), Ä‘ang chèn %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "cảnh báo: táºp hợp \"$MANPATH\" (Ä‘Æ°á»ng dẫn hÆ°á»›ng dẫn), Ä‘ang bá» qua %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "không thể phân tách danh sách thÆ° muc \"%s\"" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "không thể mở táºp tin cấu hình Ä‘Æ°á»ng dẫn hÆ°á»›ng dẫn %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "cảnh báo: không có thÆ° mục bắt buá»™c %s" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "cảnh báo: %s không bắt đầu bằng %s" @@ -871,112 +871,112 @@ msgstr "hiển thị Ä‘Æ°á»ng dẫn tÆ°Æ¡ng đối cat" msgid "show the entire global manpath" msgstr "hiển thị toà n Ä‘Æ°á»ng dẫn toà n cục" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "" "cảnh báo: chÆ°a láºp Ä‘Æ°á»ng dẫn hÆ°á»›ng dẫn toà n cục trong táºp tin cấu hình %s" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "Äang kiểm tra có trang \"cat\" rải rác dÆ°á»›i %s…\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "cảnh báo: %s là liên kết má»m không chỉ và o đâu cả" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "không thể phân giải %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "Äang kiểm tra có trang \"cat\" rải rác dÆ°á»›i %s…\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s tham chiếu đến chÃnh nó" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "TỪ KHÓA…" -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "Tùy chá»n \"--regex\" (biểu thức chÃnh quy) được báºt theo mặc định." -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "in ra cảnh báo dạng chi tiết" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "biên dịch má»—i từ khóa nhÆ° là má»™t biểu thức chÃnh quy" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "tìm kiếm khá»›p hoà n toà n từng từ khóa má»™t" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "(các) từ khóa chứa ký tá»± đại diện (? * v.v.)" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "yêu cầu má»i từ khóa khá»›p" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "đừng xén kết xuất cho bằng bá» rá»™ng của thiết bị cuối" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "chỉ tìm kiếm trong những phần nà y (ngăn cách bởi dấu hai chấm)" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "xác định miá»n địa phÆ°Æ¡ng cho việc tìm kiếm nà y" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s gì váºy?\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "cảnh báo: %s chứa má»™t vòng lặp con trá» (pointer loop)" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(không hiểu chủ Ä‘á»)" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s: không có gì thÃch hợp cả.\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d: các yêu cầu \".so\" lồng nhau quá sâu hoặc bị đệ quy" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d: cảnh báo: yêu cầu \".so\" bị lá»—i" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d: cảnh báo: yêu cầu \".so\" có chứa ký tá»± dòng má»›i nên bá» qua" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d: cảnh báo: yêu cầu \".lf\" có chứa ký tá»± dòng má»›i nên bá» qua" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d: yêu cầu roff chứa Ä‘oạn trÃch dẫn chÆ°a được chấm dứt" diff --git a/po/zh_CN.po b/po/zh_CN.po index 54bdc259..e2f05e38 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.9.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2019-10-01 11:13-0400\n" "Last-Translator: Boyuan Yang <073plan@gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n" @@ -31,7 +31,13 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 2.2.4\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +# need-proofread +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "è¦å‘Šï¼š%s：忽略错误的文件å" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "æ— æ³•ç¡®å®šå½“å‰ç›®å½•" @@ -53,39 +59,39 @@ msgstr "ä¸å˜åœ¨ç”¨æ¥å°† man ç¨‹åº setuid 的用户 %s" msgid "fatal: regex `%s': %s" msgstr "致命错误：regex `%s'：%s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "多é‡è¯æ¡ %s ä¸å˜åœ¨" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "æ— æ³•é”å®šç´¢å¼•ç¼“å˜ %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "ç´¢å¼•ç¼“å˜ %s å·²æŸå" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "æ— æ³•æ›¿æ¢è¯æ¡ %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "内容ä¸ä»…有 %d 个å—段" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "获å–äº†æ— æ•ˆçš„å¤šé‡è¯æ¡ %s" # need-proofread -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "æ•°æ®åº“ %s å·²æŸå；请用 mandb --create 命令é‡å»º" @@ -114,9 +120,9 @@ msgstr "[MAN æ•°æ®åº“]" msgid "The man database defaults to %s%s." msgstr "默认的 man æ•°æ®åº“是 %s%s。" -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "输出调试信æ¯" @@ -127,41 +133,41 @@ msgstr "输出调试信æ¯" msgid "can't open %s for reading" msgstr "æ— æ³•æ‰“å¼€ %s 读å–æ•°æ®" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[ç« èŠ‚...]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "路径" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "设置æœç´¢æ‰‹å†Œé¡µçš„路径为 PATH" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "文件" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "使用该用户设置文件" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "man 命令失败，退出状æ€ä»£ç 为 %d" # need-proofread -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "关于 %s è¯æ¡çš„内容为空" # need-proofread -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -170,142 +176,136 @@ msgstr "" "\n" "æ£åœ¨æ›´æ–° man ç›®å½•æ ‘ %2$s ä¸ç¬¬ %1$s 节的 cat 文件\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "æ— æ³•åœ¨ %s 里写入" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "æ— æ³•è¯»å–æ•°æ®åº“ %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "æ— æ³•æ›´æ–° %s" # need-proofread -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "è¦å‘Šï¼š%s/man%s/%s.%s*：互相竞争的扩展" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "æ— æ³•æ›´æ–°ç´¢å¼•ç¼“å˜ %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "è¦å‘Šï¼š%s：å的符å·é“¾æŽ¥æˆ–åçš„ ROFF“.soâ€è¯·æ±‚" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "è¦å‘Šï¼š%s：忽略空文件" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "è¦å‘Šï¼š%s：用 whatis 解读 %s(%s) 失败" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "æ— æ³•æœç´¢ç›®å½• %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "æ— æ³• chown %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "è¦å‘Šï¼šæ— 法创建 catdir %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "æ— æ³• chmod %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "æ— æ³•åˆ‡æ¢åˆ°ç›®å½• %s ä¸" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "æ— æ³•åˆ›å»ºç´¢å¼•ç¼“å˜ %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "æ£åœ¨ä¸ºè·¯å¾„ %s/%s 更新索引缓å˜ã€‚请ç‰å¾…..." -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "完æˆã€‚\n" # need-proofread -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "æ£åœ¨åˆ 除 %s 里的旧数æ®åº“æ¡ç›®...\n" # need-proofread -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "è¦å‘Šï¼šä¸º %s(%s) å˜å‚¨æ¡ç›®å¤±è´¥" -# need-proofread -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "è¦å‘Šï¼š%s：忽略错误的文件å" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "路径 ç« èŠ‚ å称" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "扩展" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "å°†æœç´¢é™åˆ¶åœ¨æ‰©å±•ç±»åž‹ä¸ºâ€œæ‰©å±•â€çš„手册页之内" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "查找手册页时ä¸åŒºåˆ†å¤§å°å†™å—æ¯ (默认)" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "查找手册页时区分大å°å†™å—æ¯" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "把页é¢å称当作æ£åˆ™è¡¨è¾¾å¼è§£è¯»" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "页é¢å称里包å«é€šé…符" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "è¦å‘Šï¼šå¯¹ %s çš„ whatis æ“作结果超过 %d å—节，æ£åœ¨æˆªæ–。" -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "æ— æ³•æ‰“å¼€ %s" @@ -330,19 +330,19 @@ msgstr "å½“æˆ cat 页解读" msgid "show whatis information" msgstr "显示 whatis ä¿¡æ¯" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "显示所猜测的预处ç†è¿‡æ»¤å™¨åºåˆ—" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "ç¼–ç " -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "使用选ä¸çš„输出编ç " -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s：互ä¸ç›¸å®¹çš„选项" @@ -352,7 +352,7 @@ msgstr "%s：互ä¸ç›¸å®¹çš„选项" msgid "command exited with status %d: %s" msgstr "命令以代ç %d 状æ€é€€å‡ºï¼š%s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[ç« èŠ‚] 手册页..." @@ -364,132 +364,132 @@ msgstr "将所有选项都é‡ç½®ä¸ºé»˜è®¤å€¼" msgid "WARNINGS" msgstr "è¦å‘Š" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "å¼€å¯ groff çš„è¦å‘Š" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "主è¦è¿è¡Œæ¨¡å¼ï¼š" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "ç‰åŒäºŽ whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "ç‰åŒäºŽ apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "在所有页é¢ä¸æœç´¢æ–‡å—" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "输出手册页的物ç†ä½ç½®" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "输出 cat 文件的物ç†ä½ç½®" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "把“手册页â€å‚数当æˆæœ¬åœ°æ–‡ä»¶åæ¥è§£è¯»" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "ç”± catman 使用，用æ¥å¯¹è¿‡æ—¶çš„ cat 页é‡æ–°æŽ’版" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "以指定编ç 输出手册页æºç " -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "寻找手册页：" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "区域" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "定义本次手册页æœç´¢æ‰€é‡‡ç”¨çš„区域设置" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "系统" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "使用æ¥è‡ªå…¶å®ƒç³»ç»Ÿçš„手册页" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "列表" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "使用以åŠè§’冒å·åˆ†éš”çš„ç« èŠ‚åˆ—è¡¨" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "显示所有匹é…æ£åˆ™è¡¨è¾¾å¼çš„页é¢" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "显示所有匹é…通é…符的页é¢" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "使得 --regex å’Œ --wildcard 仅匹é…页é¢å称，ä¸åŒ¹é…æè¿°ä¿¡æ¯" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "寻找所有匹é…的手册页" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "强制进行缓å˜ä¸€è‡´æ€§çš„检查" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "ä¸è¦å°è¯•å页é¢ï¼Œå¦‚“man foo bar†=> “man foo-barâ€" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "æŽ§åˆ¶æ ¼å¼åŒ–的输出：" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PAGER" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "使用 PAGER 程åºæ˜¾ç¤ºè¾“出文本" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "å—符串" # need-proofread -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "ç»™ less 分页器æ供一个æ示行" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "显示æŸäº› latin1 å—符的 ASCII 翻译形å¼" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "å…³é—è¿žå—符" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "ç¦æ¢ä¸¤ç«¯å¯¹é½" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -499,34 +499,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "使用 %s 对手册页排版" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "设备" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "使用 %s 的指定设备" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "æµè§ˆå™¨" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "使用 %s 或指定æµè§ˆå™¨æ˜¾ç¤º HTML 输出" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "分辨率" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -534,85 +534,85 @@ msgstr "" "使用 groff 并通过 gxditview (X11) æ¥æ˜¾ç¤ºï¼š\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "使用 groff å¹¶å¼ºåˆ¶å®ƒç”Ÿæˆ ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "没有 %s 的手册页æ¡ç›®\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "(æ¢å¥è¯é—®ï¼Œæ‚¨éœ€è¦ç¬¬ %s 节ä¸çš„什么手册页？)\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "您需è¦ä»€ä¹ˆæ‰‹å†Œé¡µï¼Ÿ\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "例如，å°è¯•ä½¿ç”¨â€œman manâ€ã€‚\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "在第 %2$s 节ä¸æ²¡æœ‰å…³äºŽ %1$s 的手册页æ¡ç›®ã€‚\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "当没有手册页时，å¯ä»¥ç”¨ %s 命令æ¥å¯»æ±‚帮助。\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "忽略未知的预处ç†å™¨ `%c'" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "æ— æ³•å°† %s 改å为 %s" # need-proofread -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "æ— æ³•è®¾å®š %s 文件的时间" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "æ— æ³•åˆ é™¤ (unlink) %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "æ— æ³•ä¸º %s 创建临时 cat 文件" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "æ— æ³•åˆ›å»ºä¸´æ—¶ç›®å½•" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "æ— æ³•æ‰“å¼€ä¸´æ—¶æ–‡ä»¶ %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "æ— æ³•ç§»é™¤ç›®å½• %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "--Man-- 下一页: %s [ 查看 (return) | 跳过 (Ctrl-D) | 退出 (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -621,23 +621,23 @@ msgstr "" "\n" "æ— æ³•åœ¨ catman 模å¼ä¸‹å¯¹ %s 写入" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "æ— æ³•æŠŠ %s 转æ¢ä¸º cat å称" # need-proofread -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s：ä¾èµ–于 whatis 引用是已被废弃的åšæ³•\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb 命令失败，退出状æ€ä»£ç 为 %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "内部错误：候选类型 %d 超出æ£å¸¸èŒƒå›´" @@ -645,7 +645,7 @@ msgstr "内部错误：候选类型 %d 超出æ£å¸¸èŒƒå›´" # I'm not sure this should be translated. It comes from a less prompt string # but seems to be only part of it. (Ming) # need-proofread -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " Manual page " @@ -661,7 +661,7 @@ msgstr "ç¼–ç " msgid "encoding for output" msgstr "输出文本所用的编ç " -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "åŽç¼€å" @@ -692,7 +692,7 @@ msgstr "必须使用 --suffix 或 --in-place 之一" msgid "--suffix and --in-place are mutually exclusive" msgstr "--suffix å’Œ --in-place 互斥" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "æ— æ³•ç§»é™¤ %s" @@ -719,68 +719,68 @@ msgstr "ç¼–ç [:...]" msgid "possible encodings of original text" msgstr "原始文本å¯èƒ½ä½¿ç”¨çš„ç¼–ç 列表" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[手册路径]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "安é™è¿è¡Œï¼Œé™¤ bogus è¦å‘Šå¤–ä¸è¾“出信æ¯" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "ä¸è¦å¯»æ‰¾æˆ–在数æ®åº“ä¸æ·»åŠ å¤ç«‹ cat 页é¢" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "ä¸è¦åˆ 除数æ®åº“ä¸è¿‡æ—¶çš„æ—§æ¡ç›®" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "仅生æˆç”¨æˆ·æ•°æ®åº“" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "ä¸æ›´æ–°æ•°æ®åº“，而是é‡æ–°åˆ›å»ºæ•°æ®åº“" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "检查手册页的æ£ç¡®æ€§" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "文件å" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "仅更新该文件å对应的æ¡ç›®" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "æ— æ³•å¯¹ %s 写入" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "æ— æ³•ä»Ž %s 读å–" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "æ£åœ¨å¤„ç† %s 下的手册页...\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "æ£åœ¨åˆ 除过时的 cat 目录 %s...\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "è¦å‘Šï¼šåœ¨ %s ä¸æ²¡æœ‰ MANDB_MAP 指令，使用您的手册路径设置" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" @@ -789,91 +789,91 @@ msgstr[0] "%d 个 man å目录包å«æ›´æ–°çš„手册页。\n" # I'm not sure this should be translated. It comes from a less prompt string # but seems to be only part of it. (Ming) # need-proofread -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "æ·»åŠ äº† %d 个手册页。\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "æ·»åŠ äº† %d 个å¤ç«‹ cat 页é¢ã€‚\n" # need-proofread -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "åˆ é™¤äº† %d æ¡æ—§æ•°æ®åº“æ¡ç›®ã€‚\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "未创建任何数æ®åº“。" -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "æ— æ³•ç†è§£æ‰‹å†Œè·¯å¾„设置文件 %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "è¦å‘Šï¼š%s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "è¦å‘Šï¼š%s ä¸æ˜¯ç›®å½•" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "è¦å‘Šï¼šæ²¡æœ‰è®¾å®š $PATH" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "è¦å‘Šï¼š$PATH 为空" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "è¦å‘Šï¼šå·²ç»è®¾å®šäº† $MANPATH，在å‰é¢åŠ 上 %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "è¦å‘Šï¼šå·²ç»è®¾å®šäº† $MANPATH，在åŽé¢åŠ 上 %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "è¦å‘Šï¼šå·²ç»è®¾å®šäº† $MANPATH，在其ä¸æ’å…¥ %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "è¦å‘Šï¼šå·²ç»è®¾å®šäº† $MANPATH，忽略 %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "æ— æ³•è§£æžç›®å½•åˆ—表“%sâ€" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "æ— æ³•æ‰“å¼€æ‰‹å†Œè·¯å¾„è®¾ç½®æ–‡ä»¶ %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "è¦å‘Šï¼šå¿…需的目录 %s ä¸å˜åœ¨" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "è¦å‘Šï¼š%s 并éžä»¥ %s 开始" @@ -886,114 +886,114 @@ msgstr "显示相对 cat 路径" msgid "show the entire global manpath" msgstr "显示整个全局手册路径" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "è¦å‘Šï¼šåœ¨è®¾ç½®æ–‡ä»¶ %s ä¸æ²¡æœ‰è®¾å®šå…¨å±€æ‰‹å†Œè·¯å¾„" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "æ£åœ¨ %s 下查找å¤ç«‹ cat 页é¢...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "è¦å‘Šï¼š%s 是悬空的符å·é“¾æŽ¥" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "æ— æ³•è§£æž %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "æ£åœ¨ %s 下查找å¤ç«‹ cat 页é¢...\n" - # need-proofread -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s 是指å‘自己的链接" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "关键è¯..." -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "é»˜è®¤å¼€å¯ --regex 选项。" -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "输出详细的è¦å‘Šä¿¡æ¯" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "把æ¯ä¸ªå…³é”®è¯éƒ½å½“作æ£åˆ™è¡¨è¾¾å¼è§£è¯»" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "对æ¯ä¸ªå…³é”®è¯éƒ½è¿›è¡Œä¸¥æ ¼åŒ¹é…çš„æœç´¢" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "关键è¯é‡ŒåŒ…å«é€šé…符" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "è¦æ±‚所有的关键è¯éƒ½åŒæ—¶åŒ¹é…" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "ä¸è¦æŠŠè¾“出按终端宽度截æ–" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "仅在这些分区ä¸æœç´¢ï¼ˆå†’å·åˆ†éš”）" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "定义本次æœç´¢æ‰€ä½¿ç”¨çš„区域设置" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s 什么？\n" # need-proofread -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "è¦å‘Šï¼š%s 包å«ä¸€ä¸ªæŒ‡é’ˆå›žçŽ¯" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "(未知的主题)" # partially-translated -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s：没有åˆé€‚结果。\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d：.so 请求嵌套太深或形æˆå¾ªçŽ¯" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d：è¦å‘Šï¼š.so 请求失败" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d：è¦å‘Šï¼š.so 请求ä¸å«æœ‰æ¢è¡Œç¬¦ï¼Œå°†å¿½ç•¥" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d：è¦å‘Šï¼š.lf 请求ä¸å«æœ‰æ¢è¡Œç¬¦ï¼Œå°†å¿½ç•¥" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d：roff 请求ä¸å«æœ‰æœªç»“æŸçš„引用" diff --git a/po/zh_TW.po b/po/zh_TW.po index 38072efa..5a071a6d 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: man-db 2.10.0-pre1\n" "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n" -"POT-Creation-Date: 2022-03-17 18:26+0000\n" +"POT-Creation-Date: 2022-10-15 13:22+0100\n" "PO-Revision-Date: 2022-01-26 08:37+0800\n" "Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n" "Language-Team: Chinese (traditional) <zh-l10n@lists.linux.org.tw>\n" @@ -19,7 +19,12 @@ msgstr "" "X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Poedit 3.0.1\n" -#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1154 +#: lib/filenames.c:50 src/straycats.c:131 src/straycats.c:150 +#, c-format +msgid "warning: %s: ignoring bogus filename" +msgstr "è¦å‘Šï¼š%s：忽略å‡æª”案å稱" + +#: lib/pathsearch.c:83 lib/pathsearch.c:133 src/manp.c:1155 #, c-format msgid "can't determine current directory" msgstr "無法確定目å‰çš„目錄" @@ -39,38 +44,38 @@ msgstr "æ¤ setuid man 使用者「%sã€ä¸å˜åœ¨" msgid "fatal: regex `%s': %s" msgstr "åš´é‡éŒ¯èª¤ï¼šæ£è¦è¡¨é”å¼ã€Œ%sã€ï¼š%s" -#: libdb/db_delete.c:108 +#: libdb/db_delete.c:109 #, c-format msgid "multi key %s does not exist" msgstr "多é‡æŒ‰éµ %s ä¸å˜åœ¨" -#: libdb/db_lookup.c:80 +#: libdb/db_lookup.c:81 #, c-format msgid "can't lock index cache %s" msgstr "ç„¡æ³•éŽ–å®šç´¢å¼•å¿«å– %s" -#: libdb/db_lookup.c:87 +#: libdb/db_lookup.c:88 #, c-format msgid "index cache %s corrupt" msgstr "ç´¢å¼•å¿«å– %s 失敗" -#: libdb/db_lookup.c:93 +#: libdb/db_lookup.c:94 #, c-format msgid "cannot replace key %s" msgstr "無法替æ›æŒ‰éµ %s" -#: libdb/db_lookup.c:191 libdb/db_lookup.c:202 +#: libdb/db_lookup.c:171 libdb/db_lookup.c:182 #, c-format msgid "only %d field in content" msgid_plural "only %d fields in content" msgstr[0] "內容ä¸åªæœ‰ %d 個欄ä½" -#: libdb/db_lookup.c:366 +#: libdb/db_lookup.c:355 #, c-format msgid "bad fetch on multi key %s" msgstr "多é‡æŒ‰éµ %s 上失敗的æå–" -#: libdb/db_lookup.c:451 src/whatis.c:705 +#: libdb/db_lookup.c:436 src/whatis.c:711 #, c-format msgid "Database %s corrupted; rebuild with mandb --create" msgstr "資料庫 %s æ壞；é€éŽ mandb --create é‡å»º" @@ -99,9 +104,9 @@ msgstr "[MAN 資料庫]" msgid "The man database defaults to %s%s." msgstr "man 資料庫é è¨å€¼è‡³ %s%s。" -#: src/accessdb.c:66 src/catman.c:105 src/globbing_test.c:62 -#: src/lexgrog_test.c:79 src/man.c:277 src/man-recode.c:118 -#: src/manconv_main.c:100 src/mandb.c:118 src/manpath.c:67 src/whatis.c:126 +#: src/accessdb.c:66 src/catman.c:106 src/globbing_test.c:62 +#: src/lexgrog_test.c:79 src/man.c:276 src/man-recode.c:118 +#: src/manconv_main.c:100 src/mandb.c:119 src/manpath.c:67 src/whatis.c:127 #: src/zsoelim_main.c:72 msgid "emit debugging messages" msgstr "發出åµéŒ¯è¨Šæ¯" @@ -111,39 +116,39 @@ msgstr "發出åµéŒ¯è¨Šæ¯" msgid "can't open %s for reading" msgstr "ç„¡æ³•è®€å– %s" -#: src/catman.c:102 +#: src/catman.c:103 msgid "[SECTION...]" msgstr "[ç« ç¯€â€¦]" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:107 src/man.c:305 src/whatis.c:141 msgid "PATH" msgstr "ä½ç½®" -#: src/catman.c:106 src/man.c:298 src/whatis.c:136 +#: src/catman.c:108 src/man.c:306 src/whatis.c:142 msgid "set search path for manual pages to PATH" msgstr "è¨å®šæ‰‹å†Šé é¢çš„æœå°‹è·¯å¾‘至 PATH" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:109 src/man.c:274 src/mandb.c:131 src/manpath.c:69 +#: src/whatis.c:145 msgid "FILE" msgstr "檔案" -#: src/catman.c:107 src/man.c:276 src/mandb.c:126 src/manpath.c:69 -#: src/whatis.c:138 +#: src/catman.c:110 src/man.c:275 src/mandb.c:132 src/manpath.c:70 +#: src/whatis.c:146 msgid "use this user configuration file" msgstr "使用這個使用者è¨å®šæª”" -#: src/catman.c:199 +#: src/catman.c:202 #, c-format msgid "man command failed with exit status %d" msgstr "man 指令錯誤，離開代碼 %d" -#: src/catman.c:275 +#: src/catman.c:279 #, c-format msgid "NULL content for key: %s" msgstr "金鑰的空內容：%s" -#: src/catman.c:296 +#: src/catman.c:300 #, c-format msgid "" "\n" @@ -152,138 +157,133 @@ msgstr "" "\n" "æ›´æ–° man 層次çµæ§‹ %2$s 的第 %1$s 部份的 cat 檔案\n" -#: src/catman.c:348 +#: src/catman.c:350 #, c-format msgid "cannot write within %s" msgstr "無法在 %s ä¸å¯«å…¥" -#: src/catman.c:415 +#: src/catman.c:417 #, c-format msgid "cannot read database %s" msgstr "無法讀å–資料庫 %s" -#: src/catman.c:431 +#: src/catman.c:433 #, c-format msgid "unable to update %s" msgstr "無法更新 %s" -#: src/check_mandirs.c:108 +#: src/check_mandirs.c:109 #, c-format msgid "warning: %s/man%s/%s.%s*: competing extensions" msgstr "è¦å‘Šï¼š%s/man%s/%s.%s*：競çˆæ“´å±• (competing extensions)" -#: src/check_mandirs.c:134 +#: src/check_mandirs.c:135 #, c-format msgid "can't update index cache %s" msgstr "ç„¡æ³•æ›´æ–°ç´¢å¼•å¿«å– %s" -#: src/check_mandirs.c:273 +#: src/check_mandirs.c:230 #, c-format msgid "warning: %s: bad symlink or ROFF `.so' request" msgstr "è¦å‘Šï¼š%s：æ壞的符號連çµæˆ– ROFF `.so' 請求" -#: src/check_mandirs.c:329 +#: src/check_mandirs.c:295 #, c-format msgid "warning: %s: ignoring empty file" msgstr "è¦å‘Šï¼š%s：忽略空檔案" -#: src/check_mandirs.c:333 src/straycats.c:272 +#: src/check_mandirs.c:299 src/straycats.c:263 #, c-format msgid "warning: %s: whatis parse for %s(%s) failed" msgstr "è¦å‘Šï¼š%s：為 %s(%s) çš„ whatis 解æžå¤±æ•—" -#: src/check_mandirs.c:361 src/check_mandirs.c:531 src/mandb.c:891 -#: src/straycats.c:92 src/straycats.c:299 src/ult_src.c:84 +#: src/check_mandirs.c:327 src/check_mandirs.c:497 src/mandb.c:952 +#: src/straycats.c:93 src/straycats.c:291 src/ult_src.c:99 #, c-format msgid "can't search directory %s" msgstr "無法æœå°‹è·¯å¾‘ %s" -#: src/check_mandirs.c:410 src/man.c:1726 +#: src/check_mandirs.c:376 src/man.c:1741 #, c-format msgid "can't chown %s" msgstr "無法 chown %s" -#: src/check_mandirs.c:432 src/check_mandirs.c:455 +#: src/check_mandirs.c:398 src/check_mandirs.c:421 #, c-format msgid "warning: cannot create catdir %s" msgstr "è¦å‘Šï¼šç„¡æ³•å»ºç«‹ catdir %s" -#: src/check_mandirs.c:487 src/man.c:1738 src/mandb.c:236 +#: src/check_mandirs.c:453 src/man.c:1753 src/mandb.c:242 #, c-format msgid "can't chmod %s" msgstr "無法 chmod %s" -#: src/check_mandirs.c:536 +#: src/check_mandirs.c:502 #, c-format msgid "can't change to directory %s" msgstr "無法切æ›è‡³ç›®éŒ„ %s" -#: src/check_mandirs.c:584 +#: src/check_mandirs.c:550 #, c-format msgid "can't create index cache %s" msgstr "ç„¡æ³•å»ºç«‹ç´¢å¼•å¿«å– %s" -#: src/check_mandirs.c:605 +#: src/check_mandirs.c:571 #, c-format msgid "Updating index cache for path `%s/%s'. Wait..." msgstr "æ£åœ¨ç‚ºè·¯å¾‘「%s/%sã€æ›´æ–°ç´¢å¼•å¿«å–。請ç‰å¾……" -#: src/check_mandirs.c:631 src/check_mandirs.c:687 +#: src/check_mandirs.c:597 src/check_mandirs.c:653 msgid "done.\n" msgstr "完æˆã€‚\n" -#: src/check_mandirs.c:956 +#: src/check_mandirs.c:918 #, c-format msgid "Purging old database entries in %s...\n" msgstr "æ£åœ¨æ¸…除 %s ä¸çš„èˆŠè³‡æ–™åº«é …ç›®â€¦\n" -#: src/descriptions_store.c:58 +#: src/descriptions_store.c:62 #, c-format msgid "warning: failed to store entry for %s(%s)" msgstr "è¦å‘Šï¼šç„¡æ³•ç‚º %s(%s) 儲å˜é …ç›®" -#: src/filenames.c:52 src/straycats.c:130 src/straycats.c:150 -#, c-format -msgid "warning: %s: ignoring bogus filename" -msgstr "è¦å‘Šï¼š%s：忽略å‡æª”案å稱" - #: src/globbing_test.c:59 msgid "PATH SECTION NAME" msgstr "路徑部份å稱" -#: src/globbing_test.c:63 src/man.c:301 +#: src/globbing_test.c:63 src/man.c:310 msgid "EXTENSION" msgstr "EXTENSION" -#: src/globbing_test.c:63 src/man.c:302 +#: src/globbing_test.c:64 src/man.c:311 msgid "limit search to extension type EXTENSION" msgstr "é™åˆ¶æœå°‹æ“´å……元件類型 EXTENSION" -#: src/globbing_test.c:64 src/man.c:303 +#: src/globbing_test.c:66 src/man.c:313 msgid "look for pages case-insensitively (default)" msgstr "ä¸å€åˆ†å¤§å°å¯«æœå°‹é é¢ï¼ˆé è¨ï¼‰" -#: src/globbing_test.c:65 src/man.c:304 +#: src/globbing_test.c:67 src/man.c:314 msgid "look for pages case-sensitively" msgstr "å€åˆ†å¤§å°å¯«æœå°‹é é¢" -#: src/globbing_test.c:66 +#: src/globbing_test.c:68 msgid "interpret page name as a regex" msgstr "å°‡é é¢å稱解釋為æ£è¦è¡¨é”å¼" -#: src/globbing_test.c:67 +#: src/globbing_test.c:69 msgid "the page name contains wildcards" msgstr "é é¢åç¨±åŒ…å« Wildcard" -#: src/lexgrog.l:725 +#: src/lexgrog.l:726 #, c-format msgid "warning: whatis for %s exceeds %d byte, truncating." msgid_plural "warning: whatis for %s exceeds %d bytes, truncating." msgstr[0] "è¦å‘Šï¼šç‚º %s çš„ whatis 超出 %d ä½å…ƒçµ„，æ£åœ¨æˆªæ–·ã€‚" -#: src/lexgrog.l:887 src/man.c:2315 src/man.c:2401 src/man.c:2499 +#: src/lexgrog.l:888 src/man.c:2330 src/man.c:2416 src/man.c:2514 #: src/man-recode.c:184 src/man-recode.c:209 src/manconv_main.c:164 -#: src/straycats.c:212 src/ult_src.c:325 src/ult_src.c:339 src/zsoelim.l:529 +#: src/straycats.c:210 src/ult_src.c:158 src/zsoelim.l:532 #, c-format msgid "can't open %s" msgstr "無法開啟 %s" @@ -308,19 +308,19 @@ msgstr "解æžç‚º cat é é¢" msgid "show whatis information" msgstr "顯示 whatis 資訊" -#: src/lexgrog_test.c:83 +#: src/lexgrog_test.c:84 msgid "show guessed series of preprocessing filters" msgstr "顯示猜測的一系列é 先處ç†ç¯©é¸å™¨" -#: src/lexgrog_test.c:84 src/man.c:293 src/man.c:318 +#: src/lexgrog_test.c:85 src/man.c:297 src/man.c:335 msgid "ENCODING" msgstr "編碼ä¸" -#: src/lexgrog_test.c:84 src/man.c:318 +#: src/lexgrog_test.c:86 src/man.c:336 msgid "use selected output encoding" msgstr "使用é¸æ“‡çš„輸出編碼" -#: src/lexgrog_test.c:128 src/man.c:549 src/man.c:558 +#: src/lexgrog_test.c:130 src/man.c:570 src/man.c:579 #, c-format msgid "%s: incompatible options" msgstr "%s：ä¸ç›¸å®¹é¸é …" @@ -330,7 +330,7 @@ msgstr "%s：ä¸ç›¸å®¹é¸é …" msgid "command exited with status %d: %s" msgstr "指令離開，回傳代碼 %d：%s" -#: src/man.c:260 +#: src/man.c:258 msgid "[SECTION] PAGE..." msgstr "[ç« ç¯€] é é¢â€¦" @@ -342,131 +342,131 @@ msgstr "é‡è¨æ‰€æœ‰è¨å®šè‡³ä»–們的é è¨å€¼" msgid "WARNINGS" msgstr "è¦å‘Š" -#: src/man.c:280 +#: src/man.c:281 msgid "enable warnings from groff" msgstr "啟用來自 groff çš„è¦å‘Š" -#: src/man.c:282 +#: src/man.c:283 msgid "Main modes of operation:" msgstr "動作主è¦æ¨¡å¼ï¼š" -#: src/man.c:283 +#: src/man.c:284 msgid "equivalent to whatis" msgstr "相當於 whatis" -#: src/man.c:284 +#: src/man.c:285 msgid "equivalent to apropos" msgstr "相當於 apropos" -#: src/man.c:285 +#: src/man.c:286 msgid "search for text in all pages" msgstr "在所有é é¢ä¸æœå°‹æ–‡å—" -#: src/man.c:286 +#: src/man.c:287 msgid "print physical location of man page(s)" msgstr "顯示 man é é¢çš„物ç†ä½ç½®" -#: src/man.c:289 +#: src/man.c:291 msgid "print physical location of cat file(s)" msgstr "顯示 cat 檔案的物ç†ä½ç½®" -#: src/man.c:291 +#: src/man.c:294 msgid "interpret PAGE argument(s) as local filename(s)" msgstr "è§£è¯ PAGE åƒæ•¸ç‚ºæœ¬æ©Ÿæª”案å稱" -#: src/man.c:292 +#: src/man.c:296 msgid "used by catman to reformat out of date cat pages" msgstr "catman 使用其é‡æ–°æ ¼å¼åŒ–éŽæœŸçš„ cat é é¢" -#: src/man.c:293 +#: src/man.c:298 msgid "output source page encoded in ENCODING" msgstr "在 ENCODING ä¸ç·¨ç¢¼è¼¸å‡ºåŽŸå§‹é é¢" -#: src/man.c:295 +#: src/man.c:300 msgid "Finding manual pages:" msgstr "æ£åœ¨æœå°‹æ‰‹å†Šé é¢ï¼š" -#: src/man.c:296 src/whatis.c:137 +#: src/man.c:301 src/whatis.c:143 msgid "LOCALE" msgstr "語系" -#: src/man.c:296 +#: src/man.c:302 msgid "define the locale for this particular man search" msgstr "為æ¤ç‰¹å®šçš„ man æœå°‹å®šç¾©èªžè¨€" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:303 src/manpath.c:71 src/whatis.c:139 msgid "SYSTEM" msgstr "系統" -#: src/man.c:297 src/manpath.c:70 src/whatis.c:135 +#: src/man.c:304 src/manpath.c:72 src/whatis.c:140 msgid "use manual pages from other systems" msgstr "從系統系統使用手冊é é¢" -#: src/man.c:299 src/whatis.c:133 +#: src/man.c:307 src/whatis.c:136 msgid "LIST" msgstr "列表" -#: src/man.c:299 +#: src/man.c:308 msgid "use colon separated section list" msgstr "使用冒號分隔的部分列表" -#: src/man.c:305 +#: src/man.c:315 msgid "show all pages matching regex" msgstr "é¡¯ç¤ºæ‰€æœ‰ç¬¦åˆ regex çš„é é¢" -#: src/man.c:306 +#: src/man.c:317 msgid "show all pages matching wildcard" msgstr "é¡¯ç¤ºæ‰€æœ‰ç¬¦åˆ wildcard çš„é é¢" -#: src/man.c:307 +#: src/man.c:319 msgid "make --regex and --wildcard match page names only, not descriptions" msgstr "令 --regex å’Œ --wildcard åªç¬¦åˆé é¢å稱，而ä¸åŒ…å«ä»‹ç´¹" -#: src/man.c:309 +#: src/man.c:322 msgid "find all matching manual pages" msgstr "æœå°‹æ‰€æœ‰ç¬¦åˆçš„手冊é é¢" -#: src/man.c:310 +#: src/man.c:323 msgid "force a cache consistency check" msgstr "強制快å–一致性檢查" -#: src/man.c:312 +#: src/man.c:325 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'" msgstr "ä¸è¦å˜—試åé é¢ï¼Œä¾‹å¦‚「man foo barã€=>「man foo-barã€" -#: src/man.c:314 +#: src/man.c:328 msgid "Controlling formatted output:" msgstr "æŽ§åˆ¶æ ¼å¼åŒ–輸出：" -#: src/man.c:315 +#: src/man.c:329 msgid "PAGER" msgstr "PAGER" -#: src/man.c:315 +#: src/man.c:330 msgid "use program PAGER to display output" msgstr "使用 PAGER 程å¼é¡¯ç¤ºè¼¸å‡º" -#: src/man.c:316 src/man.c:325 +#: src/man.c:331 src/man.c:343 msgid "STRING" msgstr "å—串" -#: src/man.c:316 +#: src/man.c:332 msgid "provide the `less' pager with a prompt" msgstr "æ供「較少的ã€pager æ示" -#: src/man.c:317 +#: src/man.c:334 msgid "display ASCII translation of certain latin1 chars" msgstr "顯示æŸäº› latin1 å—元的 ASCII 轉æ›" -#: src/man.c:320 +#: src/man.c:338 msgid "turn off hyphenation" msgstr "關閉斷å—" -#: src/man.c:323 +#: src/man.c:341 msgid "turn off justification" msgstr "關閉ç†ç”± (justification)" -#: src/man.c:325 +#: src/man.c:344 msgid "" "STRING indicates which preprocessors to run:\n" "e - [n]eqn, p - pic, t - tbl,\n" @@ -476,34 +476,34 @@ msgstr "" "e - [n]eqn, p - pic, t - tbl,\n" "g - grap, r - refer, v - vgrind" -#: src/man.c:329 +#: src/man.c:348 #, c-format msgid "use %s to format pages" msgstr "使用 %s æ ¼å¼åŒ–é é¢" -#: src/man.c:330 +#: src/man.c:349 msgid "DEVICE" msgstr "è£ç½®" -#: src/man.c:331 +#: src/man.c:350 #, c-format msgid "use %s with selected device" msgstr "é€éŽé¸å–çš„è£ç½®ä½¿ç”¨ %s" -#: src/man.c:332 +#: src/man.c:351 msgid "BROWSER" msgstr "ç€è¦½å™¨" -#: src/man.c:333 +#: src/man.c:353 #, c-format msgid "use %s or BROWSER to display HTML output" msgstr "使用 %s 或ç€è¦½å™¨é¡¯ç¤º HTML 輸出" -#: src/man.c:334 +#: src/man.c:354 msgid "RESOLUTION" msgstr "解æžåº¦" -#: src/man.c:336 +#: src/man.c:356 msgid "" "use groff and display through gxditview (X11):\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" @@ -511,84 +511,84 @@ msgstr "" "é€éŽ gxditview (X11) 使用 groff 和顯示：\n" "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12" -#: src/man.c:338 +#: src/man.c:359 msgid "use groff and force it to produce ditroff" msgstr "使用 groff 並強制其產生 ditroff" -#: src/man.c:608 src/man.c:745 +#: src/man.c:629 src/man.c:774 #, c-format msgid "No manual entry for %s\n" msgstr "沒有 %s çš„æ‰‹å†Šé …ç›®\n" -#: src/man.c:610 +#: src/man.c:631 #, c-format msgid "(Alternatively, what manual page do you want from section %s?)\n" msgstr "（或者，您想從第 %s ç« ç¯€ä¸é¸æ“‡å“ªå€‹æ‰‹å†Šé é¢ï¼Ÿï¼‰\n" -#: src/man.c:614 +#: src/man.c:635 msgid "What manual page do you want?\n" msgstr "ä½ æƒ³è¦ä»€éº¼æ‰‹å†Šï¼Ÿ\n" -#: src/man.c:615 +#: src/man.c:636 msgid "For example, try 'man man'.\n" msgstr "例如：執行「man manã€ã€‚\n" -#: src/man.c:742 +#: src/man.c:771 #, c-format msgid "No manual entry for %s in section %s\n" msgstr "%2$s 部份ä¸æ²’有 %1$s çš„æ‰‹å†Šé …ç›®\n" -#: src/man.c:751 +#: src/man.c:780 #, c-format msgid "See '%s' for help when manual pages are not available.\n" msgstr "當說明書ä¸å¯ç”¨æ™‚，查看「%sã€å–得說明。\n" -#: src/man.c:1359 +#: src/man.c:1383 #, c-format msgid "ignoring unknown preprocessor `%c'" msgstr "忽略未知的é 處ç†æ©Ÿã€Œ%cã€" -#: src/man.c:1749 src/man-recode.c:251 src/mandb.c:227 +#: src/man.c:1764 src/man-recode.c:251 src/mandb.c:233 #, c-format msgid "can't rename %s to %s" msgstr "無法é‡æ–°å‘½å %s 至 %s" -#: src/man.c:1766 +#: src/man.c:1781 #, c-format msgid "can't set times on %s" msgstr "無法在 %s 上è¨å®šæ™‚é–“" -#: src/man.c:1775 src/man.c:1812 +#: src/man.c:1790 src/man.c:1827 #, c-format msgid "can't unlink %s" msgstr "ç„¡æ³•è§£é™¤é€£çµ %s" -#: src/man.c:1842 +#: src/man.c:1857 #, c-format msgid "can't create temporary cat for %s" msgstr "無法為 %s å»ºç«‹æš«å˜ cat" -#: src/man.c:1954 +#: src/man.c:1969 #, c-format msgid "can't create temporary directory" msgstr "無法建立暫å˜ç›®éŒ„" -#: src/man.c:1965 src/man-recode.c:217 +#: src/man.c:1980 src/man-recode.c:217 #, c-format msgid "can't open temporary file %s" msgstr "無法開啟暫å˜æª”案 %s" -#: src/man.c:1995 src/man.c:2026 +#: src/man.c:2010 src/man.c:2041 #, c-format msgid "can't remove directory %s" msgstr "無法移除目錄 %s" -#: src/man.c:2157 +#: src/man.c:2172 #, c-format msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n" msgstr "--Man-- 下一個：%s [ 顯示 (return) | è·³éŽ (Ctrl-D) | 離開 (Ctrl-C) ]\n" -#: src/man.c:2444 +#: src/man.c:2459 #, c-format msgid "" "\n" @@ -597,27 +597,27 @@ msgstr "" "\n" "無法在 catman 模å¼å¯«è‡³ %s" -#: src/man.c:2524 +#: src/man.c:2539 #, c-format msgid "Can't convert %s to cat name" msgstr "ç„¡æ³•è½‰æ› %s 至 cat å稱" -#: src/man.c:3296 +#: src/man.c:3306 #, c-format msgid "%s: relying on whatis refs is deprecated\n" msgstr "%s：ä¾é whatis çš„åƒè€ƒå·²ç¶“放棄\n" -#: src/man.c:3439 src/man.c:4297 +#: src/man.c:3447 src/man.c:4302 #, c-format msgid "mandb command failed with exit status %d" msgstr "mandb 指令執行失敗，回傳代碼 %d" -#: src/man.c:3637 +#: src/man.c:3645 #, c-format msgid "internal error: candidate type %d out of range" msgstr "內部錯誤：候é¸é¡žåž‹ %d 超出範åœ" -#: src/man.c:4240 +#: src/man.c:4245 msgid " Manual page " msgstr " 手冊é é¢ " @@ -633,7 +633,7 @@ msgstr "CODE" msgid "encoding for output" msgstr "輸出編碼" -#: src/man-recode.c:115 +#: src/man-recode.c:114 msgid "SUFFIX" msgstr "後綴" @@ -664,7 +664,7 @@ msgstr "--suffix 或 --in-place å¿…é ˆä»»é¸å…¶ä¸€" msgid "--suffix and --in-place are mutually exclusive" msgstr "--suffix å’Œ --in-place 互斥" -#: src/man-recode.c:257 src/mandb.c:220 +#: src/man-recode.c:257 src/mandb.c:226 #, c-format msgid "can't remove %s" msgstr "無法移除 %s" @@ -690,157 +690,157 @@ msgstr "CODE[:...]" msgid "possible encodings of original text" msgstr "原始文å—çš„å¯èƒ½ç·¨ç¢¼æ–¹å¼" -#: src/mandb.c:115 +#: src/mandb.c:116 msgid "[MANPATH]" msgstr "[MANPATH]" -#: src/mandb.c:119 +#: src/mandb.c:120 msgid "work quietly, except for 'bogus' warning" msgstr "安éœçš„執行，除了「bogusã€è¦å‘Š" -#: src/mandb.c:120 +#: src/mandb.c:122 msgid "don't look for or add stray cats to the dbs" msgstr "ä¸è¦å°‹æ‰¾æˆ–å¢žåŠ stray cats 至資料庫" -#: src/mandb.c:121 +#: src/mandb.c:124 msgid "don't purge obsolete entries from the dbs" msgstr "ä¸è¦å¾žè³‡æ–™åº«æ¸…除éŽæœŸçš„é …ç›®" -#: src/mandb.c:122 +#: src/mandb.c:125 msgid "produce user databases only" msgstr "åªç”¢ç”Ÿä½¿ç”¨è€…資料庫" -#: src/mandb.c:123 +#: src/mandb.c:127 msgid "create dbs from scratch, rather than updating" msgstr "從é 建立資料庫，而ä¸æ˜¯å‡ç´š" -#: src/mandb.c:124 +#: src/mandb.c:128 msgid "check manual pages for correctness" msgstr "檢查手冊é é¢çš„æ£ç¢ºæ€§" -#: src/mandb.c:125 +#: src/mandb.c:129 msgid "FILENAME" msgstr "檔案å稱" -#: src/mandb.c:125 +#: src/mandb.c:130 msgid "update just the entry for this filename" msgstr "åªæ›´æ–°æ¤æª”案åç¨±çš„é …ç›®" -#: src/mandb.c:284 +#: src/mandb.c:290 #, c-format msgid "can't write to %s" msgstr "無法寫至 %s" -#: src/mandb.c:289 +#: src/mandb.c:295 #, c-format msgid "can't read from %s" msgstr "無法從 %s 讀å–" -#: src/mandb.c:560 +#: src/mandb.c:625 #, c-format msgid "Processing manual pages under %s...\n" msgstr "æ£åœ¨ %s 底下處ç†æ‰‹å†Šé é¢â€¦\n" -#: src/mandb.c:680 src/mandb.c:708 +#: src/mandb.c:745 src/mandb.c:773 #, c-format msgid "Removing obsolete cat directory %s...\n" msgstr "移除éŽæ™‚çš„ cat 路徑 %s…\n" -#: src/mandb.c:858 +#: src/mandb.c:919 #, c-format msgid "warning: no MANDB_MAP directives in %s, using your manpath" msgstr "è¦å‘Šï¼š%s ä¸æ²’有 MANDB_MAP 指令，使用您的 manpath" -#: src/mandb.c:926 +#: src/mandb.c:988 #, c-format msgid "%d man subdirectory contained newer manual pages.\n" msgid_plural "%d man subdirectories contained newer manual pages.\n" msgstr[0] "%d 個 man å目錄包å«äº†è¼ƒæ–°çš„手冊é é¢\n" -#: src/mandb.c:931 +#: src/mandb.c:993 #, c-format msgid "%d manual page was added.\n" msgid_plural "%d manual pages were added.\n" msgstr[0] "åŠ å…¥äº† %d 個手冊é é¢\n" -#: src/mandb.c:935 +#: src/mandb.c:997 #, c-format msgid "%d stray cat was added.\n" msgid_plural "%d stray cats were added.\n" msgstr[0] "åŠ å…¥äº† %d 個 stray cat\n" -#: src/mandb.c:940 +#: src/mandb.c:1002 #, c-format msgid "%d old database entry was purged.\n" msgid_plural "%d old database entries were purged.\n" msgstr[0] "清除了 %d å€‹èˆŠè³‡æ–™åº«é …ç›®ã€‚\n" -#: src/mandb.c:958 +#: src/mandb.c:1020 #, c-format msgid "No databases created." msgstr "未建立資料庫" -#: src/manp.c:328 +#: src/manp.c:329 #, c-format msgid "can't make sense of the manpath configuration file %s" msgstr "無法åˆç†åŒ– manpath è¨å®šæª” %s" -#: src/manp.c:334 +#: src/manp.c:335 #, c-format msgid "warning: %s" msgstr "è¦å‘Šï¼š%s" -#: src/manp.c:340 +#: src/manp.c:341 #, c-format msgid "warning: %s isn't a directory" msgstr "è¦å‘Šï¼š%s ä¸æ˜¯ç›®éŒ„" -#: src/manp.c:671 +#: src/manp.c:672 #, c-format msgid "warning: $PATH not set" msgstr "è¦å‘Šï¼šæœªè¨å®š $PATH" -#: src/manp.c:678 +#: src/manp.c:679 #, c-format msgid "warning: empty $PATH" msgstr "è¦å‘Šï¼šç©º $PATH" -#: src/manp.c:706 +#: src/manp.c:707 #, c-format msgid "warning: $MANPATH set, prepending %s" msgstr "è¦å‘Šï¼šå·²è¨å®š $MANPATH，æ£åœ¨å‰é¢åŠ 上 %s" -#: src/manp.c:717 +#: src/manp.c:718 #, c-format msgid "warning: $MANPATH set, appending %s" msgstr "è¦å‘Šï¼šå·²è¨å®š $MANPATH，æ£åœ¨å¢žåŠ %s" -#: src/manp.c:729 +#: src/manp.c:730 #, c-format msgid "warning: $MANPATH set, inserting %s" msgstr "è¦å‘Šï¼šå·²è¨å®š $MANPATH，æ£åœ¨æ’å…¥ %s" -#: src/manp.c:743 +#: src/manp.c:744 #, c-format msgid "warning: $MANPATH set, ignoring %s" msgstr "è¦å‘Šï¼šå·²è¨å®š $MANPATH，æ£åœ¨å¿½ç•¥ %s" -#: src/manp.c:805 +#: src/manp.c:806 #, c-format msgid "can't parse directory list `%s'" msgstr "無法解æžç›®éŒ„列表「%sã€" -#: src/manp.c:860 +#: src/manp.c:861 #, c-format msgid "can't open the manpath configuration file %s" msgstr "無法開啟 manpath è¨å®šæª” %s" -#: src/manp.c:897 +#: src/manp.c:898 #, c-format msgid "warning: mandatory directory %s doesn't exist" msgstr "è¦å‘Šï¼šå¼·åˆ¶æ€§ç›®éŒ„ %s ä¸å˜åœ¨" -#: src/manp.c:1341 +#: src/manp.c:1342 #, c-format msgid "warning: %s does not begin with %s" msgstr "è¦å‘Šï¼š%s 未以 %s é–‹é " @@ -853,111 +853,111 @@ msgstr "顯示相å°çš„ catpath" msgid "show the entire global manpath" msgstr "顯示整個全域 manpath" -#: src/manpath.c:128 +#: src/manpath.c:130 #, c-format msgid "warning: no global manpaths set in config file %s" msgstr "è¦å‘Šï¼šæ²’有在è¨å®šæª” %s è¨å®šå…¨åŸŸ manpath" -#: src/straycats.c:242 src/ult_src.c:128 +#: src/straycats.c:296 +#, c-format +msgid "Checking for stray cats under %s...\n" +msgstr "æ£åœ¨ %s 底下檢查 stray cats ...\n" + +#: src/ult_src.c:74 #, c-format msgid "warning: %s is a dangling symlink" msgstr "è¦å‘Šï¼š%s 為懸掛的符號連çµ" -#: src/straycats.c:245 src/ult_src.c:131 src/ult_src.c:267 +#: src/ult_src.c:77 src/ult_src.c:272 src/ult_src.c:372 #, c-format msgid "can't resolve %s" msgstr "ç„¡æ³•è§£æž %s" -#: src/straycats.c:304 -#, c-format -msgid "Checking for stray cats under %s...\n" -msgstr "æ£åœ¨ %s 底下檢查 stray cats ...\n" - -#: src/ult_src.c:305 +#: src/ult_src.c:431 #, c-format msgid "%s is self referencing" msgstr "%s 為自我åƒè€ƒ" -#: src/whatis.c:122 +#: src/whatis.c:123 msgid "KEYWORD..." msgstr "é—œéµå—…" -#: src/whatis.c:123 +#: src/whatis.c:124 msgid "The --regex option is enabled by default." msgstr "é è¨å€¼å•Ÿç”¨äº† --regex é¸é …。" -#: src/whatis.c:127 +#: src/whatis.c:128 msgid "print verbose warning messages" msgstr "顯示詳細的è¦å‘Šè¨Šæ¯" -#: src/whatis.c:128 +#: src/whatis.c:129 msgid "interpret each keyword as a regex" msgstr "å°‡æ¯å€‹é—œéµå—解釋為æ£è¦è¡¨é”å¼" -#: src/whatis.c:129 +#: src/whatis.c:131 msgid "search each keyword for exact match" msgstr "精確æœå°‹æ¯å€‹é—œéµå—" -#: src/whatis.c:130 +#: src/whatis.c:132 msgid "the keyword(s) contain wildcards" msgstr "æ¤é—œéµå—åŒ…å« Wildcard" -#: src/whatis.c:131 +#: src/whatis.c:134 msgid "require all keywords to match" msgstr "需è¦ç¬¦åˆæ‰€æœ‰é—œéµå—" -#: src/whatis.c:132 +#: src/whatis.c:135 msgid "do not trim output to terminal width" msgstr "ä¸ä¾çµ‚端器寬度è£åˆ‡è¼¸å‡º" -#: src/whatis.c:133 +#: src/whatis.c:137 msgid "search only these sections (colon-separated)" msgstr "åªæœå°‹é€™äº›éƒ¨ä»½ï¼ˆä»¥å†’號分隔）" -#: src/whatis.c:137 +#: src/whatis.c:144 msgid "define the locale for this search" msgstr "為這個æœå°‹å®šç¾©èªžè¨€" -#: src/whatis.c:234 +#: src/whatis.c:242 #, c-format msgid "%s what?\n" msgstr "%s 什麼？\n" -#: src/whatis.c:378 src/whatis.c:396 +#: src/whatis.c:386 src/whatis.c:404 #, c-format msgid "warning: %s contains a pointer loop" msgstr "è¦å‘Šï¼š%s 包å«äº†éžè¿´æŒ‡æ¨™" -#: src/whatis.c:390 src/whatis.c:398 +#: src/whatis.c:398 src/whatis.c:406 msgid "(unknown subject)" msgstr "（未知主旨）" -#: src/whatis.c:831 +#: src/whatis.c:836 #, c-format msgid "%s: nothing appropriate.\n" msgstr "%s：什麼都ä¸é©åˆã€‚\n" -#: src/zsoelim.l:183 +#: src/zsoelim.l:186 #, c-format msgid "%s:%d: .so requests nested too deeply or are recursive" msgstr "%s:%d：.so 請求巢狀éŽæ·±æˆ–éžè¿´" -#: src/zsoelim.l:198 +#: src/zsoelim.l:201 #, c-format msgid "%s:%d: warning: failed .so request" msgstr "%s:%d：è¦å‘Šï¼šå¤±æ•—çš„ .so 請求" -#: src/zsoelim.l:220 +#: src/zsoelim.l:223 #, c-format msgid "%s:%d: warning: newline in .so request, ignoring" msgstr "%s:%d：è¦å‘Šï¼šæ›è¡Œç¬¦è™Ÿåœ¨ .so 請求ä¸ï¼Œæ£åœ¨å¿½ç•¥" -#: src/zsoelim.l:290 +#: src/zsoelim.l:293 #, c-format msgid "%s:%d: warning: newline in .lf request, ignoring" msgstr "%s:%d：è¦å‘Šï¼šæ›è¡Œç¬¦è™Ÿåœ¨ .If 請求ä¸ï¼Œæ£åœ¨å¿½ç•¥" -#: src/zsoelim.l:330 +#: src/zsoelim.l:333 #, c-format msgid "%s:%d: unterminated quote in roff request" msgstr "%s:%d：roff 請求ä¸æœªçµ‚æ¢çš„引用" diff --git a/src/Makefile.am b/src/Makefile.am index 7d4a398b..fbeccf4b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -64,7 +64,7 @@ catman_LDADD = $(LIBMANDB) $(libpipeline_LIBS) globbing_LDADD = $(LIBMAN) lexgrog_LDADD = $(LIBMAN) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) man_LDADD = $(LIBMANDB) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) -man_recode_LDADD = $(LIBMANDB) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) +man_recode_LDADD = $(LIBMAN) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) manconv_LDADD = $(LIBMAN) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) mandb_LDADD = $(LIBMANDB) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) manpath_LDADD = $(LIBMAN) @@ -84,16 +84,12 @@ globbing_SOURCES = \ globbing.h \ globbing_test.c lexgrog_SOURCES = \ - compression.c \ - compression.h \ convert.c \ convert.h \ decompress.c \ decompress.h \ descriptions.c \ descriptions.h \ - filenames.c \ - filenames.h \ globbing.c \ globbing.h \ lexgrog.h \ @@ -108,12 +104,8 @@ lexgrog_SOURCES = \ utf8.c \ utf8.h man_SOURCES = \ - compression.c \ - compression.h \ decompress.c \ decompress.h \ - filenames.c \ - filenames.h \ globbing.c \ globbing.h \ man.c \ @@ -130,8 +122,6 @@ man_SOURCES = \ zsoelim.h \ zsoelim.l man_recode_SOURCES = \ - compression.c \ - compression.h \ decompress.c \ decompress.h \ man-recode.c \ @@ -150,15 +140,11 @@ manconv_SOURCES = \ mandb_SOURCES = \ check_mandirs.c \ check_mandirs.h \ - compression.c \ - compression.h \ decompress.c \ decompress.h \ descriptions.c \ descriptions.h \ descriptions_store.c \ - filenames.c \ - filenames.h \ globbing.c \ globbing.h \ lexgrog.h \ @@ -212,12 +198,12 @@ all-am: apropos$(EXEEXT) install-exec-hook: if [ "$(man_owner)" ] && [ "$(man_mode)" = 6755 ]; then \ chown $(man_owner):$(man_owner) \ - $(DESTDIR)$(bindir)/$(TRANS_MAN) \ - $(DESTDIR)$(bindir)/$(TRANS_MANDB); \ + $(DESTDIR)$(bindir)/$(TRANS_MAN)$(EXEEXT) \ + $(DESTDIR)$(bindir)/$(TRANS_MANDB)$(EXEEXT); \ fi chmod $(man_mode) \ - $(DESTDIR)$(bindir)/$(TRANS_MAN) \ - $(DESTDIR)$(bindir)/$(TRANS_MANDB) + $(DESTDIR)$(bindir)/$(TRANS_MAN)$(EXEEXT) \ + $(DESTDIR)$(bindir)/$(TRANS_MANDB)$(EXEEXT) cd $(DESTDIR)$(bindir) && rm -f $(TRANS_APROPOS)$(EXEEXT) && \ $(LN_S) $(TRANS_WHATIS)$(EXEEXT) $(TRANS_APROPOS)$(EXEEXT) diff --git a/src/Makefile.in b/src/Makefile.in index 0f13f6c7..c3cd63cc 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -218,6 +218,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -229,8 +230,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -238,7 +239,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -257,6 +258,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -305,35 +307,31 @@ catman_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2) am_globbing_OBJECTS = globbing.$(OBJEXT) globbing_test.$(OBJEXT) globbing_OBJECTS = $(am_globbing_OBJECTS) globbing_DEPENDENCIES = $(am__DEPENDENCIES_1) -am_lexgrog_OBJECTS = compression.$(OBJEXT) convert.$(OBJEXT) \ - decompress.$(OBJEXT) descriptions.$(OBJEXT) \ - filenames.$(OBJEXT) globbing.$(OBJEXT) lexgrog.$(OBJEXT) \ +am_lexgrog_OBJECTS = convert.$(OBJEXT) decompress.$(OBJEXT) \ + descriptions.$(OBJEXT) globbing.$(OBJEXT) lexgrog.$(OBJEXT) \ lexgrog_test.$(OBJEXT) manconv.$(OBJEXT) \ manconv_client.$(OBJEXT) ult_src.$(OBJEXT) utf8.$(OBJEXT) lexgrog_OBJECTS = $(am_lexgrog_OBJECTS) lexgrog_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) -am_man_OBJECTS = compression.$(OBJEXT) decompress.$(OBJEXT) \ - filenames.$(OBJEXT) globbing.$(OBJEXT) man.$(OBJEXT) \ +am_man_OBJECTS = decompress.$(OBJEXT) globbing.$(OBJEXT) man.$(OBJEXT) \ manconv.$(OBJEXT) manconv_client.$(OBJEXT) manp.$(OBJEXT) \ ult_src.$(OBJEXT) utf8.$(OBJEXT) zsoelim.$(OBJEXT) man_OBJECTS = $(am_man_OBJECTS) man_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) -am_man_recode_OBJECTS = compression.$(OBJEXT) decompress.$(OBJEXT) \ - man-recode.$(OBJEXT) manconv.$(OBJEXT) \ - manconv_client.$(OBJEXT) utf8.$(OBJEXT) +am_man_recode_OBJECTS = decompress.$(OBJEXT) man-recode.$(OBJEXT) \ + manconv.$(OBJEXT) manconv_client.$(OBJEXT) utf8.$(OBJEXT) man_recode_OBJECTS = $(am_man_recode_OBJECTS) -man_recode_DEPENDENCIES = $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_2) \ +man_recode_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) am_manconv_OBJECTS = decompress.$(OBJEXT) manconv.$(OBJEXT) \ manconv_main.$(OBJEXT) manconv_OBJECTS = $(am_manconv_OBJECTS) manconv_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \ $(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) -am_mandb_OBJECTS = check_mandirs.$(OBJEXT) compression.$(OBJEXT) \ - decompress.$(OBJEXT) descriptions.$(OBJEXT) \ - descriptions_store.$(OBJEXT) filenames.$(OBJEXT) \ +am_mandb_OBJECTS = check_mandirs.$(OBJEXT) decompress.$(OBJEXT) \ + descriptions.$(OBJEXT) descriptions_store.$(OBJEXT) \ globbing.$(OBJEXT) lexgrog.$(OBJEXT) manconv.$(OBJEXT) \ manconv_client.$(OBJEXT) mandb.$(OBJEXT) manp.$(OBJEXT) \ straycats.$(OBJEXT) ult_src.$(OBJEXT) utf8.$(OBJEXT) @@ -370,10 +368,9 @@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__maybe_remake_depfiles = depfiles am__depfiles_remade = ./$(DEPDIR)/accessdb.Po ./$(DEPDIR)/catman.Po \ - ./$(DEPDIR)/check_mandirs.Po ./$(DEPDIR)/compression.Po \ - ./$(DEPDIR)/convert.Po ./$(DEPDIR)/decompress.Po \ - ./$(DEPDIR)/descriptions.Po ./$(DEPDIR)/descriptions_store.Po \ - ./$(DEPDIR)/filenames.Po ./$(DEPDIR)/globbing.Po \ + ./$(DEPDIR)/check_mandirs.Po ./$(DEPDIR)/convert.Po \ + ./$(DEPDIR)/decompress.Po ./$(DEPDIR)/descriptions.Po \ + ./$(DEPDIR)/descriptions_store.Po ./$(DEPDIR)/globbing.Po \ ./$(DEPDIR)/globbing_test.Po ./$(DEPDIR)/lexgrog.Po \ ./$(DEPDIR)/lexgrog_test.Po ./$(DEPDIR)/man-recode.Po \ ./$(DEPDIR)/man.Po ./$(DEPDIR)/manconv.Po \ @@ -536,6 +533,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -556,6 +554,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -847,6 +846,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -975,6 +975,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1152,6 +1153,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1307,6 +1309,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1342,6 +1345,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1378,6 +1382,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ @@ -1757,7 +1762,7 @@ catman_LDADD = $(LIBMANDB) $(libpipeline_LIBS) globbing_LDADD = $(LIBMAN) lexgrog_LDADD = $(LIBMAN) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) man_LDADD = $(LIBMANDB) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) -man_recode_LDADD = $(LIBMANDB) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) +man_recode_LDADD = $(LIBMAN) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) manconv_LDADD = $(LIBMAN) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) mandb_LDADD = $(LIBMANDB) $(LIBCOMPRESS) $(libpipeline_LIBS) $(LTLIBICONV) manpath_LDADD = $(LIBMAN) @@ -1779,16 +1784,12 @@ globbing_SOURCES = \ globbing_test.c lexgrog_SOURCES = \ - compression.c \ - compression.h \ convert.c \ convert.h \ decompress.c \ decompress.h \ descriptions.c \ descriptions.h \ - filenames.c \ - filenames.h \ globbing.c \ globbing.h \ lexgrog.h \ @@ -1804,12 +1805,8 @@ lexgrog_SOURCES = \ utf8.h man_SOURCES = \ - compression.c \ - compression.h \ decompress.c \ decompress.h \ - filenames.c \ - filenames.h \ globbing.c \ globbing.h \ man.c \ @@ -1827,8 +1824,6 @@ man_SOURCES = \ zsoelim.l man_recode_SOURCES = \ - compression.c \ - compression.h \ decompress.c \ decompress.h \ man-recode.c \ @@ -1849,15 +1844,11 @@ manconv_SOURCES = \ mandb_SOURCES = \ check_mandirs.c \ check_mandirs.h \ - compression.c \ - compression.h \ decompress.c \ decompress.h \ descriptions.c \ descriptions.h \ descriptions_store.c \ - filenames.c \ - filenames.h \ globbing.c \ globbing.h \ lexgrog.h \ @@ -2140,12 +2131,10 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/accessdb.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/catman.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_mandirs.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compression.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/convert.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/decompress.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/descriptions.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/descriptions_store.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filenames.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/globbing.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/globbing_test.Po@am__quote@ # am--include-marker @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lexgrog.Po@am__quote@ # am--include-marker @@ -2407,12 +2396,10 @@ distclean: distclean-recursive -rm -f ./$(DEPDIR)/accessdb.Po -rm -f ./$(DEPDIR)/catman.Po -rm -f ./$(DEPDIR)/check_mandirs.Po - -rm -f ./$(DEPDIR)/compression.Po -rm -f ./$(DEPDIR)/convert.Po -rm -f ./$(DEPDIR)/decompress.Po -rm -f ./$(DEPDIR)/descriptions.Po -rm -f ./$(DEPDIR)/descriptions_store.Po - -rm -f ./$(DEPDIR)/filenames.Po -rm -f ./$(DEPDIR)/globbing.Po -rm -f ./$(DEPDIR)/globbing_test.Po -rm -f ./$(DEPDIR)/lexgrog.Po @@ -2482,12 +2469,10 @@ maintainer-clean: maintainer-clean-recursive -rm -f ./$(DEPDIR)/accessdb.Po -rm -f ./$(DEPDIR)/catman.Po -rm -f ./$(DEPDIR)/check_mandirs.Po - -rm -f ./$(DEPDIR)/compression.Po -rm -f ./$(DEPDIR)/convert.Po -rm -f ./$(DEPDIR)/decompress.Po -rm -f ./$(DEPDIR)/descriptions.Po -rm -f ./$(DEPDIR)/descriptions_store.Po - -rm -f ./$(DEPDIR)/filenames.Po -rm -f ./$(DEPDIR)/globbing.Po -rm -f ./$(DEPDIR)/globbing_test.Po -rm -f ./$(DEPDIR)/lexgrog.Po @@ -2560,12 +2545,12 @@ all-am: apropos$(EXEEXT) install-exec-hook: if [ "$(man_owner)" ] && [ "$(man_mode)" = 6755 ]; then \ chown $(man_owner):$(man_owner) \ - $(DESTDIR)$(bindir)/$(TRANS_MAN) \ - $(DESTDIR)$(bindir)/$(TRANS_MANDB); \ + $(DESTDIR)$(bindir)/$(TRANS_MAN)$(EXEEXT) \ + $(DESTDIR)$(bindir)/$(TRANS_MANDB)$(EXEEXT); \ fi chmod $(man_mode) \ - $(DESTDIR)$(bindir)/$(TRANS_MAN) \ - $(DESTDIR)$(bindir)/$(TRANS_MANDB) + $(DESTDIR)$(bindir)/$(TRANS_MAN)$(EXEEXT) \ + $(DESTDIR)$(bindir)/$(TRANS_MANDB)$(EXEEXT) cd $(DESTDIR)$(bindir) && rm -f $(TRANS_APROPOS)$(EXEEXT) && \ $(LN_S) $(TRANS_WHATIS)$(EXEEXT) $(TRANS_APROPOS)$(EXEEXT) diff --git a/src/accessdb.c b/src/accessdb.c index b121c390..4b7adf54 100644 --- a/src/accessdb.c +++ b/src/accessdb.c @@ -63,9 +63,9 @@ static const char args_doc[] = N_("[MAN DATABASE]"); static const char doc[] = "\v" N_("The man database defaults to %s%s."); static struct argp_option options[] = { - { "debug", 'd', 0, 0, N_("emit debugging messages") }, - { 0, 'h', 0, OPTION_HIDDEN, 0 }, /* compatibility for --help */ - { 0 } + OPT ("debug", 'd', 0, N_ ("emit debugging messages")), + OPT_HELP_COMPAT, + {0} }; static error_t parse_opt (int key, char *arg, struct argp_state *state) diff --git a/src/catman.c b/src/catman.c index a933d4fb..e421d214 100644 --- a/src/catman.c +++ b/src/catman.c @@ -78,6 +78,7 @@ #include "cleanup.h" #include "debug.h" #include "fatal.h" +#include "filenames.h" #include "glcontainers.h" #include "pipeline.h" #include "util.h" @@ -102,10 +103,12 @@ error_t argp_err_exit_status = FAIL; static const char args_doc[] = N_("[SECTION...]"); static struct argp_option options[] = { - { "debug", 'd', 0, 0, N_("emit debugging messages") }, - { "manpath", 'M', N_("PATH"), 0, N_("set search path for manual pages to PATH") }, - { "config-file", 'C', N_("FILE"), 0, N_("use this user configuration file") }, - { 0, 'h', 0, OPTION_HIDDEN, 0 }, /* compatibility for --help */ + OPT ("debug", 'd', 0, N_("emit debugging messages")), + OPT ("manpath", 'M', N_("PATH"), + N_("set search path for manual pages to PATH")), + OPT ("config-file", 'C', N_("FILE"), + N_("use this user configuration file")), + OPT_HELP_COMPAT, { 0 } }; @@ -231,7 +234,8 @@ static int parse_for_sec (MYDBM_FILE dbf, pipecmd *basecmd, *cmd; datum key; size_t arg_size, initial_bit; - int message = 1, first_arg; + bool message = true; + int first_arg; basecmd = pipecmd_new (MAN); pipecmd_clearenv (basecmd); @@ -282,20 +286,20 @@ static int parse_for_sec (MYDBM_FILE dbf, #endif if (*MYDBM_DPTR (content) != '\t') { #pragma GCC diagnostic pop - struct mandata entry; + struct mandata *entry; - split_content (dbf, MYDBM_DPTR (content), - &entry); + entry = split_content (dbf, + MYDBM_DPTR (content)); /* Accept if the entry is an ultimate manual page and the section matches the one we're currently dealing with */ - if (entry.id == ULT_MAN && - strcmp (entry.sec, section) == 0) { + if (entry->id == ULT_MAN && + strcmp (entry->sec, section) == 0) { if (message) { printf (_("\nUpdating cat files for section %s of man hierarchy %s\n"), section, manpath); - message = 0; + message = false; } arg_size += add_arg (cmd, key) + 1; @@ -317,9 +321,7 @@ static int parse_for_sec (MYDBM_FILE dbf, } } - /* == MYDBM_DPTR (content), freed below */ - entry.addr = NULL; - free_mandata_elements (&entry); + free_mandata_struct (entry); } /* we don't need the content ever again */ @@ -342,14 +344,14 @@ static int parse_for_sec (MYDBM_FILE dbf, return 0; } -static int check_access (const char *directory) +static bool check_access (const char *directory) { if (!CAN_ACCESS (directory, W_OK)) { error (0, errno, _("cannot write within %s"), directory); - return 1; + return true; } - return 0; + return false; } int main (int argc, char *argv[]) diff --git a/src/check_mandirs.c b/src/check_mandirs.c index 2a7ce412..8ed87d7f 100644 --- a/src/check_mandirs.c +++ b/src/check_mandirs.c @@ -62,8 +62,10 @@ #include "manconfig.h" #include "appendstr.h" +#include "compression.h" #include "debug.h" #include "fatal.h" +#include "filenames.h" #include "glcontainers.h" #include "orderfiles.h" #include "security.h" @@ -73,7 +75,6 @@ #include "db_storage.h" #include "descriptions.h" -#include "filenames.h" #include "globbing.h" #include "lexgrog.h" #include "manp.h" @@ -88,7 +89,7 @@ gl_map_t whatis_map = NULL; struct whatis { char *whatis; - gl_list_t trace; + char *filters; }; static void whatis_free (const void *value) @@ -96,7 +97,7 @@ static void whatis_free (const void *value) struct whatis *whatis = (struct whatis *) value; free (whatis->whatis); - gl_list_free (whatis->trace); + free (whatis->filters); free (whatis); } @@ -156,185 +157,150 @@ static bool ensure_db_open (MYDBM_FILE dbf) void test_manfile (MYDBM_FILE dbf, const char *file, const char *path) { char *manpage_base; - const char *ult; + const struct ult_value *ult; struct lexgrog lg; - char *manpage; - struct mandata info, *exists; + struct mandata *info, *exists; + struct compression *comp; struct stat buf; size_t len; - gl_list_t ult_trace = NULL; const struct whatis *whatis; + debug ("\ntest_manfile: considering %s\n", file); + memset (&lg, 0, sizeof (struct lexgrog)); - memset (&info, 0, sizeof (struct mandata)); - manpage = filename_info (file, &info, NULL); - if (!manpage) + info = filename_info (file, quiet < 2); + if (!info) return; - manpage_base = manpage + strlen (manpage) + 1; + manpage_base = info->name; /* steal memory */ + info->name = NULL; - len = strlen (manpage) + 1; /* skip over directory name */ - len += strlen (manpage + len) + 1; /* skip over base name */ - len += strlen (manpage + len); /* skip over section ext */ + comp = comp_info (file, true); + if (comp) { + len = strlen (comp->stem); + free (comp->stem); + } else + len = strlen (file); /* to get mtime info */ (void) lstat (file, &buf); - info.mtime = get_stat_mtime (&buf); + info->mtime = get_stat_mtime (&buf); /* check that our file actually contains some data */ if (buf.st_size == 0) { /* man-db pre 2.3 place holder ? */ - free (manpage); + free_mandata_struct (info); return; } - /* See if we already have it, before going any further. This will - * save both an ult_src() and a find_name(), amongst other wastes of - * time. + /* Check for multiple pages whose details match except for having + * different compression extensions. */ - exists = dblookup_exact (dbf, manpage_base, info.ext, true); + exists = dblookup_exact (dbf, manpage_base, info->ext, true); + if (exists && !STREQ (exists->comp, info->comp ? info->comp : "-")) { + char *abs_filename; - /* Ensure we really have the actual page. Gzip keeps the mtime the - * same when it compresses, so we have to compare compression - * extensions as well. - */ - if (exists) { - if (strcmp (exists->comp, info.comp ? info.comp : "-") == 0) { - if (timespec_cmp (exists->mtime, info.mtime) == 0 && - exists->id < WHATIS_MAN) { - free_mandata_struct (exists); - free (manpage); - return; - } + /* If the cached file still exists, then we have a collision: + * two pages that only differ by compression extension. + */ + abs_filename = make_filename (path, NULL, exists, "man"); + if (!abs_filename) { + if (!opt_test) + dbdelete (dbf, manpage_base, exists); } else { - char *abs_filename; - - /* see if the cached file actually exists. It's - evident at this point that we have multiple - comp extensions */ - abs_filename = make_filename (path, NULL, - exists, "man"); - if (!abs_filename) { - if (!opt_test) - dbdelete (dbf, manpage_base, exists); - } else { - gripe_multi_extensions (path, exists->sec, - manpage_base, - exists->ext); - free (abs_filename); - free_mandata_struct (exists); - free (manpage); - return; - } + gripe_multi_extensions (path, exists->sec, + manpage_base, exists->ext); + free (abs_filename); + free_mandata_struct (exists); + free_mandata_struct (info); + return; } - free_mandata_struct (exists); - } - - /* Check if it happens to be a symlink/hardlink to something already - * in our cache. This just does some extra checks to avoid scanning - * links quite so many times. - */ - { - /* Avoid too much noise in debug output */ - bool save_debug = debug_level; - debug_level = false; - ult = ult_src (file, path, &buf, SOFT_LINK | HARD_LINK, NULL); - debug_level = save_debug; - } - - if (!ult) { - /* already warned about this, don't do so again */ - debug ("test_manfile(): bad link %s\n", file); - free (manpage); - return; } + free_mandata_struct (exists); - if (!whatis_map) - whatis_map = new_string_map (GL_HASH_MAP, whatis_free); - - whatis = gl_map_get (whatis_map, ult); - if (!whatis) { - if (!STRNEQ (ult, file, len)) - debug ("\ntest_manfile(): link not in cache:\n" - " source = %s\n" - " target = %s\n", file, ult); - /* Trace the file to its ultimate source, otherwise we'll be - * looking for whatis info in files containing only '.so - * manx/foo.x', which will give us an unobtainable whatis - * for the entry. */ - ult_trace = new_string_list (GL_ARRAY_LIST, true); - ult = ult_src (file, path, &buf, - SO_LINK | SOFT_LINK | HARD_LINK, ult_trace); - } + /* Trace the file to its ultimate source, otherwise we'll be + * looking for whatis info in files containing only '.so + * manx/foo.x', which will give us an unobtainable whatis + * for the entry. */ + ult = ult_src (file, path, &buf, SO_LINK | SOFT_LINK | HARD_LINK); if (!ult) { if (quiet < 2) error (0, 0, _("warning: %s: bad symlink or ROFF `.so' request"), file); - free (manpage); + free_mandata_struct (info); return; } pages++; /* pages seen so far */ - if (strncmp (ult, file, len) == 0) - info.id = ULT_MAN; /* ultimate source file */ + if (strncmp (ult->path, file, len) == 0) + info->id = ULT_MAN; /* ultimate source file */ else - info.id = SO_MAN; /* .so, sym or hard linked file */ + info->id = SO_MAN; /* .so, sym or hard linked file */ /* Ok, here goes: Use a hash tree to store the ult_srcs with * their whatis. Anytime after, check the hash tree, if it's there, * use it. This saves us a find_name() which is a real hog. * - * Use the full path in ult as the hash key so we don't have to - * clear the hash between calls. + * Use the full path in ult->path as the hash key so we don't have + * to clear the hash between calls. */ - if (whatis) + if (!whatis_map) + whatis_map = new_string_map (GL_HASH_MAP, whatis_free); + + whatis = gl_map_get (whatis_map, ult->path); + if (whatis) { lg.whatis = whatis->whatis ? xstrdup (whatis->whatis) : NULL; - else { + lg.filters = + whatis->filters ? xstrdup (whatis->filters) : NULL; + } else { /* Cache miss; go and get the whatis info in its raw state. */ char *file_base = base_name (file); struct whatis *new_whatis; + if (!STRNEQ (ult->path, file, len)) + debug ("test_manfile: link not in cache:\n" + " source = %s\n" + " target = %s\n", file, ult->path); + lg.type = MANPAGE; drop_effective_privs (); - find_name (ult, file_base, &lg, NULL); + find_name (ult->path, file_base, &lg, NULL); free (file_base); regain_effective_privs (); new_whatis = XMALLOC (struct whatis); new_whatis->whatis = lg.whatis ? xstrdup (lg.whatis) : NULL; - /* We filled out ult_trace above. */ - new_whatis->trace = ult_trace; - gl_map_put (whatis_map, xstrdup (ult), new_whatis); - whatis = new_whatis; + new_whatis->filters = lg.filters ? xstrdup (lg.filters) : NULL; + gl_map_put (whatis_map, xstrdup (ult->path), new_whatis); } debug ("\"%s\"\n", lg.whatis); /* split up the raw whatis data and store references */ - info.pointer = NULL; /* direct page, so far */ - info.filter = lg.filters; + info->pointer = NULL; /* direct page, so far */ + info->filter = lg.filters; if (lg.whatis) { gl_list_t descs = parse_descriptions (manpage_base, lg.whatis); if (!opt_test) - store_descriptions (dbf, descs, &info, path, - manpage_base, whatis->trace); + store_descriptions (dbf, descs, info, path, + manpage_base, ult->trace); gl_list_free (descs); } else if (quiet < 2) { - (void) stat (ult, &buf); + (void) stat (ult->path, &buf); if (buf.st_size == 0) error (0, 0, _("warning: %s: ignoring empty file"), - ult); + ult->path); else error (0, 0, _("warning: %s: whatis parse for %s(%s) failed"), - ult, manpage_base, info.ext); + ult->path, manpage_base, info->ext); } - free (manpage); + free_mandata_struct (info); free (lg.whatis); } @@ -701,7 +667,7 @@ void purge_pointers (MYDBM_FILE dbf, const char *name) while (MYDBM_DPTR (key) != NULL) { datum content, nextkey; - struct mandata entry; + struct mandata *entry = NULL; char *nicekey, *tab; #pragma GCC diagnostic push @@ -731,19 +697,20 @@ void purge_pointers (MYDBM_FILE dbf, const char *name) goto pointers_contentnext; #pragma GCC diagnostic pop - split_content (dbf, MYDBM_DPTR (content), &entry); - if (entry.id != SO_MAN && entry.id != WHATIS_MAN) + entry = split_content (dbf, MYDBM_DPTR (content)); + if (entry->id != SO_MAN && entry->id != WHATIS_MAN) goto pointers_contentnext; - if (STREQ (entry.pointer, name)) { + if (STREQ (entry->pointer, name)) { if (!opt_test) - dbdelete (dbf, nicekey, &entry); + dbdelete (dbf, nicekey, entry); else debug ("%s(%s): pointer vanished, " - "would delete\n", nicekey, entry.ext); + "would delete\n", nicekey, entry->ext); } pointers_contentnext: + free_mandata_struct (entry); free (nicekey); MYDBM_FREE_DPTR (content); pointers_next: @@ -757,18 +724,15 @@ pointers_next: * (which may return inexact extension matches in some cases). It may turn * out that this is better handled in look_for_file() itself. */ -static int count_glob_matches (const char *name, const char *ext, - gl_list_t source, struct timespec db_mtime) +static int count_glob_matches (const char *ext, gl_list_t source, + struct timespec db_mtime) { const char *walk; int count = 0; GL_LIST_FOREACH (source, walk) { - struct mandata info; + struct mandata *info; struct stat statbuf; - char *buf; - - memset (&info, 0, sizeof (struct mandata)); if (stat (walk, &statbuf) == -1) { debug ("count_glob_matches: excluding %s " @@ -782,12 +746,11 @@ static int count_glob_matches (const char *name, const char *ext, continue; } - buf = filename_info (walk, &info, name); - if (buf) { - if (STREQ (ext, info.ext)) + info = filename_info (walk, quiet < 2); + if (info) { + if (STREQ (ext, info->ext)) ++count; - free (info.name); - free (buf); + free_mandata_struct (info); } } @@ -807,7 +770,7 @@ static int purge_normal (MYDBM_FILE dbf, const char *name, */ t.tv_sec = -1; t.tv_nsec = -1; - if (count_glob_matches (name, info->ext, found, t)) + if (count_glob_matches (info->ext, found, t)) return 0; if (!opt_test) @@ -820,14 +783,14 @@ static int purge_normal (MYDBM_FILE dbf, const char *name, } /* Decide whether to purge a reference to a WHATIS_MAN or WHATIS_CAT page. */ -static int purge_whatis (MYDBM_FILE dbf, const char *path, int cat, +static int purge_whatis (MYDBM_FILE dbf, const char *path, bool cat, const char *name, struct mandata *info, gl_list_t found, struct timespec db_mtime) { /* TODO: On some systems, the cat page extension differs from the * man page extension, so this may be too strict. */ - if (count_glob_matches (name, info->ext, found, db_mtime)) { + if (count_glob_matches (info->ext, found, db_mtime)) { /* If the page exists and didn't beforehand, then presumably * we're about to rescan, which will replace the WHATIS_MAN * entry with something better. However, there have been @@ -873,8 +836,7 @@ static int purge_whatis (MYDBM_FILE dbf, const char *path, int cat, t.tv_sec = -1; t.tv_nsec = -1; - count = count_glob_matches (info->pointer, info->ext, - real_found, t); + count = count_glob_matches (info->ext, real_found, t); gl_list_free (real_found); if (count) return 0; @@ -889,12 +851,12 @@ static int purge_whatis (MYDBM_FILE dbf, const char *path, int cat, } /* Check that multi keys are correctly constructed. */ -static int check_multi_key (const char *name, const char *content) +static bool check_multi_key (const char *name, const char *content) { const char *walk, *next; if (!*content) - return 0; + return false; for (walk = content; walk && *walk; walk = next) { /* The name in the multi key should only differ from the @@ -914,7 +876,7 @@ static int check_multi_key (const char *name, const char *content) debug ("%s: broken multi key \"%s\", " "forcing a rescan\n", name, content); force_rescan = true; - return 1; + return true; } /* If the name was valid, skip over the extension and @@ -924,7 +886,7 @@ static int check_multi_key (const char *name, const char *content) next = walk ? strchr (walk + 1, '\t') : NULL; } - return 0; + return false; } /* Go through the database and purge references to man pages that no longer @@ -965,7 +927,7 @@ int purge_missing (MYDBM_FILE dbf, const char *manpath, const char *catpath) while (MYDBM_DPTR (key) != NULL) { datum content, nextkey; - struct mandata entry; + struct mandata *entry; char *nicekey, *tab; bool save_debug; gl_list_t found; @@ -1014,39 +976,40 @@ int purge_missing (MYDBM_FILE dbf, const char *manpath, const char *catpath) } #pragma GCC diagnostic pop - split_content (dbf, MYDBM_DPTR (content), &entry); + entry = split_content (dbf, MYDBM_DPTR (content)); save_debug = debug_level; debug_level = false; /* look_for_file() is quite noisy */ - if (entry.id <= WHATIS_MAN) - found = look_for_file (manpath, entry.ext, - entry.name ? entry.name - : nicekey, - 0, LFF_MATCHCASE); + if (entry->id <= WHATIS_MAN) + found = look_for_file (manpath, entry->ext, + entry->name ? entry->name + : nicekey, + false, LFF_MATCHCASE); else - found = look_for_file (catpath, entry.ext, - entry.name ? entry.name - : nicekey, - 1, LFF_MATCHCASE); + found = look_for_file (catpath, entry->ext, + entry->name ? entry->name + : nicekey, + true, LFF_MATCHCASE); debug_level = save_debug; /* Now actually decide whether to purge, depending on the * type of entry. */ - if (entry.id == ULT_MAN || entry.id == SO_MAN || - entry.id == STRAY_CAT) - count += purge_normal (dbf, nicekey, &entry, found); - else if (entry.id == WHATIS_MAN) - count += purge_whatis (dbf, manpath, 0, nicekey, - &entry, found, db_mtime); - else /* entry.id == WHATIS_CAT */ - count += purge_whatis (dbf, catpath, 1, nicekey, - &entry, found, db_mtime); + if (entry->id == ULT_MAN || entry->id == SO_MAN || + entry->id == STRAY_CAT) + count += purge_normal (dbf, nicekey, entry, found); + else if (entry->id == WHATIS_MAN) + count += purge_whatis (dbf, manpath, false, nicekey, + entry, found, db_mtime); + else /* entry->id == WHATIS_CAT */ + count += purge_whatis (dbf, catpath, true, nicekey, + entry, found, db_mtime); gl_list_free (found); free (nicekey); - free_mandata_elements (&entry); + free_mandata_struct (entry); + MYDBM_FREE_DPTR (content); nextkey = MYDBM_NEXTKEY (dbf, key); MYDBM_FREE_DPTR (key); key = nextkey; diff --git a/src/compression.c b/src/compression.c deleted file mode 100644 index ba509545..00000000 --- a/src/compression.c +++ /dev/null @@ -1,128 +0,0 @@ -/* - * compression.c: code to find decompressor / compression extension - * - * Copyright (C) 1994, 1995 Graeme W. Wilford. (Wilf.) - * Copyright (C) 2001, 2002 Colin Watson. - * - * This file is part of man-db. - * - * man-db is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * man-db is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with man-db; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - * - * Sat Aug 20 15:01:02 BST 1994 Wilf. (G.Wilford@ee.surrey.ac.uk) - */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif /* HAVE_CONFIG_H */ - -#include <assert.h> -#include <stdio.h> -#include <errno.h> -#include <signal.h> -#include <string.h> -#include <stdlib.h> -#include <unistd.h> -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> - -#include "error.h" -#include "xstrndup.h" -#include "xvasprintf.h" - -#include "manconfig.h" - -#include "pipeline.h" - -#include "appendstr.h" - -#include "compression.h" - -/* Take filename as arg, return structure containing decompressor - and extension, or NULL if no comp extension found. - If want_stem, set comp->stem to the filename without extension, which - the caller should free. - - eg. - filename = /usr/man/man1/foo.1.gz - - comp->prog = "/usr/bin/gzip -dc"; - comp->ext = "gz"; - comp->stem = "/usr/man/man1/foo.1"; - */ -struct compression *comp_info (const char *filename, int want_stem) -{ - const char *ext; - static struct compression hpux_comp = - {PROG_GUNZIP " -S \"\"", "", NULL}; - - ext = strrchr (filename, '.'); - - if (ext) { - struct compression *comp; - for (comp = comp_list; comp->ext; comp++) { - if (strcmp (comp->ext, ext + 1) == 0) { - if (want_stem) - comp->stem = xstrndup (filename, - ext - filename); - else - comp->stem = NULL; - return comp; - } - } - } - - if (*PROG_GUNZIP) { - ext = strstr (filename, ".Z/"); - if (ext) { - if (want_stem) - hpux_comp.stem = xstrndup (filename, - ext - filename); - else - hpux_comp.stem = NULL; - return &hpux_comp; - } - } - - return NULL; -} - -/* take filename w/o comp ext. as arg, return comp->stem as a relative - compressed file or NULL if none found */ -struct compression *comp_file (const char *filename) -{ - size_t len; - char *compfile; - struct compression *comp; - - compfile = xasprintf ("%s.", filename); - assert (compfile); - len = strlen (compfile); - - for (comp = comp_list; comp->ext; comp++) { - struct stat buf; - - compfile = appendstr (compfile, comp->ext, (void *) 0); - - if (stat (compfile, &buf) == 0) { - comp->stem = compfile; - return comp; - } - - *(compfile + len) = '\0'; - } - free (compfile); - return NULL; -} diff --git a/src/decompress.c b/src/decompress.c index b8e95b05..c4832410 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -38,6 +38,8 @@ # include "zlib.h" #endif /* HAVE_LIBZ */ +#include "pipeline.h" + #include "attribute.h" #include "minmax.h" #include "xalloc.h" @@ -45,11 +47,12 @@ #include "xvasprintf.h" #include "manconfig.h" -#include "comp_src.h" -#include "pipeline.h" -#include "decompress.h" + +#include "compression.h" #include "sandbox.h" +#include "decompress.h" + enum decompress_tag { DECOMPRESS_PIPELINE, DECOMPRESS_INPROCESS diff --git a/src/descriptions.c b/src/descriptions.c index 57e53055..de2dfb92 100644 --- a/src/descriptions.c +++ b/src/descriptions.c @@ -24,6 +24,7 @@ # include "config.h" #endif /* HAVE_CONFIG_H */ +#include <stdbool.h> #include <string.h> #include <stdlib.h> @@ -56,7 +57,7 @@ gl_list_t parse_descriptions (const char *base, const char *whatis) { const char *sep, *nextsep; gl_list_t descs; - int seen_base = 0; + bool seen_base = false; descs = gl_list_create_empty (GL_ARRAY_LIST, NULL, NULL, page_description_free, true); @@ -131,7 +132,7 @@ gl_list_t parse_descriptions (const char *base, const char *whatis) gl_list_add_last (descs, desc); if (base && STREQ (base, desc->name)) - seen_base = 1; + seen_base = true; } free (names); diff --git a/src/descriptions.h b/src/descriptions.h index 38ae412a..0712b643 100644 --- a/src/descriptions.h +++ b/src/descriptions.h @@ -22,7 +22,9 @@ #include "gl_list.h" -#include "db_storage.h" +#include "filenames.h" + +#include "mydbm.h" struct page_description { char *name; diff --git a/src/descriptions_store.c b/src/descriptions_store.c index 621b8355..82769737 100644 --- a/src/descriptions_store.c +++ b/src/descriptions_store.c @@ -24,6 +24,7 @@ # include "config.h" #endif /* HAVE_CONFIG_H */ +#include <assert.h> #include <stdbool.h> #include <stdio.h> #include <string.h> @@ -37,18 +38,21 @@ #define _(String) gettext (String) #include "error.h" -#include "gl_list.h" +#include "gl_array_list.h" +#include "gl_hash_map.h" +#include "gl_xlist.h" +#include "gl_xmap.h" #include "stat-time.h" #include "xalloc.h" #include "manconfig.h" #include "debug.h" +#include "filenames.h" #include "glcontainers.h" #include "db_storage.h" -#include "filenames.h" #include "ult_src.h" #include "descriptions.h" @@ -59,13 +63,14 @@ static void gripe_bad_store (const char *name, const char *ext) name, ext); } -/* Is PATH a prefix of DIR, such that DIR is in the manual hierarchy PATH? - * This requires that the part of DIR following PATH start with "/man". +/* Is PARENT a prefix of CHILD, such that CHILD is in the manual hierarchy + * PARENT? This requires that the part of CHILD following PARENT start with + * "/man". */ -static int is_prefix (const char *path, const char *dir) +static int is_prefix (const char *parent, const char *child) { - return (STRNEQ (dir, path, strlen (path)) && - STRNEQ (dir + strlen (path), "/man", 4)); + return (STRNEQ (child, parent, strlen (parent)) && + STRNEQ (child + strlen (parent), "/man", 4)); } /* Take a list of descriptions returned by parse_descriptions() and store @@ -75,15 +80,32 @@ void store_descriptions (MYDBM_FILE dbf, gl_list_t descs, struct mandata *info, const char *path, const char *base, gl_list_t trace) { const struct page_description *desc; - char save_id = info->id; - struct timespec save_mtime = info->mtime; const char *trace_name; + gl_map_t trace_infos; + gl_list_t whatis_infos; + struct mandata *whatis_info; + const struct mandata *pointer_info; + + assert (trace); + assert (gl_list_size (trace) > 0); - if (gl_list_size (descs) && trace) { + if (gl_list_size (descs)) { GL_LIST_FOREACH (trace, trace_name) debug ("trace: '%s'\n", trace_name); } + trace_infos = new_string_map (GL_HASH_MAP, + (gl_mapvalue_dispose_fn) + free_mandata_struct); + whatis_infos = gl_list_create_empty (GL_ARRAY_LIST, NULL, NULL, + (gl_listelement_dispose_fn) + free_mandata_struct, + true); + + GL_LIST_FOREACH (trace, trace_name) + gl_map_put (trace_infos, xstrdup (trace_name), + filename_info (trace_name, quiet < 2)); + GL_LIST_FOREACH (descs, desc) { /* Either it's the real thing or merely a reference. Get the * id and pointer right in either case. @@ -91,77 +113,138 @@ void store_descriptions (MYDBM_FILE dbf, gl_list_t descs, struct mandata *info, bool found_real_page = false; bool found_external = false; - if (STREQ (base, desc->name)) { - info->id = save_id; - info->pointer = NULL; - info->whatis = desc->whatis; - info->mtime = save_mtime; + whatis_info = XZALLOC (struct mandata); + whatis_info->ext = xstrdup (info->ext); + whatis_info->sec = xstrdup (info->sec); + whatis_info->id = info->id; + if (info->comp) + whatis_info->comp = xstrdup (info->comp); + if (info->filter) + whatis_info->filter = xstrdup (info->filter); + if (desc->whatis) + whatis_info->whatis = xstrdup (desc->whatis); + whatis_info->mtime = info->mtime; + + if (STREQ (base, desc->name)) found_real_page = true; - } else if (trace) { + else { GL_LIST_FOREACH (trace, trace_name) { - struct mandata trace_info; - char *buf; - - buf = filename_info (trace_name, - &trace_info, ""); - if (trace_info.name && - STREQ (trace_info.name, desc->name)) { - struct stat st; - - if (path && !is_prefix (path, buf)) { - /* Link outside this manual - * hierarchy; skip this - * description. - */ - found_external = true; - free (trace_info.name); - free (buf); - break; - } - if (!gl_list_next_node (trace, - trace_node) && - save_id == SO_MAN) - info->id = ULT_MAN; - else - info->id = save_id; - info->pointer = NULL; - info->whatis = desc->whatis; - if (lstat (trace_name, &st) == 0) - info->mtime = get_stat_mtime - (&st); - else - info->mtime = save_mtime; - found_real_page = true; + const struct mandata *trace_info; + struct stat st; + + trace_info = gl_map_get (trace_infos, + trace_name); + if (!trace_info || + !STREQ (trace_info->name, desc->name)) + continue; + + if (path && !is_prefix (path, trace_name)) { + /* Link outside this manual + * hierarchy; skip this description. + */ + found_external = true; + break; } - - free (trace_info.name); - free (buf); + free (whatis_info->ext); + whatis_info->ext = xstrdup (trace_info->ext); + free (whatis_info->sec); + whatis_info->sec = xstrdup (trace_info->sec); + if (!gl_list_next_node (trace, trace_node)) { + if (info->id == SO_MAN) + whatis_info->id = ULT_MAN; + } else { + if (info->id == ULT_MAN) + whatis_info->id = SO_MAN; + } + free (whatis_info->comp); + if (trace_info->comp) + whatis_info->comp = xstrdup + (trace_info->comp); + else + whatis_info->comp = NULL; + if (lstat (trace_name, &st) == 0) + whatis_info->mtime = get_stat_mtime + (&st); + else + whatis_info->mtime = info->mtime; + found_real_page = true; } } if (found_external) { debug ("skipping '%s'; link outside manual " "hierarchy\n", desc->name); + free_mandata_struct (whatis_info); continue; } if (!found_real_page) { - if (save_id < STRAY_CAT) - info->id = WHATIS_MAN; + whatis_info->name = xstrdup (desc->name); + if (info->id < STRAY_CAT) + whatis_info->id = WHATIS_MAN; else - info->id = WHATIS_CAT; - info->pointer = xstrdup (base); + whatis_info->id = WHATIS_CAT; /* Don't waste space storing the whatis in the db * more than once. */ - info->whatis = NULL; - info->mtime = save_mtime; + free (whatis_info->whatis); + whatis_info->whatis = NULL; + gl_list_add_last (whatis_infos, whatis_info); + continue; } - debug ("name = '%s', id = %c\n", desc->name, info->id); - if (dbstore (dbf, info, desc->name) > 0) { - gripe_bad_store (base, info->ext); - break; + debug ("name = '%s', ext = '%s', id = %c\n", + desc->name, whatis_info->ext, whatis_info->id); + if (dbstore (dbf, whatis_info, desc->name) > 0) { + gripe_bad_store (base, whatis_info->ext); + free_mandata_struct (whatis_info); + goto out; } + + free_mandata_struct (whatis_info); } + + /* The pointer for a WHATIS_MAN or WHATIS_CAT entry should be the + * last entry in the trace that has the same section and extension + * as the starting page (which is always the first entry in the + * trace). If we were to add WHATIS_* entries for different + * extensions, then try_db -> add_candidate -> make_filename in + * man(1) would end up constructing a path that doesn't exist and is + * thus unusable. + */ + pointer_info = NULL; + GL_LIST_FOREACH (trace, trace_name) { + const struct mandata *trace_info; + + trace_info = gl_map_get (trace_infos, trace_name); + if (trace_info && + STREQ (trace_info->sec, info->sec) && + STREQ (trace_info->ext, info->ext)) + pointer_info = trace_info; + } + assert (pointer_info); + + GL_LIST_FOREACH (whatis_infos, whatis_info) { + char *name; + + name = whatis_info->name; + whatis_info->name = NULL; + + whatis_info->pointer = xstrdup (pointer_info->name); + + debug ("name = '%s', ext = '%s', id = %c, pointer = '%s'\n", + name, whatis_info->ext, whatis_info->id, + whatis_info->pointer); + if (dbstore (dbf, whatis_info, name) > 0) { + gripe_bad_store (base, whatis_info->ext); + free (name); + goto out; + } + + free (name); + } + +out: + gl_list_free (whatis_infos); + gl_map_free (trace_infos); } diff --git a/src/globbing.c b/src/globbing.c index 31144f44..b9338981 100644 --- a/src/globbing.c +++ b/src/globbing.c @@ -208,62 +208,70 @@ static int pattern_compare (const void *a, const void *b) return strncasecmp (key->pattern, memb, key->len); } -static void match_in_directory (const char *path, const char *pattern, - int opts, gl_list_t matched) +static void match_regex_in_directory (const char *path, const char *pattern, + int opts, gl_list_t matched, + struct dirent_names *cache) { - struct dirent_names *cache; int flags; regex_t preg; - struct pattern_bsearch pattern_start = { NULL, -1 }; - char **bsearched; size_t i; - cache = update_directory_cache (path); - if (!cache) { - debug ("directory cache update failed\n"); - return; + debug ("matching regex in %s: %s\n", path, pattern); + + flags = REG_EXTENDED | REG_NOSUB | + ((opts & LFF_MATCHCASE) ? 0 : REG_ICASE); + + xregcomp (&preg, pattern, flags); + + for (i = 0; i < cache->names_len; ++i) { + if (regexec (&preg, cache->names[i], 0, NULL, 0) != 0) + continue; + + debug ("matched: %s/%s\n", path, cache->names[i]); + + gl_list_add_last (matched, + xasprintf ("%s/%s", path, cache->names[i])); } - debug ("globbing pattern in %s: %s\n", path, pattern); + regfree (&preg); +} - if (opts & LFF_REGEX) - flags = REG_EXTENDED | REG_NOSUB | - ((opts & LFF_MATCHCASE) ? 0 : REG_ICASE); - else - flags = (opts & LFF_MATCHCASE) ? 0 : FNM_CASEFOLD; +static void match_wildcard_in_directory (const char *path, const char *pattern, + int opts, gl_list_t matched, + struct dirent_names *cache) +{ + int flags; + struct pattern_bsearch pattern_start = { NULL, -1 }; + char **bsearched; + size_t i; - if (opts & LFF_REGEX) { - xregcomp (&preg, pattern, flags); - bsearched = cache->names; - } else { - pattern_start.pattern = xstrndup (pattern, - strcspn (pattern, "?*{}\\")); - pattern_start.len = strlen (pattern_start.pattern); - bsearched = bsearch (&pattern_start, cache->names, - cache->names_len, sizeof *cache->names, - &pattern_compare); - if (!bsearched) { - free (pattern_start.pattern); - return; - } - while (bsearched > cache->names && - !strncasecmp (pattern_start.pattern, *(bsearched - 1), - pattern_start.len)) - --bsearched; + debug ("matching wildcard in %s: %s\n", path, pattern); + + flags = (opts & LFF_MATCHCASE) ? 0 : FNM_CASEFOLD; + + pattern_start.pattern = xstrndup (pattern, + strcspn (pattern, "?*{}\\")); + pattern_start.len = strlen (pattern_start.pattern); + bsearched = bsearch (&pattern_start, cache->names, + cache->names_len, sizeof *cache->names, + &pattern_compare); + if (!bsearched) { + free (pattern_start.pattern); + return; } + while (bsearched > cache->names && + !strncasecmp (pattern_start.pattern, *(bsearched - 1), + pattern_start.len)) + --bsearched; for (i = bsearched - cache->names; i < cache->names_len; ++i) { - if (opts & LFF_REGEX) { - if (regexec (&preg, cache->names[i], 0, NULL, 0) != 0) - continue; - } else { - if (strncasecmp (pattern_start.pattern, - cache->names[i], pattern_start.len)) - break; + assert (pattern_start.pattern); + if (strncasecmp (pattern_start.pattern, + cache->names[i], pattern_start.len)) + break; - if (fnmatch (pattern, cache->names[i], flags) != 0) - continue; - } + if (fnmatch (pattern, cache->names[i], flags) != 0) + continue; debug ("matched: %s/%s\n", path, cache->names[i]); @@ -271,14 +279,29 @@ static void match_in_directory (const char *path, const char *pattern, xasprintf ("%s/%s", path, cache->names[i])); } + free (pattern_start.pattern); +} + +static void match_in_directory (const char *path, const char *pattern, + int opts, gl_list_t matched) +{ + struct dirent_names *cache; + + cache = update_directory_cache (path); + if (!cache) { + debug ("directory cache update failed\n"); + return; + } + if (opts & LFF_REGEX) - regfree (&preg); + match_regex_in_directory (path, pattern, opts, matched, cache); else - free (pattern_start.pattern); + match_wildcard_in_directory (path, pattern, opts, matched, + cache); } gl_list_t look_for_file (const char *hier, const char *sec, - const char *unesc_name, int cat, int opts) + const char *unesc_name, bool cat, int opts) { gl_list_t matched; char *pattern, *path = NULL; diff --git a/src/globbing.h b/src/globbing.h index ea9ff001..76013950 100644 --- a/src/globbing.h +++ b/src/globbing.h @@ -20,6 +20,8 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdbool.h> + #include "gl_list.h" enum look_for_file_opts { @@ -30,7 +32,7 @@ enum look_for_file_opts { /* globbing.c */ extern gl_list_t look_for_file (const char *hier, const char *sec, - const char *unesc_name, int cat, int opts); + const char *unesc_name, bool cat, int opts); /* Expand path with wildcards into list of all existing directories. */ extern gl_list_t expand_path (const char *path); diff --git a/src/globbing_test.c b/src/globbing_test.c index 96546ad9..61fcd548 100644 --- a/src/globbing_test.c +++ b/src/globbing_test.c @@ -59,13 +59,15 @@ error_t argp_err_exit_status = FAIL; static const char args_doc[] = N_("PATH SECTION NAME"); static struct argp_option options[] = { - { "debug", 'd', 0, 0, N_("emit debugging messages") }, - { "extension", 'e', N_("EXTENSION"), 0, N_("limit search to extension type EXTENSION") }, - { "ignore-case", 'i', 0, 0, N_("look for pages case-insensitively (default)") }, - { "match-case", 'I', 0, 0, N_("look for pages case-sensitively") }, - { "regex", 'r', 0, 0, N_("interpret page name as a regex") }, - { "wildcard", 'w', 0, 0, N_("the page name contains wildcards") }, - { 0, 'h', 0, OPTION_HIDDEN, 0 }, /* compatibility for --help */ + OPT ("debug", 'd', 0, N_("emit debugging messages")), + OPT ("extension", 'e', N_("EXTENSION"), + N_("limit search to extension type EXTENSION")), + OPT ("ignore-case", 'i', 0, + N_("look for pages case-insensitively (default)")), + OPT ("match-case", 'I', 0, N_("look for pages case-sensitively")), + OPT ("regex", 'r', 0, N_("interpret page name as a regex")), + OPT ("wildcard", 'w', 0, N_("the page name contains wildcards")), + OPT_HELP_COMPAT, { 0 } }; @@ -126,7 +128,7 @@ int main (int argc, char **argv) const char *file; files = look_for_file (remaining_args[0], remaining_args[1], - remaining_args[2], i, + remaining_args[2], (bool) i, (match_case ? LFF_MATCHCASE : 0) | (regex_opt ? LFF_REGEX : 0) | (wildcard ? LFF_WILDCARD : 0)); diff --git a/src/lexgrog.c b/src/lexgrog.c index c3ebb8be..38cb492c 100644 --- a/src/lexgrog.c +++ b/src/lexgrog.c @@ -377,7 +377,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static const flex_int16_t yy_accept[1559] = +static const flex_int16_t yy_accept[1573] = { 0, 0, 0, 0, 0, 67, 67, 67, 67, 0, 0, 0, 0, 0, 0, 0, 0, 119, 119, 0, 0, @@ -420,136 +420,138 @@ static const flex_int16_t yy_accept[1559] = 0, 126, 38, 38, 126, 38, 38, 38, 38, 37, 54, 7, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 7, 5, 3, 3, 4, 4, - 4, 3, 0, 0, 0, 0, 0, 16, 0, 21, + 0, 0, 0, 0, 0, 7, 5, 3, 3, 4, + 4, 4, 3, 0, 0, 0, 0, 0, 16, 0, - 27, 27, 27, 27, 20, 27, 27, 27, 57, 0, - 0, 0, 0, 0, 0, 36, 36, 36, 36, 36, + 21, 27, 27, 27, 27, 20, 27, 27, 27, 57, + 0, 0, 0, 0, 0, 0, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 36, 36, 51, 41, 0, 0, 0, 0, - 0, 128, 59, 0, 130, 47, 129, 0, 0, 30, - 0, 0, 0, 127, 34, 53, 0, 35, 33, 52, - 32, 0, 0, 0, 49, 84, 73, 62, 55, 63, - - 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 85, 0, 87, 92, 88, 89, 90, 91, - 0, 0, 0, 64, 0, 93, 102, 103, 104, 105, - 0, 0, 0, 116, 114, 0, 38, 38, 38, 38, - 37, 38, 38, 7, 0, 0, 0, 0, 0, 0, + 36, 36, 36, 36, 36, 51, 41, 0, 0, 0, + 0, 0, 128, 59, 0, 130, 47, 129, 0, 0, + 30, 0, 0, 0, 127, 34, 53, 0, 35, 33, + 52, 32, 0, 0, 0, 49, 84, 73, 62, 55, + + 63, 68, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 85, 0, 87, 92, 88, 89, 90, + 91, 0, 0, 0, 64, 0, 93, 102, 103, 104, + 105, 0, 0, 0, 116, 114, 0, 38, 38, 38, + 38, 37, 38, 38, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 7, 5, 3, 3, 4, 4, 4, 0, 3, - 3, 12, 14, 13, 15, 11, 17, 21, 25, 26, + 0, 0, 7, 5, 3, 3, 4, 4, 4, 0, + 3, 3, 12, 14, 13, 15, 11, 17, 21, 25, - 20, 22, 24, 23, 55, 0, 36, 36, 36, 36, + 26, 20, 22, 24, 23, 55, 0, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 36, 36, 36, 30, 36, 36, 36, 36, - 34, 36, 36, 35, 33, 36, 32, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 30, 36, 36, 36, + 36, 34, 36, 36, 35, 33, 36, 32, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 36, 36, 36, 40, 132, 131, 45, 128, - 59, 46, 47, 129, 134, 133, 30, 42, 44, 31, - 127, 34, 34, 53, 43, 35, 33, 52, 32, 0, - 84, 55, 74, 0, 71, 56, 80, 82, 36, 36, + 36, 36, 36, 36, 36, 36, 40, 132, 131, 45, + 128, 59, 46, 47, 129, 134, 133, 30, 42, 44, + 31, 127, 34, 34, 53, 43, 35, 33, 52, 32, + 0, 84, 55, 74, 0, 71, 56, 80, 82, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 85, 86, 87, 92, 88, 89, 90, 91, - 0, 65, 0, 110, 0, 116, 117, 114, 115, 38, - 38, 7, 0, 0, 0, 0, 0, 0, 0, 0, + 36, 36, 36, 85, 86, 87, 92, 88, 89, 90, + 91, 0, 65, 0, 110, 0, 116, 117, 114, 115, + 38, 38, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 7, 3, 3, 4, 4, 4, + 0, 0, 0, 0, 0, 0, 0, 7, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 3, 3, - 25, 26, 22, 24, 23, 56, 36, 36, 36, 36, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 36, 36, 36, 36, 36, 30, 36, 36, 31, 36, - 34, 34, 36, 36, 35, 33, 36, 32, 36, 36, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 132, 131, 45, 134, 133, 44, 43, 56, 56, 82, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, - 86, 65, 109, 110, 111, 117, 115, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 3, 3, 25, 26, 22, 24, 23, + 56, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 30, 36, 36, 31, 36, 34, 34, 36, 36, 35, + 33, 36, 32, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 132, 131, 45, 134, 133, + 44, 43, 56, 56, 82, 36, 36, 36, 36, 36, + 36, 36, 36, 36, 36, 86, 65, 109, 110, 111, + 117, 115, 7, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 7, 3, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 0, 0, 0, 0, 0, 0, 0, 7, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, + 4, 4, 4, 4, 4, 4, 4, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, - 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 3, 36, 36, 36, 36, 36, 36, - 36, 36, 36, 36, 36, 36, 36, 36, 109, 111, - 7, 0, 2, 0, 0, 0, 0, 0, 0, 0, + 36, 36, 36, 36, 36, 36, 36, 36, 36, 36, + 36, 36, 109, 111, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 7, 3, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 0, 0, 0, 0, 0, 0, 0, 7, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 1, 4, 1, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 1, 1, 4, + 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, + 1, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 0, 1, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, + 4, 4, 4, 4, 4, 1, 1, 0, 0, 1, + 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 3, 36, 36, 36, 7, 0, + 0, 0, 0, 3, 36, 36, 36, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 7, 3, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 0, 0, 0, 7, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, + 4, 4, 4, 4, 4, 4, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 1, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 1, 4, 1, 4, 4, 4, + 4, 4, 4, 1, 1, 4, 4, 1, 4, 4, + 4, 4, 4, 4, 4, 4, 1, 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 1, 1, 4, 4, 4, 4, 4, 4, 1, 4, + 4, 1, 4, 4, 4, 4, 4, 4, 4, 4, + 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, 0, 1, - 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, + 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 3, 7, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 7, 3, 3, - 4, 4, 1, 0, 1, 0, 0, 1, 0, 0, - 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, - 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 8, 0, 0, 1, 0, 1, 0, - 0, 0, 0, 0, 1, 1, 0, 0, 0, 0, - - 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, + 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, + 3, 3, 4, 4, 1, 0, 1, 0, 1, 0, + 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, + 0, 0, 0, 3, 3, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, + + 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, + 0, 0, 0, 0, 0, 1, 1, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 0, 0, 0, 0, 1, 0, 1, - 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, - 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, + 0, 0, 0, 0, 0, 0, 1, 0, 1, 0, + 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, + 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, + 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, + 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0 + 1, 0 } ; static const YY_CHAR yy_ec[256] = @@ -569,22 +571,22 @@ static const YY_CHAR yy_ec[256] = 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 6, 85, 6, 86, 1, 1, 87, 1, 1, 88, 89, 90, 1, 1, 91, 92, 1, 1, - 93, 1, 1, 94, 95, 96, 1, 1, 97, 1, - 98, 99, 1, 1, 1, 100, 101, 102, 1, 1, - 103, 1, 1, 104, 105, 106, 107, 108, 109, 110, - 1, 1, 111, 112, 113, 114, 115, 1, 116, 117, - 1, 1, 1, 1, 118, 1, 119, 1, 120, 121, - 1, 1, 1, 1, 122, 123, 1, 1, 1, 1, - - 1, 1, 1, 124, 1, 1, 1, 125, 1, 1, - 1, 1, 1, 1, 1, 126, 127, 1, 1, 1, - 1, 1, 1, 128, 1, 1, 1, 129, 130, 1, - 131, 1, 1, 1, 132, 133, 1, 1, 134, 1, + 93, 1, 94, 95, 96, 97, 1, 1, 98, 1, + 99, 100, 1, 1, 1, 101, 102, 103, 1, 1, + 104, 1, 1, 105, 106, 107, 108, 109, 110, 111, + 1, 1, 112, 113, 114, 115, 116, 117, 118, 119, + 120, 1, 121, 122, 123, 1, 124, 125, 126, 127, + 1, 1, 1, 1, 128, 129, 1, 1, 1, 1, + + 1, 1, 1, 130, 1, 1, 1, 131, 132, 1, + 1, 1, 1, 1, 1, 133, 134, 1, 1, 1, + 1, 1, 1, 135, 1, 1, 1, 136, 137, 1, + 138, 1, 1, 1, 139, 140, 1, 1, 141, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 } ; -static const YY_CHAR yy_meta[135] = +static const YY_CHAR yy_meta[142] = { 0, 1, 2, 3, 4, 2, 1, 5, 1, 1, 1, 6, 7, 1, 1, 1, 1, 1, 1, 8, 9, @@ -600,404 +602,407 @@ static const YY_CHAR yy_meta[135] = 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1 + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, + 1 } ; -static const flex_int16_t yy_base[1743] = +static const flex_int16_t yy_base[1757] = { 0, - 0, 0, 0, 2, 6, 0, 139, 143, 146, 147, - 227, 0, 361, 0, 145, 492, 5667, 5666, 570, 0, - 704, 0, 838, 0, 150, 159, 154, 167, 169, 170, - 0, 0, 174, 179, 5655, 5654, 5657, 7380, 7380, 199, - 5644, 7380, 495, 502, 971, 5437, 5436, 184, 5473, 0, - 1024, 982, 989, 5486, 491, 7380, 5485, 5466, 195, 501, - 7380, 5483, 0, 7380, 5482, 149, 217, 7380, 5481, 5416, - 5419, 5422, 0, 7380, 5477, 0, 7380, 5476, 0, 7380, - 5475, 0, 994, 1000, 5474, 513, 209, 5471, 5418, 0, - 530, 5471, 5468, 7380, 5469, 5416, 1012, 0, 525, 5467, - - 7380, 5466, 544, 548, 5465, 0, 1078, 1048, 1113, 1129, - 536, 5450, 1057, 7380, 1134, 1145, 1156, 5411, 5401, 5438, - 1210, 1285, 1174, 5447, 5368, 551, 553, 0, 7380, 984, - 0, 1181, 7380, 1151, 490, 558, 7380, 1004, 498, 5374, - 7380, 7380, 5439, 0, 5438, 5442, 1290, 1012, 1164, 978, - 1192, 1230, 5445, 1238, 968, 1317, 1314, 7380, 1002, 7380, - 5367, 1203, 1376, 976, 977, 1016, 1043, 1070, 1075, 1090, - 7380, 0, 7380, 5376, 5381, 5379, 1139, 1162, 7380, 5363, - 5304, 5309, 0, 7380, 0, 7380, 0, 7380, 0, 1321, - 1328, 1384, 5369, 1351, 1400, 5370, 1008, 5367, 5314, 1405, - - 1409, 1413, 5367, 1185, 7380, 0, 1417, 1461, 5366, 1421, - 5363, 7380, 5360, 5359, 5357, 5355, 1393, 5354, 0, 1234, - 5356, 1395, 1240, 7380, 7380, 5346, 1430, 5345, 0, 1442, - 1448, 5276, 170, 1439, 5274, 1111, 5267, 1434, 1170, 1197, - 1210, 1479, 1510, 1516, 5341, 1521, 1527, 992, 1058, 162, - 1593, 1668, 1389, 7380, 5340, 1501, 5299, 1554, 5298, 439, - 1430, 1507, 1526, 5268, 1158, 0, 5263, 5274, 487, 1057, - 5271, 1569, 7380, 5322, 1273, 1235, 0, 5293, 1487, 0, - 7380, 0, 5246, 153, 5245, 5220, 5231, 5218, 5226, 7380, - 0, 0, 1540, 0, 0, 941, 5212, 5227, 7380, 0, - - 7380, 7380, 0, 7380, 0, 1669, 7380, 1547, 0, 1565, - 1021, 5290, 1545, 5289, 1753, 1828, 5211, 1572, 5213, 5205, - 999, 5204, 5203, 1491, 1081, 5201, 5216, 1110, 5199, 5214, - 1505, 1558, 1605, 1611, 1621, 1622, 1628, 1645, 1654, 1656, - 1661, 1662, 1679, 5206, 5201, 5198, 5214, 5203, 5202, 1695, - 1699, 1704, 0, 1708, 1715, 5271, 1728, 5268, 5215, 7380, - 1762, 0, 1913, 5268, 0, 1771, 5267, 477, 5229, 496, - 945, 1892, 5240, 5145, 5220, 5151, 5143, 92, 5156, 5163, - 5139, 1104, 5139, 5147, 5242, 0, 5239, 5238, 5237, 5236, - 1819, 5234, 5195, 5218, 5164, 5189, 5162, 7380, 5161, 0, - - 1703, 1709, 1710, 1731, 1785, 1801, 1805, 1807, 1814, 1212, - 5119, 5134, 1270, 5117, 5132, 5195, 1848, 1856, 1109, 1867, - 1918, 1247, 1151, 1852, 1861, 5194, 1941, 1331, 1964, 1428, - 1381, 1959, 1949, 1965, 1137, 1815, 2046, 1380, 1125, 1896, - 1924, 1167, 1981, 5193, 1874, 0, 1998, 5190, 5189, 1991, - 5179, 1936, 5187, 2058, 2041, 1142, 5186, 5185, 2101, 2127, - 2200, 1451, 2282, 2098, 7380, 1968, 1839, 1891, 1931, 1943, - 1974, 2001, 2008, 2024, 2030, 2063, 2100, 2106, 2112, 2113, - 2114, 2123, 2179, 2180, 2290, 0, 2211, 2212, 2213, 0, - 2217, 1365, 5104, 5119, 0, 2218, 7380, 7380, 2219, 7380, - - 7380, 0, 0, 5174, 5128, 5127, 0, 0, 5175, 5170, - 5177, 2293, 1297, 2284, 1261, 1017, 1680, 1180, 1427, 2252, - 5176, 2253, 2252, 5096, 2253, 2286, 2288, 2320, 2325, 2330, - 1423, 5094, 5109, 7380, 5119, 2331, 2332, 2336, 2337, 2338, - 5108, 5114, 5109, 2342, 2343, 5108, 0, 2347, 2351, 5165, - 0, 2357, 0, 0, 2411, 5166, 0, 1522, 5136, 2314, - 1540, 2346, 1565, 1591, 1597, 1743, 2347, 2285, 5118, 5065, - 1726, 1410, 5030, 5028, 1191, 5026, 5041, 5057, 5029, 5059, - 5030, 5140, 0, 5136, 5135, 5107, 5106, 2543, 2675, 5105, - 5104, 7380, 7380, 7380, 7380, 7380, 7380, 0, 0, 0, - - 2365, 0, 0, 0, 2376, 5050, 2319, 2326, 0, 5092, - 2378, 2396, 2402, 2406, 2417, 2418, 2419, 2423, 2427, 2432, - 2433, 2437, 2439, 2441, 2448, 2454, 2455, 2459, 2460, 2461, - 2465, 0, 2466, 2467, 2471, 0, 2472, 0, 0, 0, - 5045, 1508, 5044, 5019, 5034, 5021, 5027, 0, 0, 2477, - 1349, 1530, 5013, 5028, 0, 2781, 0, 0, 2807, 0, - 1732, 2470, 0, 2496, 1713, 7380, 0, 0, 0, 2478, - 2479, 2497, 2498, 2503, 0, 0, 2504, 2508, 0, 2509, - 2510, 2514, 2515, 0, 0, 2516, 2520, 0, 2521, 5038, - 2522, 2526, 7380, 5037, 7380, 2528, 7380, 0, 2547, 5010, - - 2549, 2551, 2553, 2555, 2557, 2559, 1547, 5008, 5023, 1697, - 5006, 5021, 2561, 2563, 2565, 2569, 2571, 2573, 2580, 2586, - 5031, 7380, 5027, 2587, 5015, 2591, 2592, 2597, 2598, 2602, - 2609, 0, 1765, 2613, 1802, 5072, 1560, 1853, 1957, 2591, - 1958, 2545, 2310, 2625, 2419, 2632, 2545, 2556, 5055, 5041, - 5041, 4966, 4988, 4971, 4977, 4982, 4987, 4955, 4966, 4944, - 2619, 4942, 4928, 4925, 5051, 0, 0, 0, 0, 2890, - 2867, 2588, 5014, 2582, 2593, 2658, 5025, 4930, 1318, 5003, - 4933, 4923, 119, 4936, 4951, 4928, 1683, 4929, 4935, 2903, - 2599, 4995, 2601, 2620, 2661, 5004, 4909, 1804, 4982, 4913, - - 4905, 1728, 4918, 4934, 4911, 1837, 4912, 4919, 0, 0, - 0, 0, 0, 0, 0, 2637, 1886, 4936, 4951, 1911, - 4933, 4948, 0, 2641, 0, 0, 0, 0, 2642, 2643, - 2653, 2655, 2679, 0, 0, 2683, 2694, 0, 2696, 2705, - 2721, 2727, 0, 0, 2731, 2733, 0, 2739, 0, 0, - 2741, 0, 0, 0, 1845, 4958, 3009, 3035, 2005, 2048, - 0, 0, 0, 0, 0, 0, 0, 2743, 2749, 0, - 2750, 2751, 2755, 2756, 2757, 2761, 2762, 2763, 0, 4957, - 2767, 7380, 2768, 2769, 2773, 2774, 2779, 0, 2672, 2783, - 2787, 5008, 2856, 4999, 4960, 2877, 2866, 2897, 2884, 4976, - - 4913, 4891, 4879, 4878, 4875, 4882, 4872, 4885, 1861, 1694, - 1945, 4878, 4878, 4889, 4989, 0, 0, 3118, 3095, 2885, - 4953, 2878, 2888, 3109, 4964, 4869, 2236, 4944, 4874, 4865, - 1972, 4875, 4887, 4863, 2032, 4853, 4860, 2868, 4925, 2969, - 2882, 2925, 2875, 2885, 2888, 2895, 3146, 2873, 4904, 4859, - 3240, 3187, 2227, 2095, 4797, 4796, 2187, 4794, 4809, 4825, - 4797, 4827, 4798, 2888, 4882, 3112, 2926, 3266, 2922, 2933, - 2935, 2937, 3267, 2916, 4862, 4818, 4897, 3337, 2326, 2279, - 4782, 4779, 2224, 4775, 4789, 4805, 4775, 4779, 4750, 0, - 2788, 4810, 2789, 0, 0, 0, 0, 0, 0, 0, - - 2859, 0, 0, 2860, 0, 2910, 2904, 0, 2978, 2983, - 0, 2949, 2984, 3124, 2949, 3101, 3090, 4822, 3175, 1375, - 2615, 4751, 4728, 4764, 4760, 4738, 2688, 4749, 4731, 4729, - 4737, 4729, 4743, 4825, 0, 0, 3363, 3340, 3108, 4789, - 3112, 3121, 3269, 4799, 4704, 2465, 4779, 4688, 4679, 2705, - 4692, 4706, 4683, 2867, 4683, 4661, 3103, 4721, 3134, 3119, - 3356, 3114, 3129, 3153, 3158, 3373, 3146, 4699, 4654, 3485, - 3524, 2624, 2959, 4614, 4610, 3069, 4608, 4615, 4631, 4603, - 4632, 4603, 3169, 3316, 3175, 4707, 1771, 3193, 3196, 3268, - 3257, 3263, 3252, 3383, 3267, 3550, 3272, 3255, 4671, 4653, - - 3596, 3529, 3455, 3554, 4651, 4576, 4598, 4580, 4556, 4561, - 4566, 4534, 4541, 4519, 3370, 4517, 4511, 4510, 3278, 3414, - 3271, 4626, 2478, 3272, 3282, 3361, 3283, 3358, 3336, 3443, - 3361, 3661, 3366, 3358, 4605, 4588, 0, 3659, 3716, 3721, - 4562, 4487, 4509, 4492, 4494, 4499, 4504, 4471, 4481, 4455, - 3429, 4452, 4446, 4446, 0, 3141, 3252, 3444, 0, 3377, - 4534, 3456, 3507, 4423, 4422, 4419, 4424, 4411, 4424, 3559, - 3583, 3612, 4400, 3667, 4524, 4520, 4517, 3853, 3830, 3535, - 3141, 3533, 3549, 3762, 2631, 1186, 3407, 2319, 2113, 2366, - 3476, 2856, 3366, 2980, 3613, 3342, 2626, 3644, 3183, 3657, - - 3651, 3858, 3611, 3658, 3678, 3704, 3881, 3668, 2426, 3497, - 2770, 3792, 3643, 3372, 1618, 2594, 3444, 1940, 3375, 3487, - 1878, 3004, 2680, 3669, 3746, 3706, 3246, 3715, 3723, 3760, - 3873, 3756, 3724, 3745, 3867, 3766, 3942, 3820, 3815, 3231, - 2065, 4514, 3963, 4000, 4002, 3567, 3323, 3371, 3027, 3604, - 3615, 3367, 3434, 3447, 3599, 3921, 3586, 3561, 2533, 3796, - 3874, 3908, 3827, 3833, 3592, 3676, 3836, 3763, 3941, 3829, - 3233, 4041, 3765, 3428, 3612, 3666, 3816, 3843, 3593, 1047, - 2377, 1460, 3905, 3917, 3880, 3831, 3813, 3895, 3897, 3988, - 3914, 3669, 3893, 4509, 4460, 3939, 3971, 4027, 4008, 4476, - - 4493, 4422, 4431, 4399, 4368, 4355, 4353, 4350, 4356, 4346, - 4357, 3842, 3848, 3904, 4346, 4318, 4329, 4426, 7380, 4000, - 4394, 3895, 4325, 4308, 4296, 4310, 4071, 4075, 4098, 4102, - 4106, 4110, 4114, 4118, 4134, 4138, 4324, 4410, 0, 0, - 7380, 4115, 4012, 4020, 4053, 4398, 4152, 4143, 4022, 4034, - 4018, 4373, 4166, 4395, 4152, 3765, 3961, 4289, 4261, 4295, - 4291, 4262, 3976, 4273, 4251, 4242, 4245, 4235, 4248, 0, - 0, 4085, 4285, 4199, 4197, 4193, 4190, 4226, 4197, 4192, - 4197, 4201, 4212, 4296, 4114, 0, 4158, 4195, 4221, 4258, - 4210, 4215, 0, 4228, 4265, 4272, 4168, 4163, 4160, 4150, - - 4135, 4146, 4276, 4282, 4289, 4123, 4295, 4112, 4222, 4152, - 4131, 4128, 4135, 4208, 4286, 4135, 4146, 4173, 4291, 4112, - 4068, 4050, 4034, 4035, 4314, 4321, 4327, 4328, 4357, 4361, - 4365, 4372, 4373, 4383, 4384, 4390, 4391, 4052, 4220, 4085, - 4397, 4401, 3999, 4211, 4437, 4082, 4052, 3945, 3940, 3931, - 3919, 3955, 3924, 4412, 4521, 4464, 4442, 4575, 4491, 4446, - 4629, 4681, 3940, 3888, 3874, 4220, 4690, 4406, 0, 4424, - 3941, 3857, 3841, 3830, 3836, 4735, 4470, 4787, 4529, 4841, - 4530, 4796, 4584, 4895, 4630, 4947, 4638, 3793, 3778, 4239, - 4420, 3784, 4736, 4690, 3668, 4482, 4901, 4953, 4706, 4957, - - 4974, 4710, 4978, 4982, 3682, 3654, 3653, 3644, 5043, 5087, - 5139, 5183, 5235, 5279, 3592, 3549, 3542, 3483, 5331, 4742, - 5359, 4749, 5358, 4750, 5386, 4850, 5438, 4857, 5466, 4858, - 3505, 3403, 3326, 3321, 4738, 4812, 4816, 3140, 3114, 3067, - 3055, 3033, 2925, 2843, 2577, 2548, 2351, 2058, 1985, 1935, - 1824, 1794, 1654, 1660, 1542, 1465, 1467, 7380, 5519, 5530, - 5541, 5552, 5563, 5574, 5585, 5596, 5607, 5618, 5629, 5633, - 5644, 5655, 5666, 5677, 5688, 5699, 5710, 5721, 5732, 5743, - 5754, 5765, 5769, 5780, 5791, 5802, 5813, 5818, 5819, 5824, - 5835, 5846, 5857, 5868, 5879, 5890, 5901, 5912, 5923, 5934, - - 5945, 5956, 5967, 1525, 5978, 5989, 6000, 6011, 6022, 6033, - 6044, 6055, 175, 6057, 6068, 6079, 6090, 6101, 6112, 6123, - 6134, 6145, 6156, 6167, 6178, 6189, 6200, 6211, 6222, 6233, - 6244, 6255, 6266, 6277, 520, 6279, 6290, 6301, 6312, 6323, - 6334, 6345, 6356, 6367, 6378, 6389, 6400, 6411, 6422, 6433, - 6444, 6455, 6466, 6477, 6488, 6499, 6510, 6521, 6532, 6543, - 6554, 6565, 6576, 6587, 6598, 6609, 6620, 6631, 6642, 6653, - 6664, 6675, 6686, 6697, 6708, 6719, 6730, 6741, 6752, 6763, - 6774, 6785, 6796, 6807, 6818, 6829, 6840, 6851, 6862, 6873, - 6884, 6895, 6906, 6917, 6928, 6939, 6950, 6961, 6972, 6983, - - 6994, 7005, 7016, 7027, 7038, 7049, 7060, 7071, 7082, 7093, - 7104, 7109, 7119, 7130, 7141, 7152, 7163, 7174, 7185, 7196, - 7207, 7218, 7229, 7240, 532, 7251, 7262, 7273, 7284, 7295, - 7306, 7313, 7323, 7328, 7332, 980, 1317, 7342, 7353, 7364, - 7369, 1340 + 0, 0, 0, 2, 6, 0, 146, 150, 153, 154, + 234, 0, 375, 0, 152, 513, 6012, 6011, 591, 0, + 732, 0, 873, 0, 157, 166, 161, 174, 176, 177, + 0, 0, 181, 186, 6006, 6005, 6003, 7559, 7559, 206, + 5990, 7559, 516, 523, 1013, 5927, 5916, 191, 5943, 0, + 1066, 1024, 1031, 5931, 512, 7559, 5920, 5891, 202, 522, + 7559, 5898, 0, 7559, 5888, 156, 224, 7559, 5887, 5822, + 5817, 5820, 0, 7559, 5875, 0, 7559, 5866, 0, 7559, + 5865, 0, 1036, 1042, 5864, 534, 216, 5852, 5790, 0, + 551, 5843, 5831, 7559, 5832, 5779, 1054, 0, 546, 5821, + + 7559, 5666, 565, 569, 5665, 0, 1120, 1090, 1155, 1171, + 557, 5650, 1099, 7559, 1176, 1187, 1198, 5611, 5610, 5647, + 1252, 1327, 1216, 5656, 5577, 572, 574, 0, 7559, 1026, + 0, 1223, 7559, 1193, 511, 579, 7559, 1046, 519, 5583, + 7559, 7559, 5648, 0, 5647, 5651, 1332, 1054, 1206, 1020, + 1234, 1272, 5654, 1280, 1010, 1359, 1356, 7559, 1044, 7559, + 5576, 1245, 1418, 1018, 1019, 1058, 1085, 1112, 1117, 1132, + 7559, 0, 7559, 5585, 5591, 5590, 1181, 1204, 7559, 5574, + 5579, 5584, 0, 7559, 0, 7559, 0, 7559, 0, 1363, + 1370, 1426, 5644, 1393, 1442, 5645, 1050, 5642, 5589, 1447, + + 1451, 1455, 5642, 1227, 7559, 0, 1459, 1503, 5641, 1463, + 5638, 7559, 5626, 5625, 5624, 5623, 1435, 5622, 0, 1276, + 5625, 1437, 1282, 7559, 7559, 5624, 1472, 5623, 0, 1484, + 1490, 5554, 177, 1481, 5552, 1153, 5545, 1476, 1212, 1239, + 1252, 1521, 1552, 1558, 5618, 1563, 1569, 1034, 1100, 169, + 1642, 1717, 1431, 7559, 5616, 1543, 5575, 1576, 5510, 460, + 1472, 1553, 1624, 5480, 1200, 0, 5475, 5487, 508, 1099, + 5485, 1548, 7559, 5536, 1315, 1277, 0, 5534, 1532, 0, + 7559, 0, 5487, 160, 5486, 5461, 5476, 5462, 5469, 7559, + 0, 0, 1582, 0, 0, 983, 5455, 5469, 7559, 0, + + 7559, 7559, 0, 7559, 0, 1718, 7559, 1590, 0, 1606, + 1063, 5523, 1601, 5522, 1802, 1877, 5446, 1618, 5448, 5440, + 1041, 5439, 5438, 1586, 1123, 5436, 5451, 1152, 5434, 5449, + 1547, 1610, 1624, 1646, 1653, 1660, 1664, 1670, 1677, 1694, + 1703, 1708, 1710, 5440, 5434, 5431, 5420, 5409, 5408, 1744, + 1748, 1753, 0, 1757, 1764, 5477, 1777, 5470, 5417, 7559, + 1811, 0, 1962, 5470, 0, 1820, 5469, 499, 525, 979, + 1233, 1362, 1941, 1450, 5343, 5424, 5354, 5339, 98, 5357, + 5374, 5350, 1145, 5351, 5359, 5455, 0, 5452, 5451, 5450, + 5449, 1868, 5448, 5410, 5433, 5406, 5431, 5404, 7559, 5403, + + 0, 1728, 1752, 1758, 1759, 1780, 1834, 1850, 1854, 1856, + 1254, 5365, 5380, 1312, 5363, 5378, 5441, 1897, 1905, 1151, + 1916, 1967, 1289, 1193, 1901, 1910, 5440, 1990, 1373, 2013, + 1470, 1423, 2008, 1998, 2028, 1179, 1864, 2109, 1574, 1167, + 1625, 1533, 1303, 2052, 5439, 1923, 0, 2160, 5438, 5437, + 2007, 5418, 2020, 5425, 2035, 2044, 1184, 5423, 5422, 2185, + 2236, 2309, 1493, 2391, 2074, 7559, 1980, 1863, 1888, 1940, + 1992, 2031, 2047, 2057, 2079, 2098, 2104, 2111, 2112, 2117, + 2118, 2119, 2123, 2125, 2129, 2173, 0, 2131, 2162, 2163, + 0, 2164, 1519, 5341, 5356, 0, 2168, 7559, 7559, 2169, + + 7559, 7559, 0, 0, 5411, 5365, 5364, 0, 0, 5411, + 5405, 5412, 2244, 1339, 2362, 1476, 1059, 1729, 1636, 1683, + 2133, 5384, 2187, 2174, 5304, 2189, 2198, 2239, 2240, 2241, + 2246, 1545, 5302, 5317, 7559, 5323, 2250, 2252, 2254, 2288, + 2289, 5312, 5318, 5313, 2398, 2321, 5312, 0, 2418, 2423, + 5369, 0, 2394, 0, 0, 2472, 5370, 0, 2329, 1614, + 1648, 2369, 1791, 2401, 1797, 1852, 1858, 1877, 2343, 1895, + 1258, 1725, 1536, 5239, 5238, 1693, 5235, 5256, 5273, 5239, + 5275, 5244, 5357, 0, 5354, 5353, 5352, 5351, 2611, 2750, + 5350, 5349, 7559, 7559, 7559, 7559, 7559, 7559, 0, 0, + + 0, 2322, 0, 0, 0, 2323, 5299, 2380, 2392, 0, + 5341, 2361, 2431, 2400, 2440, 2454, 2459, 2460, 2464, 2465, + 2466, 2477, 2478, 2482, 2484, 2486, 2488, 2490, 2494, 2500, + 2501, 2502, 0, 2509, 2515, 2516, 0, 2521, 0, 0, + 0, 5294, 1645, 5293, 5268, 5283, 5270, 5278, 0, 0, + 2522, 1815, 1909, 5264, 5279, 0, 2863, 0, 0, 2889, + 0, 1781, 2521, 0, 2523, 1894, 7559, 0, 0, 0, + 2527, 2533, 2547, 2548, 2549, 0, 0, 2553, 2554, 0, + 2555, 2559, 2560, 2561, 0, 0, 2565, 2566, 0, 2570, + 5289, 2571, 2572, 7559, 5288, 7559, 2576, 7559, 0, 2577, + + 5252, 2578, 2582, 2583, 2584, 2588, 2589, 1935, 5249, 5263, + 1989, 5246, 5261, 2590, 2594, 2595, 2615, 2617, 2619, 2621, + 2623, 5271, 7559, 5267, 2625, 5255, 2627, 2629, 2631, 2633, + 2639, 2657, 0, 2665, 2644, 5321, 1956, 2669, 1971, 5310, + 1820, 1975, 2221, 2647, 2380, 2614, 2680, 2609, 2696, 2623, + 2603, 2635, 2624, 5280, 5204, 5200, 5182, 1277, 1881, 5201, + 5164, 5175, 5147, 2675, 5145, 5140, 5140, 5273, 0, 0, + 0, 0, 2972, 2734, 2658, 2658, 2651, 2652, 2661, 2760, + 2674, 5149, 1148, 5228, 5158, 5145, 125, 5163, 5180, 5156, + 1993, 5157, 5165, 2955, 2672, 2672, 2665, 2668, 2680, 2988, + + 2688, 5138, 1360, 5219, 5149, 5136, 1776, 5154, 5170, 5146, + 2106, 5147, 5155, 0, 0, 0, 0, 0, 0, 0, + 2709, 2139, 5173, 5188, 2264, 5171, 5186, 0, 2713, 0, + 0, 0, 0, 2724, 2725, 2756, 2762, 2763, 0, 0, + 2771, 2778, 0, 2780, 2793, 2798, 2802, 0, 0, 2804, + 2809, 0, 2813, 0, 0, 2819, 0, 0, 0, 2021, + 5194, 3089, 3115, 2047, 2064, 0, 0, 0, 0, 0, + 0, 0, 2820, 2824, 0, 2826, 2830, 2832, 2836, 2838, + 2840, 2842, 2844, 0, 5193, 2846, 7559, 2848, 2850, 2852, + 2854, 2856, 0, 2870, 2763, 2905, 5237, 2931, 2958, 2942, + + 3001, 2958, 2963, 5143, 5119, 2399, 5101, 5098, 5107, 5094, + 5112, 2399, 2366, 2623, 5100, 5100, 5114, 5215, 0, 0, + 3198, 3181, 2966, 2975, 2974, 2983, 2994, 3214, 3001, 5091, + 1964, 5171, 5101, 5088, 2160, 5104, 5119, 5094, 2781, 5092, + 5096, 3041, 2978, 3000, 3045, 2992, 3215, 2985, 2995, 2997, + 3000, 2965, 2992, 1979, 3331, 3281, 2381, 2806, 5064, 5063, + 2263, 5058, 5079, 5096, 5060, 5093, 5030, 3206, 2996, 3018, + 3197, 3038, 3357, 3033, 3043, 3166, 3176, 2983, 3171, 2967, + 5135, 3398, 2749, 2808, 5014, 5010, 2847, 5004, 5022, 5033, + 4996, 5032, 5001, 0, 2980, 5063, 3167, 0, 0, 0, + + 0, 0, 0, 0, 3202, 0, 0, 3210, 0, 3228, + 3252, 0, 3261, 3265, 0, 3210, 3280, 3212, 3217, 3209, + 3223, 3342, 3174, 5024, 3287, 5007, 4979, 5022, 4996, 4973, + 2989, 4984, 4966, 4962, 4972, 4964, 4986, 5038, 0, 0, + 3440, 3423, 3247, 3259, 3252, 3277, 3287, 3456, 3296, 4910, + 2345, 4991, 4919, 4906, 2508, 4918, 4935, 4907, 3075, 4905, + 4887, 3334, 3273, 3363, 3372, 3357, 3457, 3350, 3360, 3361, + 3362, 3301, 3354, 3238, 3573, 3523, 2753, 3253, 4853, 4846, + 3091, 4841, 4862, 4878, 4840, 4876, 4843, 3448, 3274, 3027, + 3375, 3484, 3395, 4949, 3302, 3398, 3408, 3492, 3421, 3446, + + 3576, 3436, 3625, 3442, 3441, 3471, 3460, 3671, 3605, 3670, + 3718, 4912, 4836, 4856, 4813, 2007, 2542, 4830, 4793, 4808, + 4779, 3452, 4747, 4741, 4736, 3507, 3444, 3444, 3502, 3671, + 3495, 4862, 3348, 3519, 3526, 3612, 3527, 3601, 3672, 3562, + 3746, 3596, 3582, 3610, 3598, 0, 3740, 3791, 3795, 4833, + 4756, 4778, 4757, 2612, 2602, 4733, 4696, 4711, 4682, 3653, + 4679, 4671, 4671, 0, 3586, 3645, 3659, 0, 3621, 3684, + 3726, 3794, 4677, 4675, 4672, 4684, 4640, 4658, 3800, 3823, + 3841, 4628, 3861, 4756, 4751, 4747, 3934, 3853, 3777, 3730, + 3814, 3827, 3757, 3885, 3881, 1507, 3454, 1595, 1967, 2759, + + 3759, 2702, 2986, 1385, 3676, 2487, 3579, 3899, 3679, 3879, + 3890, 3815, 3966, 3823, 3876, 3936, 3939, 3912, 3869, 3903, + 2165, 4032, 3327, 3822, 2058, 3092, 3750, 1835, 3108, 2777, + 2646, 3779, 1353, 3900, 3995, 3495, 3948, 4021, 3924, 3046, + 3642, 3962, 3965, 4034, 3971, 4041, 4025, 4053, 4081, 4038, + 4031, 4033, 4037, 4728, 4088, 4126, 4130, 1766, 2322, 3658, + 3306, 3908, 3984, 3575, 1810, 3468, 3743, 4098, 2700, 2859, + 3504, 4080, 3510, 4167, 4132, 4065, 3763, 3949, 4083, 4087, + 4174, 4133, 4095, 4188, 3760, 3736, 3892, 3905, 4074, 3629, + 3207, 1523, 2855, 3351, 4024, 4089, 4010, 3349, 3772, 2753, + + 4019, 3954, 4228, 4136, 4141, 4722, 4153, 4179, 4168, 4232, + 4194, 4200, 4710, 4604, 4615, 4581, 4549, 3709, 4531, 4525, + 4533, 4519, 4537, 3813, 4129, 3859, 4523, 4522, 4509, 4608, + 7559, 4199, 4222, 4175, 4131, 4485, 4453, 4464, 4274, 4278, + 4291, 4296, 4303, 4307, 4311, 4315, 4319, 4323, 4463, 4545, + 0, 0, 7559, 4301, 4125, 0, 4329, 4338, 4338, 4272, + 4344, 4303, 4307, 4298, 4314, 4381, 4525, 4367, 4170, 4430, + 4254, 4415, 4350, 4388, 4383, 4355, 4177, 4367, 4318, 4313, + 4322, 4273, 4291, 0, 0, 4304, 4315, 4242, 4201, 4172, + 4157, 4185, 4128, 4385, 4407, 4411, 4137, 4211, 4430, 4135, + + 4111, 4357, 4353, 4435, 4435, 0, 4451, 4419, 4441, 4038, + 4033, 4027, 4038, 3986, 3997, 4442, 4479, 4488, 3967, 4498, + 4356, 4411, 4019, 4081, 4168, 4009, 4489, 4030, 4427, 4453, + 4505, 4422, 4266, 3916, 3874, 3844, 4528, 4540, 4544, 4550, + 4554, 4571, 4587, 4591, 4595, 4599, 4605, 4606, 4612, 3828, + 4467, 4461, 4618, 4415, 3783, 4613, 4375, 0, 4622, 4475, + 4489, 3702, 3663, 3661, 3648, 3652, 3486, 4623, 4748, 4675, + 4650, 4802, 4701, 4664, 4856, 4908, 3494, 4269, 4343, 4663, + 4490, 4508, 4109, 4368, 4443, 3437, 4962, 4686, 4917, 4702, + 5016, 4708, 5068, 4757, 5122, 4811, 5077, 4857, 3265, 3166, + + 4506, 4502, 4974, 4865, 3138, 4717, 5123, 5129, 4722, 5133, + 5137, 4933, 5141, 5174, 4541, 4541, 4547, 4585, 5220, 5264, + 5316, 5360, 5412, 5456, 2913, 2663, 2618, 2473, 5508, 4973, + 5536, 4980, 5535, 4981, 5563, 5017, 5615, 5025, 5643, 5178, + 4545, 4615, 4548, 4645, 4937, 5019, 5094, 4824, 2385, 2367, + 2300, 4636, 4616, 4649, 2264, 5197, 2064, 4754, 4652, 1697, + 1563, 4652, 4824, 1553, 1537, 4762, 4846, 5105, 1499, 4850, + 5206, 7559, 5696, 5707, 5718, 5729, 5740, 5751, 5762, 5773, + 5784, 5795, 5806, 5810, 5821, 5832, 5843, 5854, 5865, 5876, + 5887, 5898, 5909, 5920, 5931, 5942, 5946, 5957, 5968, 5979, + + 5990, 5995, 5996, 6001, 6012, 6023, 6034, 6045, 6056, 6067, + 6078, 6089, 6100, 6111, 6122, 6133, 6144, 1225, 6155, 6166, + 6177, 6188, 6199, 6210, 6221, 6232, 1197, 6234, 6245, 6256, + 6267, 6278, 6289, 6300, 6311, 6322, 6333, 6344, 6355, 6366, + 6377, 6388, 6399, 6410, 6421, 6432, 6443, 6454, 1086, 6456, + 6467, 6478, 6489, 6500, 6511, 6522, 6533, 6544, 6555, 6566, + 6577, 6588, 6599, 6610, 6621, 6632, 6643, 6654, 6665, 6676, + 6687, 6698, 6709, 6720, 6731, 6742, 6753, 6764, 6775, 6786, + 6797, 6808, 6819, 6830, 6841, 6852, 6863, 6874, 6885, 6896, + 6907, 6918, 6929, 6940, 6951, 6962, 6973, 6984, 6995, 7006, + + 7017, 7028, 7039, 7050, 7061, 7072, 7083, 7094, 7105, 7116, + 7127, 7138, 7149, 7160, 7171, 7182, 7193, 7204, 7215, 7226, + 7237, 7248, 7259, 7270, 7281, 7286, 7296, 7307, 7318, 7329, + 7340, 7351, 7362, 7373, 7384, 7395, 7406, 7417, 1022, 7428, + 7439, 7450, 7461, 7472, 7483, 7490, 7496, 7506, 553, 7511, + 541, 7521, 7532, 7543, 7548, 182 } ; -static const flex_int16_t yy_def[1743] = +static const flex_int16_t yy_def[1757] = { 0, - 1559, 1559, 1560, 1560, 1558, 5, 5, 5, 1561, 1561, - 1558, 11, 1558, 13, 1562, 1562, 1563, 1563, 1558, 19, - 1558, 21, 1558, 23, 1564, 1564, 1565, 1565, 1566, 1566, - 1559, 1559, 1567, 1567, 1568, 1568, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1569, 1558, 1558, 1558, 1558, 1558, 1570, - 1558, 1558, 1569, 1558, 51, 1558, 1558, 1558, 1571, 1558, - 1558, 1558, 1572, 1558, 1558, 1558, 1573, 1558, 1558, 1558, - 1558, 1558, 1574, 1558, 1558, 1575, 1558, 1558, 1576, 1558, - 1558, 1577, 1558, 1569, 1558, 1558, 1558, 1558, 1558, 1578, - 1558, 1578, 1578, 1558, 1558, 1558, 1579, 1580, 1558, 1580, - - 1558, 1558, 1558, 1558, 1558, 1581, 1581, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1582, 1558, 1558, 1558, 1558, - 1558, 1558, 1569, 1558, 1558, 1558, 1558, 1583, 1558, 1558, - 1584, 1558, 1558, 1585, 1586, 1558, 1558, 1558, 1587, 1558, - 1558, 1558, 1588, 1589, 1590, 1558, 1558, 1558, 1558, 1558, - 1558, 1582, 1558, 121, 122, 1569, 1585, 1558, 1587, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1591, 1558, 1558, 1558, 1558, 1592, 1558, 1558, 1558, - 1558, 1558, 1593, 1558, 1594, 1558, 1595, 1558, 1596, 1558, - 1558, 1558, 1558, 1558, 1597, 1558, 1558, 1558, 1558, 1569, - - 1558, 1558, 1558, 1558, 1558, 1598, 1558, 1558, 1558, 1558, - 1598, 1558, 1558, 1599, 1600, 1599, 1600, 1599, 1601, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1602, 1602, - 1602, 1602, 1602, 1602, 1602, 1602, 1602, 1602, 1558, 1558, - 1558, 1558, 1603, 1558, 1603, 1603, 1603, 1603, 1603, 1603, - 1603, 1603, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1604, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1605, 1558, 1558, 1606, 1558, 1558, 1607, - 1558, 1608, 1608, 1608, 1608, 1608, 1608, 1608, 1608, 1558, - 1609, 1610, 1558, 1611, 1612, 1612, 1612, 1612, 1558, 1613, - - 1558, 1558, 1614, 1558, 1615, 1558, 1558, 1558, 1616, 1558, - 1603, 1558, 1603, 1603, 1603, 1603, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1608, 1608, 1608, 1612, 1612, 1612, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1617, 1617, 1618, 1617, 1617, 1617, 1617, 1558, - 1558, 1619, 1558, 1558, 363, 363, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1619, 1620, 1621, 1621, 1622, 1622, - 1622, 1623, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1624, - - 1625, 1625, 1625, 1625, 1625, 1625, 1625, 1625, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1603, 1603, 1603, 1603, 1603, - 1603, 1603, 1603, 1603, 1603, 1603, 1603, 1603, 1603, 1603, - 1603, 1603, 1603, 1603, 1603, 1603, 1603, 1603, 1603, 1603, - 1603, 1603, 1603, 1603, 1603, 1626, 1603, 1603, 1603, 1627, - 1628, 1603, 1603, 1603, 1603, 1603, 1603, 1603, 437, 437, - 437, 1603, 1603, 1603, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1629, 1558, 1558, 1558, 1630, - 1558, 1558, 1558, 1558, 1631, 1558, 1558, 1558, 1558, 1558, - - 1558, 1632, 1633, 1634, 1558, 1558, 1635, 1636, 1637, 1638, - 1603, 1603, 1603, 1603, 1603, 1603, 1603, 1603, 1603, 1639, - 1603, 1603, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1640, 1640, 1640, 1640, - 1640, 1640, 1640, 1641, 1558, 1558, 555, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1641, 1642, 1643, 1643, 1644, 1644, 1644, 1558, 1645, - 1645, 1558, 1558, 1558, 1558, 1558, 1558, 1646, 1647, 1648, - - 1649, 1650, 1651, 1652, 1558, 1558, 1653, 1653, 1654, 1653, - 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, - 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, - 1653, 1655, 1653, 1653, 1653, 1656, 1653, 1657, 1653, 1658, - 1658, 1658, 1658, 1658, 1658, 1658, 1658, 1653, 1659, 1653, - 1660, 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, - 1661, 1653, 1653, 1653, 1662, 1558, 1663, 1664, 1665, 1558, - 1558, 1558, 1558, 1558, 1666, 1667, 1558, 1558, 1668, 1558, - 1558, 1558, 1558, 1669, 1670, 1558, 1558, 1671, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1672, 1653, 1653, - - 1653, 1653, 1653, 1653, 1653, 1653, 1673, 1673, 1673, 1653, - 1653, 1653, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1674, - 1674, 1675, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1675, 1676, 1677, 1678, 1679, 1678, - 1679, 1678, 1678, 1678, 1678, 1678, 1678, 1678, 1678, 1678, - 1678, 1678, 1678, 1678, 1678, 1678, 1678, 1678, 1678, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1680, 1681, - 1682, 1683, 1684, 1685, 1686, 1558, 1653, 1653, 1653, 1653, - 1653, 1653, 1687, 1653, 1653, 1688, 1689, 1690, 1653, 1653, - 1653, 1653, 1653, 1691, 1692, 1653, 1653, 1693, 1653, 1653, - 1653, 1653, 1694, 1695, 1653, 1653, 1696, 1653, 1653, 1653, - 1653, 1653, 1653, 1697, 1698, 1653, 1653, 1653, 1699, 1700, - 1701, 1702, 1703, 1704, 1705, 1706, 1707, 1558, 1558, 1708, - 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1709, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1709, 1710, 1711, 1711, 1711, 1711, - 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, - 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, - 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, - 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, - 1711, 1711, 1711, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1712, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1713, - 1653, 1653, 1653, 1714, 1715, 1716, 1717, 1718, 1719, 1720, - - 1653, 1653, 1653, 1653, 1653, 1721, 1653, 1653, 1558, 1558, - 1722, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1722, 1723, 1724, 1724, 1724, 1724, 1724, - 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, - 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, - 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, - 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, - 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, - 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, - - 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, - 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1724, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1725, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1726, 1653, 1653, 1721, 1727, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1728, - 1729, 1730, 1558, 1558, 1727, 1731, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1732, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1725, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1732, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - - 1272, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1733, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1729, 1728, 1728, 1728, - 1729, 1729, 1729, 1730, 1730, 1730, 1558, 1558, 1731, 1731, - 1558, 1558, 1558, 1558, 1558, 1734, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1735, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1733, - 1733, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1728, - 1729, 1730, 1558, 1558, 1558, 1736, 1558, 1558, 1558, 1558, - 1558, 1558, 1737, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - - 1558, 1558, 1738, 1739, 1740, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1734, 1558, 1558, 1558, 1735, 1558, - 1558, 1558, 1558, 1558, 1739, 1738, 1738, 1738, 1738, 1739, - 1739, 1739, 1739, 1740, 1740, 1740, 1740, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1741, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1738, 1738, 1738, 1739, 1739, 1739, 1740, - 1740, 1740, 1558, 1558, 1558, 1558, 1558, 1558, 1742, 1558, - 1558, 1558, 1558, 1558, 1558, 1738, 1738, 1738, 1738, 1739, - 1739, 1739, 1739, 1740, 1740, 1740, 1740, 1558, 1558, 1558, - 1741, 1558, 1558, 1558, 1558, 1455, 1738, 1738, 1458, 1739, - - 1739, 1461, 1740, 1740, 1558, 1558, 1558, 1558, 1738, 1455, - 1739, 1458, 1740, 1461, 1558, 1558, 1558, 1558, 1738, 1738, - 1476, 1738, 1739, 1739, 1480, 1739, 1740, 1740, 1484, 1740, - 1558, 1558, 1558, 1558, 1510, 1512, 1514, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 0, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558 + 1573, 1573, 1574, 1574, 1572, 5, 5, 5, 1575, 1575, + 1572, 11, 1572, 13, 1576, 1576, 1577, 1577, 1572, 19, + 1572, 21, 1572, 23, 1578, 1578, 1579, 1579, 1580, 1580, + 1573, 1573, 1581, 1581, 1582, 1582, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1583, 1572, 1572, 1572, 1572, 1572, 1584, + 1572, 1572, 1583, 1572, 51, 1572, 1572, 1572, 1585, 1572, + 1572, 1572, 1586, 1572, 1572, 1572, 1587, 1572, 1572, 1572, + 1572, 1572, 1588, 1572, 1572, 1589, 1572, 1572, 1590, 1572, + 1572, 1591, 1572, 1583, 1572, 1572, 1572, 1572, 1572, 1592, + 1572, 1592, 1592, 1572, 1572, 1572, 1593, 1594, 1572, 1594, + + 1572, 1572, 1572, 1572, 1572, 1595, 1595, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1596, 1572, 1572, 1572, 1572, + 1572, 1572, 1583, 1572, 1572, 1572, 1572, 1597, 1572, 1572, + 1598, 1572, 1572, 1599, 1600, 1572, 1572, 1572, 1601, 1572, + 1572, 1572, 1602, 1603, 1604, 1572, 1572, 1572, 1572, 1572, + 1572, 1596, 1572, 121, 122, 1583, 1599, 1572, 1601, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1605, 1572, 1572, 1572, 1572, 1606, 1572, 1572, 1572, + 1572, 1572, 1607, 1572, 1608, 1572, 1609, 1572, 1610, 1572, + 1572, 1572, 1572, 1572, 1611, 1572, 1572, 1572, 1572, 1583, + + 1572, 1572, 1572, 1572, 1572, 1612, 1572, 1572, 1572, 1572, + 1612, 1572, 1572, 1613, 1614, 1613, 1614, 1613, 1615, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1616, 1616, + 1616, 1616, 1616, 1616, 1616, 1616, 1616, 1616, 1572, 1572, + 1572, 1572, 1617, 1572, 1617, 1617, 1617, 1617, 1617, 1617, + 1617, 1617, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1618, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1619, 1572, 1572, 1620, 1572, 1572, 1621, + 1572, 1622, 1622, 1622, 1622, 1622, 1622, 1622, 1622, 1572, + 1623, 1624, 1572, 1625, 1626, 1626, 1626, 1626, 1572, 1627, + + 1572, 1572, 1628, 1572, 1629, 1572, 1572, 1572, 1630, 1572, + 1617, 1572, 1617, 1617, 1617, 1617, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1622, 1622, 1622, 1626, 1626, 1626, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1631, 1631, 1632, 1631, 1631, 1631, 1631, 1572, + 1572, 1633, 1572, 1572, 363, 363, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1633, 1634, 1635, 1635, 1636, + 1636, 1636, 1637, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + + 1638, 1639, 1639, 1639, 1639, 1639, 1639, 1639, 1639, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1617, 1617, 1617, 1617, + 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, + 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, + 1617, 1617, 1617, 1617, 1617, 1617, 1640, 1617, 1617, 1617, + 1641, 1642, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, + 1617, 461, 1617, 1617, 1617, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1643, 1572, 1572, 1572, + 1644, 1572, 1572, 1572, 1572, 1645, 1572, 1572, 1572, 1572, + + 1572, 1572, 1646, 1647, 1648, 1572, 1572, 1649, 1650, 1651, + 1652, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, 1617, + 1653, 1617, 1617, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1654, 1654, 1654, + 1654, 1654, 1654, 1654, 1655, 1572, 1572, 556, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1655, 1656, 1657, 1657, 1658, 1658, 1658, 1572, + 1659, 1659, 1572, 1572, 1572, 1572, 1572, 1572, 1660, 1661, + + 1662, 1663, 1664, 1665, 1666, 1572, 1572, 1667, 1667, 1668, + 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1667, + 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1667, + 1667, 1667, 1669, 1667, 1667, 1667, 1670, 1667, 1671, 1667, + 1672, 1672, 1672, 1672, 1672, 1672, 1672, 1672, 1667, 1673, + 1667, 1674, 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1667, + 1667, 1675, 1667, 1667, 1667, 1676, 1572, 1677, 1678, 1679, + 1572, 1572, 1572, 1572, 1572, 1680, 1681, 1572, 1572, 1682, + 1572, 1572, 1572, 1572, 1683, 1684, 1572, 1572, 1685, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1686, 1667, + + 1667, 1667, 1667, 1667, 1667, 1667, 1667, 1687, 1687, 1687, + 1667, 1667, 1667, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1688, 1688, 1689, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1689, 1690, 1691, + 1692, 1693, 1692, 1693, 1692, 1692, 1692, 1692, 1692, 1692, + 1692, 1692, 1692, 1692, 1692, 1692, 1692, 1692, 1692, 1692, + 1692, 1692, 1692, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1694, 1695, 1696, 1697, 1698, 1699, 1700, + 1572, 1667, 1667, 1667, 1667, 1667, 1667, 1701, 1667, 1667, + 1702, 1703, 1704, 1667, 1667, 1667, 1667, 1667, 1705, 1706, + 1667, 1667, 1707, 1667, 1667, 1667, 1667, 1708, 1709, 1667, + 1667, 1710, 1667, 1667, 1667, 1667, 1667, 1667, 1711, 1712, + 1667, 1667, 1667, 1713, 1714, 1715, 1716, 1717, 1718, 1719, + 1720, 1721, 1572, 1572, 1722, 1667, 1667, 1667, 1667, 1667, + 1667, 1667, 1667, 1667, 1667, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1723, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1723, 1724, 1725, + 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, + 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, + 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, + 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1725, + 1725, 1725, 1725, 1725, 1725, 1725, 1725, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1726, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1727, 1667, 1667, 1667, 1728, 1729, 1730, + + 1731, 1732, 1733, 1734, 1667, 1667, 1667, 1667, 1667, 1735, + 1667, 1667, 1572, 1572, 1736, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1736, 1737, 1738, + 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, + 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, + 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, + 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, + 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, + 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, + + 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, + 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, + 1738, 1738, 1738, 1738, 1738, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1739, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1740, 1667, 1667, 1735, 1741, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1742, 1743, + 1744, 1572, 1572, 1741, 1745, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1746, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1739, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1747, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1746, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + + 1572, 1747, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1284, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1748, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1743, 1742, + 1742, 1742, 1743, 1743, 1743, 1744, 1744, 1744, 1572, 1572, + 1745, 1745, 1572, 1572, 1572, 1749, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1750, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1748, 1748, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1742, 1743, 1744, 1572, 1572, 1747, 1572, + + 1572, 1572, 1572, 1572, 1572, 1751, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1752, 1753, 1754, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1755, 1572, 1572, + 1750, 1572, 1572, 1572, 1572, 1572, 1753, 1752, 1752, 1752, + 1752, 1753, 1753, 1753, 1753, 1754, 1754, 1754, 1754, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1756, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1752, 1752, 1752, + 1753, 1753, 1753, 1754, 1754, 1754, 1572, 1572, 1572, 1755, + 1572, 1572, 1572, 1572, 1572, 1572, 1752, 1752, 1752, 1752, + 1753, 1753, 1753, 1753, 1754, 1754, 1754, 1754, 1572, 1572, + + 1572, 1572, 1572, 1572, 1572, 1469, 1752, 1752, 1472, 1753, + 1753, 1475, 1754, 1754, 1572, 1572, 1572, 1572, 1752, 1469, + 1753, 1472, 1754, 1475, 1572, 1572, 1572, 1572, 1752, 1752, + 1487, 1752, 1753, 1753, 1491, 1753, 1754, 1754, 1495, 1754, + 1572, 1572, 1572, 1572, 1520, 1522, 1524, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 0, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572 } ; -static const flex_int16_t yy_nxt[7515] = +static const flex_int16_t yy_nxt[7701] = { 0, - 1558, 1558, 40, 41, 40, 41, 42, 43, 44, 45, + 1572, 1572, 40, 41, 40, 41, 42, 43, 44, 45, 43, 42, 42, 42, 42, 42, 46, 47, 42, 42, 42, 48, 49, 46, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, 50, @@ -1012,821 +1017,841 @@ static const flex_int16_t yy_nxt[7515] = 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, 42, - 52, 53, 54, 52, 52, 53, 54, 52, 69, 57, - 57, 83, 84, 85, 83, 42, 91, 92, 93, 42, - 83, 84, 85, 83, 1558, 86, 87, 58, 58, 91, - 92, 93, 95, 95, 86, 87, 99, 100, 424, 96, - 96, 99, 100, 70, 507, 126, 97, 97, 126, 71, - 573, 72, 574, 55, 59, 59, 163, 55, 401, 163, - - 103, 104, 105, 103, 88, 401, 89, 174, 175, 106, - 176, 202, 203, 88, 70, 89, 107, 955, 178, 956, - 71, 178, 72, 499, 499, 60, 60, 61, 61, 61, - 62, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 61, 61, 61, 61, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, - 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 42, 42, 42, 42, 42, 42, 42, 52, 53, 54, + 52, 52, 53, 54, 52, 69, 57, 57, 83, 84, + 85, 83, 42, 91, 92, 93, 42, 83, 84, 85, + 83, 1572, 86, 87, 58, 58, 91, 92, 93, 95, + 95, 86, 87, 99, 100, 425, 96, 96, 99, 100, + 70, 1480, 126, 97, 97, 126, 71, 574, 72, 575, + + 55, 59, 59, 163, 55, 402, 163, 103, 104, 105, + 103, 88, 402, 89, 174, 175, 106, 176, 202, 203, + 88, 70, 89, 107, 959, 178, 960, 71, 178, 72, + 500, 500, 60, 60, 61, 61, 61, 62, 61, 61, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, - 61, 61, 61, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, + 63, 63, 63, 63, 63, 63, 63, 61, 61, 61, + 61, 61, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, 63, - 63, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 63, 63, 63, 63, 63, 63, 63, 63, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, - 61, 64, 64, 64, 65, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 64, 64, 66, 64, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, + 61, 61, 61, 61, 61, 61, 61, 61, 61, 61, + 61, 61, 61, 61, 61, 64, 64, 64, 65, 64, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 66, 64, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 64, 64, 64, 64, 64, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, + 67, 67, 67, 67, 67, 67, 67, 67, 64, 64, + 64, 64, 64, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, 67, - 67, 67, 67, 67, 67, 64, 64, 64, 64, 64, + 67, 67, 67, 67, 67, 67, 67, 67, 67, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, - 64, 64, 64, 64, 64, 69, 109, 110, 110, 109, - - 473, 291, 157, 115, 116, 117, 115, 158, 558, 474, - 111, 112, 118, 119, 201, 201, 201, 201, 120, 121, - 164, 165, 166, 167, 168, 169, 170, 220, 221, 301, - 70, 207, 208, 209, 207, 560, 71, 126, 72, 558, - 126, 1301, 222, 292, 159, 103, 225, 226, 103, 113, - 227, 228, 126, 486, 279, 126, 122, 279, 106, 279, - 296, 70, 279, 297, 487, 107, 560, 71, 298, 72, - 74, 74, 74, 75, 74, 74, 74, 74, 74, 74, - 74, 74, 74, 74, 74, 74, 74, 74, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, + 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, + 64, 64, 64, 64, 64, 64, 69, 109, 110, 110, + 109, 474, 291, 157, 115, 116, 117, 115, 158, 559, + 475, 111, 112, 118, 119, 201, 201, 201, 201, 120, + 121, 164, 165, 166, 167, 168, 169, 170, 220, 221, + 1431, 70, 207, 208, 209, 207, 560, 71, 126, 72, + 559, 126, 1399, 222, 292, 159, 103, 225, 226, 103, + 113, 227, 228, 126, 487, 279, 126, 122, 279, 106, + 279, 296, 70, 279, 297, 488, 107, 560, 71, 298, + 72, 74, 74, 74, 75, 74, 74, 74, 74, 74, + + 74, 74, 74, 74, 74, 74, 74, 74, 74, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 74, 74, 74, 74, 74, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, + 76, 76, 76, 76, 74, 74, 74, 74, 74, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 74, 74, 74, 74, 74, 74, + 76, 76, 76, 76, 76, 76, 76, 76, 76, 76, + 76, 76, 76, 76, 76, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, - - 74, 74, 74, 74, 77, 77, 77, 78, 77, 77, + 74, 74, 74, 74, 74, 74, 74, 74, 74, 74, + 74, 74, 77, 77, 77, 78, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, 79, 79, 79, 79, 77, 77, 77, - 77, 77, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, - 79, 79, 79, 79, 79, 79, 79, 79, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 79, 79, 79, 79, 79, 77, 77, 77, 77, 77, + 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, + 79, 79, 79, 79, 79, 79, 79, 79, 79, 79, + 79, 79, 79, 79, 79, 79, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, 80, 80, - 80, 81, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 80, 80, 80, 80, 82, 82, 82, 82, - 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, - 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, - 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, - 82, 80, 80, 80, 80, 80, 82, 82, 82, 82, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 77, 77, 77, 77, 77, 77, 77, + 77, 77, 77, 80, 80, 80, 81, 80, 80, 80, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, - 82, 82, 80, 80, 80, 80, 80, 80, 80, 80, + 82, 82, 82, 82, 82, 82, 80, 80, 80, 80, + 80, 82, 82, 82, 82, 82, 82, 82, 82, 82, + 82, 82, 82, 82, 82, 82, 82, 82, 82, 82, + 82, 82, 82, 82, 82, 82, 82, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, - 80, 80, 110, 123, 110, 110, 561, 337, 338, 157, - 337, 338, 130, 149, 158, 130, 149, 112, 130, 1415, - 151, 152, 153, 151, 1558, 190, 130, 111, 190, 118, - - 119, 194, 195, 196, 194, 293, 154, 561, 293, 191, - 192, 506, 506, 308, 294, 215, 308, 339, 216, 1558, - 339, 324, 309, 311, 511, 112, 129, 129, 130, 129, - 131, 131, 132, 129, 133, 134, 150, 135, 150, 360, - 136, 137, 130, 155, 340, 197, 422, 340, 193, 103, - 104, 105, 103, 1341, 198, 130, 199, 217, 106, 360, - 1558, 130, 138, 130, 328, 107, 218, 329, 240, 474, - 360, 341, 330, 239, 341, 130, 342, 139, 140, 342, - 528, 141, 129, 138, 129, 129, 142, 143, 217, 138, - 360, 343, 144, 138, 343, 145, 146, 129, 703, 129, - - 147, 130, 129, 138, 148, 138, 230, 129, 129, 130, - 241, 1558, 423, 231, 109, 110, 110, 109, 232, 488, - 488, 489, 233, 234, 235, 424, 236, 1558, 111, 112, - 110, 110, 110, 110, 130, 242, 243, 244, 242, 1558, - 178, 237, 130, 178, 1558, 112, 246, 116, 247, 246, - 112, 534, 534, 1558, 238, 248, 249, 110, 116, 110, - 110, 250, 251, 178, 1359, 149, 178, 113, 149, 1558, - 407, 409, 112, 407, 409, 115, 116, 117, 115, 111, - 535, 535, 1558, 112, 118, 119, 204, 631, 113, 204, - 120, 121, 1341, 310, 311, 312, 310, 578, 579, 252, - - 281, 281, 281, 281, 281, 281, 281, 281, 627, 283, - 112, 253, 254, 284, 253, 285, 286, 482, 150, 655, - 482, 287, 332, 333, 334, 335, 288, 255, 122, 289, - 636, 313, 152, 314, 313, 610, 220, 221, 256, 193, - 248, 249, 220, 221, 257, 258, 150, 315, 259, 1558, - 260, 222, 261, 609, 262, 263, 264, 222, 265, 410, - 266, 705, 411, 1558, 124, 317, 318, 412, 319, 267, - 320, 268, 413, 269, 409, 414, 270, 409, 321, 322, - 415, 271, 605, 605, 316, 323, 272, 129, 129, 130, - 129, 131, 131, 132, 273, 133, 134, 492, 274, 1558, - - 493, 275, 137, 130, 306, 494, 306, 976, 307, 307, - 307, 307, 307, 307, 307, 307, 307, 757, 151, 152, - 153, 151, 190, 138, 758, 190, 1419, 118, 119, 201, - 201, 201, 201, 1558, 154, 702, 191, 192, 276, 140, - 606, 606, 141, 129, 138, 129, 129, 142, 143, 1491, - 138, 504, 352, 144, 138, 352, 145, 146, 129, 416, - 129, 147, 130, 129, 138, 148, 138, 192, 129, 129, - 130, 155, 283, 614, 699, 193, 325, 336, 285, 326, - 336, 951, 1558, 1558, 327, 350, 350, 350, 350, 288, - 253, 254, 289, 253, 952, 332, 333, 334, 335, 390, - - 351, 354, 355, 356, 354, 193, 194, 195, 196, 194, - 201, 201, 201, 201, 361, 361, 361, 361, 207, 363, - 364, 207, 207, 208, 209, 207, 393, 391, 394, 1558, - 1558, 475, 227, 228, 475, 690, 690, 395, 391, 396, - 106, 397, 619, 400, 391, 357, 400, 107, 398, 400, - 197, 620, 400, 1558, 358, 630, 359, 661, 391, 198, - 476, 199, 365, 366, 367, 365, 1341, 401, 405, 391, - 618, 1162, 477, 405, 399, 391, 402, 401, 401, 405, - 242, 243, 244, 242, 405, 405, 401, 1163, 279, 368, - 405, 279, 402, 721, 721, 112, 369, 370, 403, 405, - - 371, 372, 466, 373, 405, 466, 536, 374, 706, 536, - 405, 417, 243, 418, 417, 405, 405, 110, 243, 110, - 110, 405, 420, 110, 417, 420, 419, 375, 417, 116, - 417, 417, 112, 113, 483, 467, 467, 419, 478, 753, - 754, 293, 467, 419, 293, 467, 445, 1558, 308, 445, - 294, 308, 479, 531, 467, 466, 532, 309, 466, 537, - 480, 533, 537, 1396, 419, 467, 310, 311, 312, 310, - 112, 480, 1361, 466, 733, 421, 466, 480, 851, 851, - 738, 419, 469, 376, 377, 378, 379, 380, 381, 1557, - 382, 480, 383, 384, 425, 254, 470, 425, 469, 512, - - 856, 856, 480, 480, 471, 733, 538, 467, 480, 538, - 426, 738, 539, 744, 480, 539, 467, 879, 879, 150, - 480, 427, 540, 336, 1341, 540, 336, 428, 429, 337, - 745, 430, 337, 431, 480, 432, 746, 433, 434, 435, - 1556, 436, 491, 437, 744, 480, 338, 422, 524, 338, - 735, 480, 438, 525, 439, 339, 440, 340, 339, 441, - 340, 745, 341, 342, 442, 341, 342, 746, 735, 443, - 129, 444, 445, 444, 446, 446, 447, 448, 449, 450, - 343, 451, 1558, 343, 452, 453, 445, 307, 307, 307, - 307, 307, 307, 307, 307, 307, 350, 350, 350, 350, - - 350, 350, 350, 350, 400, 352, 454, 400, 352, 548, - 400, 599, 548, 400, 599, 510, 354, 355, 356, 354, - 192, 455, 456, 416, 549, 457, 444, 454, 444, 444, - 458, 459, 600, 454, 509, 600, 460, 454, 416, 461, - 462, 444, 1145, 444, 463, 445, 444, 454, 464, 454, - 620, 444, 444, 445, 425, 254, 1163, 425, 193, 551, - 357, 704, 550, 361, 361, 361, 361, 880, 880, 358, - 426, 359, 557, 366, 367, 557, 960, 961, 1555, 551, - 513, 514, 747, 515, 901, 516, 601, 428, 429, 601, - 551, 430, 751, 517, 518, 432, 889, 433, 434, 435, - - 519, 436, 602, 437, 1028, 602, 603, 422, 604, 603, - 551, 604, 438, 747, 439, 409, 440, 1558, 409, 441, - 588, 589, 588, 588, 442, 587, 981, 889, 982, 443, - 129, 444, 445, 444, 446, 446, 447, 448, 449, 520, - 466, 451, 893, 466, 521, 453, 445, 504, 752, 417, - 110, 417, 417, 611, 1558, 1003, 611, 417, 243, 417, - 417, 1226, 425, 254, 419, 425, 454, 977, 420, 110, - 417, 420, 419, 893, 628, 445, 1558, 628, 445, 1226, - 978, 522, 456, 419, 1341, 457, 444, 454, 444, 444, - 458, 459, 667, 454, 744, 667, 460, 454, 1558, 461, - - 462, 444, 419, 444, 463, 445, 444, 454, 464, 454, - 419, 444, 444, 445, 365, 555, 556, 365, 1554, 562, - 1558, 421, 445, 563, 1553, 744, 1558, 564, 512, 607, - 986, 987, 466, 565, 424, 466, 445, 611, 1558, 566, - 611, 368, 612, 1558, 668, 612, 1341, 668, 369, 370, - 567, 1558, 371, 372, 563, 373, 991, 991, 564, 374, - 621, 1558, 632, 621, 565, 612, 1558, 1558, 612, 466, - 566, 608, 466, 633, 666, 669, 613, 613, 669, 375, - 624, 992, 992, 1558, 613, 613, 634, 634, 635, 622, - 1026, 1027, 615, 613, 625, 445, 744, 1152, 744, 626, - - 1558, 623, 670, 445, 613, 670, 616, 509, 615, 671, - 626, 1005, 671, 568, 617, 626, 626, 639, 639, 639, - 639, 639, 639, 639, 639, 672, 626, 744, 672, 744, - 626, 475, 626, 1552, 475, 376, 377, 378, 379, 380, - 381, 626, 382, 1558, 383, 384, 626, 626, 1558, 641, - 510, 1029, 1030, 642, 637, 643, 644, 626, 1006, 650, - 1558, 645, 650, 626, 673, 1149, 646, 673, 651, 647, - 1074, 1341, 1075, 629, 629, 629, 629, 629, 629, 629, - 629, 629, 629, 629, 629, 629, 629, 629, 629, 629, - 629, 629, 629, 629, 629, 629, 629, 629, 629, 664, - - 1558, 674, 664, 652, 674, 1130, 653, 675, 665, 1551, - 675, 654, 656, 676, 677, 678, 676, 677, 678, 1341, - 657, 657, 657, 657, 679, 1079, 1080, 679, 657, 657, - 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, - 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, - 657, 657, 657, 657, 658, 658, 658, 658, 658, 658, - 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, - 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, - 680, 681, 1550, 680, 681, 658, 658, 658, 658, 658, - 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, + 80, 80, 80, 80, 80, 80, 80, 80, 80, 80, + 80, 80, 80, 80, 110, 123, 110, 110, 561, 337, + 338, 157, 337, 338, 130, 149, 158, 130, 149, 112, + 130, 1313, 151, 152, 153, 151, 1572, 190, 130, 111, + 190, 118, 119, 194, 195, 196, 194, 293, 154, 561, + 293, 191, 192, 507, 507, 308, 294, 215, 308, 339, + 216, 1572, 339, 324, 309, 311, 512, 112, 129, 129, + 130, 129, 131, 131, 132, 129, 133, 134, 150, 135, + 150, 360, 136, 137, 130, 155, 340, 197, 423, 340, + 193, 103, 104, 105, 103, 301, 198, 130, 199, 217, + + 106, 360, 1572, 130, 138, 130, 328, 107, 218, 329, + 240, 475, 360, 341, 330, 239, 341, 130, 342, 139, + 140, 342, 529, 141, 129, 138, 129, 129, 142, 143, + 217, 138, 360, 343, 144, 138, 343, 145, 146, 129, + 704, 129, 147, 130, 129, 138, 148, 138, 230, 129, + 129, 130, 241, 1572, 424, 231, 109, 110, 110, 109, + 232, 489, 489, 490, 233, 234, 235, 425, 236, 1572, + 111, 112, 110, 110, 110, 110, 130, 242, 243, 244, + 242, 1572, 178, 237, 130, 178, 1572, 112, 246, 116, + 247, 246, 112, 535, 535, 1572, 238, 248, 249, 110, + + 116, 110, 110, 250, 251, 178, 508, 149, 178, 113, + 149, 955, 408, 410, 112, 408, 410, 115, 116, 117, + 115, 111, 536, 536, 956, 112, 118, 119, 204, 632, + 113, 204, 120, 121, 484, 310, 311, 312, 310, 579, + 580, 252, 281, 281, 281, 281, 281, 281, 281, 281, + 628, 283, 112, 253, 254, 284, 253, 285, 286, 483, + 150, 656, 483, 287, 332, 333, 334, 335, 288, 255, + 122, 289, 562, 313, 152, 314, 313, 611, 220, 221, + 256, 193, 248, 249, 220, 221, 257, 258, 150, 315, + 259, 1572, 260, 222, 261, 610, 262, 263, 264, 222, + + 265, 411, 266, 562, 412, 1572, 124, 317, 318, 413, + 319, 267, 320, 268, 414, 269, 410, 415, 270, 410, + 321, 322, 416, 271, 606, 606, 316, 323, 272, 129, + 129, 130, 129, 131, 131, 132, 273, 133, 134, 493, + 274, 1572, 494, 275, 137, 130, 306, 495, 306, 753, + 307, 307, 307, 307, 307, 307, 307, 307, 307, 1353, + 151, 152, 153, 151, 190, 138, 637, 190, 753, 118, + 119, 201, 201, 201, 201, 1572, 154, 906, 191, 192, + 276, 140, 607, 607, 141, 129, 138, 129, 129, 142, + 143, 1353, 138, 563, 352, 144, 138, 352, 145, 146, + + 129, 906, 129, 147, 130, 129, 138, 148, 138, 192, + 129, 129, 130, 155, 283, 615, 700, 193, 325, 336, + 285, 326, 336, 981, 563, 1572, 327, 350, 350, 350, + 350, 288, 253, 254, 289, 253, 982, 332, 333, 334, + 335, 391, 351, 354, 355, 356, 354, 193, 194, 195, + 196, 194, 201, 201, 201, 201, 361, 361, 361, 361, + 207, 363, 364, 207, 207, 208, 209, 207, 394, 392, + 395, 1163, 1572, 476, 227, 228, 476, 570, 1572, 396, + 392, 397, 106, 398, 620, 401, 392, 357, 401, 107, + 399, 401, 197, 621, 401, 1572, 358, 989, 359, 662, + + 392, 198, 477, 199, 365, 366, 367, 365, 570, 402, + 406, 392, 619, 1353, 478, 406, 400, 392, 403, 402, + 402, 406, 242, 243, 244, 242, 406, 406, 402, 1353, + 368, 369, 406, 279, 403, 1572, 279, 112, 370, 371, + 404, 406, 372, 373, 467, 374, 406, 467, 537, 375, + 703, 537, 406, 418, 243, 419, 418, 406, 406, 110, + 243, 110, 110, 406, 421, 110, 418, 421, 420, 376, + 418, 116, 418, 418, 112, 113, 1572, 467, 468, 420, + 467, 468, 481, 293, 479, 420, 293, 468, 468, 691, + 691, 308, 294, 481, 308, 635, 635, 636, 480, 481, + + 309, 1353, 446, 1572, 470, 446, 420, 310, 311, 312, + 310, 538, 112, 481, 538, 722, 722, 422, 471, 467, + 470, 492, 467, 420, 481, 539, 472, 1572, 539, 1570, + 481, 377, 378, 379, 980, 380, 381, 382, 1572, 383, + 983, 384, 385, 426, 254, 1373, 426, 540, 532, 631, + 540, 533, 468, 468, 541, 513, 534, 541, 481, 427, + 150, 336, 468, 468, 336, 337, 737, 1567, 337, 481, + 428, 338, 756, 757, 338, 481, 429, 430, 339, 738, + 431, 339, 432, 1566, 433, 1572, 434, 435, 436, 481, + 437, 633, 438, 1563, 525, 340, 423, 737, 340, 526, + + 481, 439, 634, 440, 341, 441, 481, 341, 442, 342, + 738, 343, 342, 443, 343, 856, 856, 706, 444, 129, + 445, 446, 445, 447, 447, 448, 449, 450, 451, 401, + 452, 1572, 401, 453, 454, 446, 307, 307, 307, 307, + 307, 307, 307, 307, 307, 350, 350, 350, 350, 350, + 350, 350, 350, 401, 352, 455, 401, 352, 549, 600, + 601, 549, 600, 601, 707, 354, 355, 356, 354, 192, + 456, 457, 1353, 550, 458, 445, 455, 445, 445, 459, + 460, 602, 455, 510, 602, 461, 455, 417, 462, 463, + 445, 754, 445, 464, 446, 445, 455, 465, 455, 621, + + 445, 445, 446, 426, 254, 968, 426, 193, 552, 357, + 705, 551, 361, 361, 361, 361, 1353, 505, 358, 427, + 359, 558, 366, 367, 558, 417, 760, 1562, 552, 514, + 515, 742, 516, 761, 517, 603, 429, 430, 603, 552, + 431, 1353, 518, 519, 433, 747, 434, 435, 436, 520, + 437, 604, 438, 755, 604, 605, 423, 410, 605, 552, + 410, 439, 742, 440, 467, 441, 1572, 467, 442, 589, + 590, 589, 589, 443, 588, 985, 747, 986, 444, 129, + 445, 446, 445, 447, 447, 448, 449, 450, 521, 668, + 452, 748, 668, 522, 454, 446, 511, 749, 418, 110, + + 418, 418, 612, 1572, 417, 612, 418, 243, 418, 418, + 739, 426, 254, 420, 426, 455, 750, 421, 110, 418, + 421, 420, 748, 629, 446, 1572, 629, 446, 749, 739, + 523, 457, 420, 1321, 458, 445, 455, 445, 445, 459, + 460, 467, 455, 752, 467, 461, 455, 750, 462, 463, + 445, 420, 445, 464, 446, 445, 455, 465, 455, 420, + 445, 445, 446, 365, 556, 557, 365, 1158, 564, 1572, + 422, 446, 565, 1353, 752, 907, 566, 513, 608, 861, + 861, 467, 567, 425, 467, 446, 667, 895, 568, 368, + 369, 613, 1572, 669, 613, 907, 669, 370, 371, 564, + + 1572, 372, 373, 565, 374, 884, 884, 566, 375, 622, + 1572, 896, 622, 567, 613, 1572, 747, 613, 895, 568, + 609, 612, 1572, 505, 612, 614, 614, 1075, 376, 625, + 1572, 1007, 670, 614, 614, 670, 651, 1572, 623, 651, + 1076, 616, 896, 626, 446, 652, 1572, 747, 671, 510, + 624, 671, 446, 1009, 1572, 617, 614, 616, 672, 885, + 885, 672, 627, 618, 1353, 642, 511, 614, 569, 643, + 1107, 644, 645, 627, 1010, 665, 1572, 646, 665, 627, + 673, 804, 647, 673, 666, 648, 627, 964, 965, 1107, + 377, 378, 379, 627, 380, 381, 382, 627, 383, 476, + + 384, 385, 476, 627, 627, 674, 653, 1289, 674, 654, + 627, 1572, 675, 676, 655, 675, 676, 627, 677, 678, + 679, 677, 678, 679, 680, 638, 681, 680, 627, 681, + 682, 1289, 686, 682, 627, 686, 630, 630, 630, 630, + 630, 630, 630, 630, 630, 630, 630, 630, 630, 630, + 630, 630, 630, 630, 630, 630, 630, 630, 630, 630, + 630, 630, 1572, 687, 688, 690, 687, 688, 690, 692, + 693, 1353, 692, 693, 683, 714, 1146, 683, 714, 640, + 640, 640, 640, 640, 640, 640, 640, 1572, 1154, 1572, + 716, 642, 684, 716, 1559, 708, 657, 644, 709, 717, + + 990, 991, 717, 710, 658, 658, 658, 658, 647, 995, + 995, 648, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, - 658, 659, 685, 686, 687, 685, 686, 687, 689, 691, - 692, 689, 691, 692, 1107, 1108, 799, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 713, 715, 1558, 713, 715, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 1558, 612, 1558, 716, 612, 717, - 716, 682, 717, 1105, 682, 1558, 662, 445, 662, 1070, - - 663, 663, 663, 663, 663, 663, 663, 663, 663, 683, - 641, 445, 1071, 1111, 707, 710, 643, 708, 711, 613, - 1112, 718, 709, 712, 718, 1341, 719, 646, 613, 719, - 647, 720, 536, 537, 720, 536, 537, 538, 539, 540, - 538, 539, 540, 726, 728, 735, 726, 728, 548, 1106, - 1147, 548, 730, 350, 730, 730, 683, 1148, 552, 896, - 700, 552, 727, 549, 979, 701, 601, 731, 736, 601, - 445, 748, 1341, 739, 739, 563, 735, 692, 445, 611, - 692, 817, 611, 1341, 818, 740, 740, 748, 820, 819, - 896, 821, 1141, 563, 741, 741, 822, 612, 742, 743, - - 612, 550, 825, 612, 739, 739, 612, 826, 1143, 1144, - 826, 550, 557, 555, 556, 557, 740, 740, 612, 827, - 828, 612, 827, 828, 829, 741, 741, 829, 830, 743, - 743, 830, 1341, 831, 621, 737, 831, 621, 832, 368, - 833, 832, 834, 833, 1549, 834, 369, 370, 1142, 835, - 371, 372, 835, 373, 744, 836, 837, 374, 836, 837, - 838, 839, 840, 838, 839, 840, 841, 844, 845, 841, - 844, 845, 846, 848, 1135, 846, 848, 375, 650, 670, - 671, 650, 670, 671, 842, 744, 980, 651, 663, 663, - 663, 663, 663, 663, 663, 663, 663, 664, 672, 673, - - 664, 672, 673, 1360, 674, 677, 665, 674, 677, 678, - 680, 681, 678, 680, 681, 682, 682, 686, 682, 682, - 686, 687, 689, 691, 687, 689, 691, 692, 1211, 869, - 692, 842, 869, 376, 377, 378, 379, 380, 381, 1341, - 382, 1212, 383, 384, 770, 589, 770, 770, 871, 771, - 873, 871, 874, 873, 875, 874, 876, 875, 877, 876, - 878, 877, 713, 878, 881, 713, 715, 881, 1121, 715, - 716, 772, 717, 716, 718, 717, 744, 718, 773, 774, - 895, 719, 775, 776, 719, 777, 1121, 720, 884, 778, - 720, 884, 726, 886, 896, 726, 886, 779, 728, 887, - - 1341, 728, 887, 730, 350, 730, 730, 744, 899, 780, - 730, 350, 730, 730, 890, 891, 892, 890, 744, 938, - 909, 940, 744, 909, 941, 896, 890, 891, 892, 890, - 964, 744, 1341, 890, 891, 892, 890, 1341, 869, 899, - 966, 869, 993, 829, 830, 993, 829, 830, 1548, 744, - 938, 967, 940, 744, 831, 941, 832, 831, 975, 832, - 897, 964, 744, 898, 1317, 781, 782, 783, 784, 785, - 786, 966, 787, 744, 788, 789, 589, 589, 589, 589, - 833, 790, 967, 833, 836, 942, 1341, 836, 968, 943, - 1246, 897, 969, 944, 898, 837, 970, 839, 837, 945, - - 839, 1547, 971, 791, 744, 946, 840, 1012, 972, 840, - 792, 793, 1164, 1165, 794, 795, 947, 796, 1146, 973, - 943, 797, 841, 969, 944, 841, 989, 970, 841, 798, - 945, 841, 845, 971, 846, 845, 946, 846, 1012, 972, - 848, 799, 1001, 848, 869, 1001, 1247, 869, 910, 911, - 869, 871, 1007, 869, 871, 1007, 873, 874, 875, 873, - 874, 875, 876, 877, 878, 876, 877, 878, 881, 1009, - 884, 881, 1009, 884, 1010, 886, 1341, 1010, 886, 948, - 887, 1137, 974, 887, 890, 891, 892, 890, 1013, 1001, - 993, 1013, 1001, 993, 1169, 1030, 1154, 800, 801, 802, - - 803, 804, 805, 1215, 806, 1216, 807, 808, 857, 857, - 857, 857, 857, 857, 857, 857, 857, 857, 857, 857, - 857, 857, 857, 857, 857, 857, 857, 857, 857, 857, - 857, 857, 857, 857, 858, 858, 858, 858, 858, 858, - 858, 858, 858, 858, 858, 858, 858, 858, 858, 858, - 858, 858, 858, 858, 858, 858, 858, 858, 858, 858, - 1001, 1157, 1341, 1001, 1157, 858, 858, 858, 858, 858, - 858, 858, 858, 858, 858, 858, 858, 858, 858, 858, - 858, 858, 858, 858, 858, 858, 858, 858, 858, 858, - 858, 918, 589, 918, 918, 772, 919, 1014, 890, 891, - - 892, 890, 773, 774, 744, 1007, 775, 776, 1007, 777, - 1016, 416, 870, 778, 416, 1017, 1057, 1059, 920, 1060, - 1083, 779, 1088, 1094, 1095, 921, 922, 1096, 1014, 923, - 924, 791, 925, 780, 1097, 744, 926, 744, 792, 793, - 1119, 1016, 794, 795, 927, 796, 1017, 1057, 1059, 797, - 1060, 1083, 1089, 1088, 1094, 1095, 928, 798, 1096, 1098, - 1220, 1221, 983, 1062, 1090, 1097, 1124, 1546, 744, 799, - 1130, 1119, 1131, 1091, 1132, 1098, 1133, 1092, 1160, 1009, - 735, 1062, 1009, 1089, 1010, 1013, 1341, 1010, 1013, 781, - 782, 783, 784, 785, 786, 1090, 787, 1124, 788, 789, - - 1085, 1130, 1134, 1131, 1091, 1132, 969, 1133, 1093, 1160, - 1341, 735, 929, 930, 931, 932, 933, 934, 1134, 935, - 1545, 936, 937, 1086, 969, 800, 801, 802, 803, 804, - 805, 1085, 806, 1341, 807, 808, 657, 657, 657, 657, - 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, - 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, - 657, 657, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 1248, 1249, - 1087, 985, 1153, 660, 660, 660, 660, 660, 660, 660, + 658, 658, 658, 658, 658, 658, 658, 658, 1572, 684, + 718, 719, 720, 718, 719, 720, 1572, 721, 446, 711, + 721, 537, 712, 538, 537, 539, 538, 713, 539, 1079, + 747, 1080, 446, 659, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 540, + 541, 747, 540, 541, 659, 659, 659, 659, 659, 659, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, - 660, 660, 660, 660, 660, 660, 660, 660, 660, 1037, - 589, 1037, 1037, 1039, 1038, 890, 891, 892, 890, 1396, - 1040, 1041, 744, 1305, 1042, 1043, 1061, 1044, 1014, 1198, - 1062, 1045, 1157, 1121, 1063, 1157, 1039, 1341, 1544, 1046, - 1064, 1200, 1201, 1040, 1041, 1224, 1065, 1042, 1043, 1229, - 1044, 1047, 1235, 744, 1045, 1226, 1122, 1066, 1236, 1014, - 1198, 1062, 1046, 1089, 1121, 1063, 890, 891, 892, 890, - 965, 1064, 1200, 1201, 1047, 1090, 1224, 1065, 1227, 1341, - 1229, 1543, 1237, 1235, 1091, 1252, 1226, 1238, 1093, 1236, - - 1260, 1103, 1253, 1103, 1089, 1104, 1104, 1104, 1104, 1104, - 1104, 1104, 1104, 1104, 1120, 1264, 1090, 1048, 1049, 1050, - 1051, 1052, 1053, 1237, 1054, 1091, 1055, 1056, 1238, 1093, - 1067, 1260, 1239, 1123, 1235, 1235, 1203, 1341, 1542, 1341, - 1048, 1049, 1050, 1051, 1052, 1053, 1264, 1054, 1239, 1055, - 1056, 1101, 1341, 1157, 1203, 1228, 1157, 1294, 1300, 1102, - 1102, 1102, 1102, 1352, 1541, 1235, 1235, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, - 1102, 1102, 1102, 1125, 1125, 1235, 1202, 1235, 1266, 1235, - - 1203, 1267, 1235, 1235, 1204, 1126, 1126, 1270, 1235, 1289, - 1205, 1293, 1267, 1130, 1127, 1127, 1206, 1261, 1128, 1129, - 1261, 1130, 1262, 1130, 1125, 1125, 1235, 1207, 1235, 1341, - 1235, 1203, 1267, 1235, 1235, 1204, 1126, 1126, 1270, 1235, - 1289, 1205, 1293, 1267, 1130, 1127, 1127, 1206, 1341, 1129, - 1129, 1139, 1130, 1139, 1130, 1140, 1140, 1140, 1140, 1140, - 1140, 1140, 1140, 1140, 1178, 589, 1178, 1178, 1180, 1179, - 1263, 1283, 1341, 1341, 1283, 1181, 1182, 1341, 1341, 1183, - 1184, 1341, 1185, 1230, 1261, 1296, 1186, 1261, 1130, 1262, - 1208, 1180, 1130, 1295, 1187, 1231, 1130, 1130, 1181, 1182, - - 1230, 1130, 1183, 1184, 1232, 1185, 1188, 1296, 1233, 1186, - 1299, 1320, 1231, 1341, 1230, 1290, 1296, 1187, 1290, 1130, - 1291, 1232, 1540, 1130, 1539, 1234, 1231, 1130, 1130, 1188, - 1312, 1230, 1130, 1312, 1341, 1232, 1141, 1263, 1296, 1234, - 1341, 1299, 1320, 1231, 1290, 416, 870, 1290, 416, 1291, - 1341, 988, 1232, 1341, 1308, 984, 1234, 890, 891, 892, - 890, 1304, 1189, 1190, 1191, 1192, 1193, 1194, 1292, 1195, - 977, 1196, 1197, 1245, 1245, 1245, 1245, 1245, 1245, 1245, - 1245, 1245, 1341, 978, 1150, 1189, 1190, 1191, 1192, 1193, - 1194, 1354, 1195, 1341, 1196, 1197, 1242, 1292, 1538, 1284, - - 1285, 1143, 1144, 1341, 1243, 1243, 1243, 1243, 890, 891, - 892, 890, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, - 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, - 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1243, 1244, 1341, - 1244, 1341, 1245, 1245, 1245, 1245, 1245, 1245, 1245, 1245, - 1245, 1261, 1309, 1310, 1261, 1341, 1262, 1180, 1313, 1314, - 1329, 891, 1330, 1329, 1181, 1182, 964, 1341, 1183, 1184, - 1147, 1185, 966, 1341, 981, 1186, 982, 1148, 1268, 1151, - 967, 1269, 1180, 1273, 1332, 891, 1333, 1332, 1136, 1181, - 1182, 1235, 1341, 1183, 1184, 1188, 1185, 964, 1341, 1341, - - 1186, 1163, 1349, 966, 1263, 1341, 1130, 1534, 1274, 1268, - 1341, 967, 1269, 1335, 891, 1336, 1335, 1341, 1341, 1341, - 1188, 1341, 1235, 1272, 1272, 1272, 1272, 1272, 1272, 1272, - 1272, 1272, 1272, 1272, 1272, 1272, 1272, 1272, 1272, 1272, - 1272, 1272, 1272, 1272, 1272, 1272, 1272, 1272, 1272, 1341, - 1341, 1189, 1190, 1191, 1192, 1193, 1194, 1341, 1195, 1130, - 1196, 1197, 1290, 1341, 1341, 1290, 1533, 1291, 890, 891, - 892, 890, 1341, 1532, 1341, 1341, 1189, 1190, 1191, 1192, - 1193, 1194, 1341, 1195, 1341, 1196, 1197, 791, 1121, 1297, - 1130, 1124, 1298, 1316, 792, 793, 1119, 1131, 794, 795, - - 1289, 796, 1130, 1306, 1355, 797, 986, 987, 1307, 1141, - 1341, 1122, 1341, 1302, 1315, 1292, 1531, 1132, 1358, 1121, - 1297, 1341, 1124, 1298, 1120, 799, 1311, 1119, 1131, 1341, - 1341, 1289, 1346, 1130, 1140, 1140, 1140, 1140, 1140, 1140, - 1140, 1140, 1140, 1133, 1518, 1347, 1293, 1290, 1132, 791, - 1290, 1341, 1343, 1517, 1134, 1516, 792, 793, 969, 1295, - 794, 795, 1341, 796, 1130, 1142, 1341, 797, 1341, 1341, - 1134, 1341, 1341, 1296, 1133, 1303, 969, 1293, 1123, 1355, - 1515, 800, 801, 802, 803, 804, 805, 799, 806, 968, - 807, 808, 1508, 969, 1296, 1130, 1130, 970, 1341, 1130, - - 1292, 1130, 1341, 971, 1296, 1121, 1139, 1350, 1139, 972, - 1140, 1140, 1140, 1140, 1140, 1140, 1140, 1140, 1140, 1341, - 973, 1341, 1341, 1121, 969, 1296, 1341, 1130, 970, 1130, - 1130, 1344, 1130, 1341, 971, 1341, 1341, 1341, 1350, 1341, - 972, 1353, 1341, 800, 801, 802, 803, 804, 805, 1341, - 806, 1130, 807, 808, 589, 589, 589, 589, 791, 1342, - 1351, 1395, 1344, 1130, 1341, 792, 793, 1299, 1290, 794, - 795, 1290, 796, 1343, 1348, 1290, 797, 1396, 1290, 1341, - 1343, 791, 1130, 974, 798, 1125, 1341, 1341, 792, 793, - 1346, 1351, 794, 795, 1130, 796, 799, 1126, 1299, 797, - - 1130, 1341, 1506, 1347, 1130, 1348, 1127, 798, 1125, 1345, - 1128, 1341, 1345, 1130, 1341, 1345, 1125, 1505, 1345, 799, - 1126, 1292, 1312, 1341, 1130, 1312, 1495, 1341, 1126, 1127, - 1368, 1130, 1344, 1129, 1348, 1130, 1494, 1127, 1304, 1125, - 1356, 1129, 1290, 1290, 1130, 1290, 1290, 1343, 1343, 1367, - 1493, 1126, 800, 801, 802, 803, 804, 805, 1364, 806, - 1127, 807, 808, 1344, 1129, 1348, 1130, 1357, 1492, 1341, - 1297, 1362, 1363, 1298, 1489, 800, 801, 802, 803, 804, - 805, 1130, 806, 1130, 807, 808, 1365, 1366, 1488, 1290, - 1374, 791, 1290, 1375, 1291, 1292, 1292, 1130, 792, 793, - - 1369, 1297, 794, 795, 1298, 796, 1341, 1304, 1341, 797, - 1365, 1366, 1130, 1345, 1130, 1350, 1345, 1302, 1140, 1140, - 1140, 1140, 1140, 1140, 1140, 1140, 1140, 1364, 1290, 799, - 791, 1290, 1405, 1291, 1362, 1363, 1130, 792, 793, 1351, - 1372, 794, 795, 1130, 796, 1475, 1350, 1341, 797, 1385, - 1313, 1314, 1558, 1121, 1345, 1474, 1303, 1345, 1397, 1398, - 1558, 1558, 1558, 1558, 1473, 1130, 1348, 1130, 799, 1472, - 1351, 1372, 1332, 891, 1333, 1332, 1380, 891, 1330, 1380, - 1385, 1292, 1402, 1366, 1121, 800, 801, 802, 803, 804, - 805, 1471, 806, 1469, 807, 808, 1130, 1348, 1130, 1380, - - 891, 1330, 1380, 1380, 891, 1330, 1380, 1381, 891, 1333, - 1381, 1381, 891, 1333, 1381, 1381, 891, 1333, 1381, 1382, - 891, 1336, 1382, 1465, 800, 801, 802, 803, 804, 805, - 744, 806, 1408, 807, 808, 1382, 891, 1336, 1382, 1382, - 891, 1336, 1382, 791, 1290, 1463, 1453, 1290, 1414, 1291, - 792, 793, 1439, 1290, 794, 795, 1290, 796, 1291, 1290, - 1452, 797, 1290, 1408, 1291, 1451, 1388, 1450, 1388, 798, - 1389, 1389, 1389, 1389, 1389, 1389, 1389, 1389, 1389, 1414, - 1391, 799, 1391, 1439, 1392, 1392, 1392, 1392, 1392, 1392, - 1392, 1392, 1392, 1380, 891, 1330, 1380, 1292, 1381, 891, - - 1333, 1381, 1382, 891, 1336, 1382, 1292, 1448, 1447, 1446, - 1449, 1445, 1416, 1389, 1389, 1389, 1389, 1389, 1389, 1389, - 1389, 1389, 1290, 744, 1443, 1290, 1442, 1291, 1392, 1392, - 1392, 1392, 1392, 1392, 1392, 1392, 1392, 800, 801, 802, - 803, 804, 805, 791, 806, 1441, 807, 808, 1444, 1440, - 792, 793, 1438, 744, 794, 795, 791, 796, 1466, 1425, - 1490, 797, 1424, 792, 793, 1423, 1290, 794, 795, 1290, - 796, 1291, 1130, 1290, 797, 1417, 1290, 1427, 1291, 1444, - 1427, 799, 1428, 1431, 744, 1422, 1431, 1421, 1432, 1466, - 1435, 1490, 1420, 1435, 799, 1436, 1290, 1558, 1418, 1290, - - 1384, 1291, 1558, 1130, 1172, 1558, 1558, 1558, 1558, 744, - 1558, 1558, 1558, 1558, 744, 1431, 1413, 1412, 1431, 1292, - 1432, 1411, 1454, 1410, 1409, 1454, 1292, 1428, 1454, 1454, - 1429, 1454, 1454, 1428, 1428, 1407, 1433, 800, 801, 802, - 803, 804, 805, 1437, 806, 1407, 807, 808, 1406, 1292, - 800, 801, 802, 803, 804, 805, 1405, 806, 1454, 807, - 808, 1454, 1457, 1428, 1404, 1457, 1457, 1432, 1433, 1457, - 1403, 1432, 1364, 1457, 1457, 1429, 1457, 1457, 1432, 1432, - 1401, 1429, 1429, 1130, 1460, 1460, 1400, 1460, 1460, 1436, - 1436, 1460, 1460, 1399, 1460, 1460, 1436, 1436, 890, 891, - - 892, 890, 890, 891, 892, 890, 1393, 1290, 1390, 1386, - 1290, 1429, 1291, 1454, 1384, 1433, 1454, 1383, 1428, 1433, - 1455, 1379, 1378, 1377, 1376, 1290, 1433, 1433, 1290, 1373, - 1291, 1558, 1371, 1456, 1369, 1368, 1458, 1437, 1437, 1558, - 1558, 1558, 1558, 1457, 1437, 1437, 1457, 1460, 1432, 1459, - 1460, 1467, 1436, 1467, 1461, 1468, 1468, 1468, 1468, 1468, - 1468, 1468, 1468, 1468, 1367, 1454, 1429, 1462, 1454, 1361, - 1428, 1454, 1360, 1359, 1454, 1358, 1428, 1357, 1478, 1356, - 1478, 1355, 1479, 1479, 1479, 1479, 1479, 1479, 1479, 1479, - 1479, 1355, 1457, 1426, 1354, 1457, 1433, 1432, 1353, 1558, - - 1437, 1426, 1426, 1426, 1426, 1482, 1352, 1482, 1120, 1483, - 1483, 1483, 1483, 1483, 1483, 1483, 1483, 1483, 1429, 1349, - 1341, 1464, 1454, 1341, 1497, 1454, 1340, 1428, 1338, 1337, - 1454, 1457, 1476, 1454, 1457, 1428, 1432, 1327, 1326, 1325, - 1477, 1477, 1477, 1477, 1324, 1433, 1323, 1322, 1477, 1477, - 1477, 1477, 1477, 1477, 1477, 1477, 1477, 1477, 1477, 1477, - 1477, 1477, 1477, 1477, 1477, 1477, 1477, 1477, 1477, 1477, - 1477, 1477, 1477, 1477, 1321, 1429, 1457, 1317, 1316, 1457, - 1315, 1432, 1311, 1498, 1500, 1457, 1480, 1310, 1457, 1309, - 1432, 1308, 1307, 1306, 1481, 1481, 1481, 1481, 1305, 1304, - - 1141, 1130, 1481, 1481, 1481, 1481, 1481, 1481, 1481, 1481, - 1481, 1481, 1481, 1481, 1481, 1481, 1481, 1481, 1481, 1481, - 1481, 1481, 1481, 1481, 1481, 1481, 1481, 1481, 1130, 1433, - 1460, 1460, 1300, 1460, 1460, 1436, 1436, 1294, 1501, 1460, - 1484, 1288, 1460, 1287, 1436, 1286, 1282, 1281, 1485, 1485, - 1485, 1485, 1280, 1279, 1278, 1277, 1485, 1485, 1485, 1485, - 1485, 1485, 1485, 1485, 1485, 1485, 1485, 1485, 1485, 1485, - 1485, 1485, 1485, 1485, 1485, 1485, 1485, 1485, 1485, 1485, - 1485, 1485, 1460, 1437, 1503, 1460, 1276, 1436, 1275, 1246, - 1235, 1290, 1504, 1235, 1290, 1486, 1291, 1486, 1271, 1487, - - 1487, 1487, 1487, 1487, 1487, 1487, 1487, 1487, 1468, 1468, - 1468, 1468, 1468, 1468, 1468, 1468, 1468, 1430, 1265, 1259, - 1258, 1434, 1257, 1256, 1255, 1430, 1430, 1430, 1430, 1434, - 1434, 1434, 1434, 1254, 1251, 1437, 1454, 1290, 1250, 1454, - 1290, 1428, 1291, 1454, 1292, 1241, 1454, 1240, 1428, 1426, - 1454, 1457, 1225, 1454, 1457, 1428, 1432, 1426, 1426, 1426, - 1426, 1223, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, + 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, + 660, 446, 729, 602, 693, 729, 602, 693, 1353, 446, + 734, 735, 736, 734, 996, 996, 661, 661, 661, 661, + 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, + 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, + 661, 661, 612, 613, 1572, 612, 613, 661, 661, 661, + 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, + 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, + 661, 661, 661, 1572, 1558, 553, 1118, 614, 553, 727, + + 739, 613, 727, 1119, 613, 663, 614, 663, 1221, 664, + 664, 664, 664, 664, 664, 664, 664, 664, 728, 549, + 747, 1222, 549, 740, 731, 350, 731, 731, 743, 751, + 1554, 739, 613, 565, 550, 613, 1150, 830, 701, 732, + 744, 831, 822, 702, 831, 823, 751, 1112, 551, 745, + 824, 747, 565, 746, 825, 613, 904, 826, 613, 743, + 832, 833, 827, 832, 833, 834, 835, 836, 834, 835, + 836, 744, 551, 558, 556, 557, 558, 1032, 622, 837, + 745, 622, 837, 838, 746, 839, 838, 840, 839, 841, + 840, 842, 841, 1353, 842, 843, 741, 1553, 843, 368, + + 369, 844, 845, 846, 844, 845, 846, 370, 371, 1113, + 849, 372, 373, 849, 374, 1552, 850, 851, 375, 850, + 851, 847, 853, 651, 665, 853, 651, 665, 671, 1023, + 1024, 671, 652, 666, 672, 1030, 1031, 672, 376, 664, + 664, 664, 664, 664, 664, 664, 664, 664, 673, 674, + 675, 673, 674, 675, 678, 679, 681, 678, 679, 681, + 682, 683, 683, 682, 683, 683, 687, 688, 847, 687, + 688, 690, 692, 693, 690, 692, 693, 874, 876, 878, + 874, 876, 878, 879, 880, 881, 879, 880, 881, 882, + 883, 714, 882, 883, 714, 886, 716, 992, 886, 716, + + 377, 378, 379, 1544, 380, 381, 382, 1225, 383, 1226, + 384, 385, 773, 590, 773, 773, 717, 774, 718, 717, + 719, 718, 720, 719, 721, 720, 889, 721, 727, 889, + 891, 727, 729, 891, 892, 729, 1290, 892, 775, 776, + 731, 350, 731, 731, 747, 894, 777, 778, 894, 898, + 779, 780, 1353, 781, 747, 902, 1290, 782, 731, 350, + 731, 731, 903, 899, 747, 783, 734, 735, 736, 734, + 734, 735, 736, 734, 747, 747, 912, 784, 747, 912, + 898, 734, 735, 736, 734, 747, 902, 747, 942, 943, + 944, 945, 946, 903, 899, 747, 1319, 734, 735, 736, + + 734, 953, 968, 969, 970, 747, 1353, 971, 1353, 747, + 874, 972, 1318, 874, 997, 979, 1319, 997, 747, 942, + 943, 944, 945, 946, 900, 834, 835, 901, 834, 835, + 1033, 1034, 953, 968, 969, 970, 1318, 747, 971, 785, + 786, 787, 972, 788, 789, 790, 979, 791, 1543, 792, + 793, 590, 590, 590, 590, 900, 794, 836, 901, 1353, + 836, 775, 776, 837, 838, 1353, 837, 838, 747, 777, + 778, 1161, 841, 779, 780, 841, 781, 795, 796, 842, + 782, 844, 842, 1353, 844, 797, 798, 947, 783, 799, + 800, 948, 801, 1542, 845, 949, 802, 845, 1016, 846, + + 784, 950, 846, 846, 803, 850, 846, 951, 850, 987, + 851, 913, 914, 851, 853, 1150, 804, 853, 947, 1258, + 1005, 874, 948, 1005, 874, 874, 949, 876, 874, 1016, + 876, 1011, 950, 878, 1011, 1327, 878, 879, 951, 880, + 879, 881, 880, 882, 881, 883, 882, 886, 883, 1013, + 886, 889, 1013, 1014, 889, 891, 1014, 892, 891, 1383, + 892, 1353, 785, 786, 787, 1353, 788, 789, 790, 1160, + 791, 894, 792, 793, 894, 1084, 1085, 1151, 805, 806, + 807, 1259, 808, 809, 810, 984, 811, 952, 812, 813, + 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + + 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + 862, 862, 862, 862, 862, 862, 863, 863, 863, 863, + 863, 863, 863, 863, 863, 863, 863, 863, 863, 863, + 863, 863, 863, 863, 863, 863, 863, 863, 863, 863, + 863, 863, 1114, 1115, 1152, 1153, 1017, 863, 863, 863, + 863, 863, 863, 863, 863, 863, 863, 863, 863, 863, + 863, 863, 863, 863, 863, 863, 863, 863, 863, 863, + 863, 863, 863, 921, 590, 921, 921, 1017, 922, 738, + 1156, 1005, 795, 796, 1005, 747, 1019, 1157, 1374, 1020, + 797, 798, 1353, 1021, 799, 800, 1062, 801, 1328, 923, + + 924, 802, 734, 735, 736, 734, 1063, 925, 926, 803, + 738, 927, 928, 1064, 929, 973, 747, 1019, 930, 974, + 1020, 804, 1065, 975, 1021, 1066, 931, 1062, 1073, 976, + 1091, 1092, 1096, 1101, 1102, 977, 1103, 1063, 932, 1104, + 1106, 747, 1088, 1541, 1064, 1088, 973, 1089, 1129, 1130, + 974, 1105, 1353, 1065, 975, 1068, 1066, 1306, 1145, 1073, + 976, 1091, 1092, 1096, 1101, 1102, 977, 1103, 1105, 1143, + 1104, 1106, 747, 974, 1068, 988, 1093, 1145, 1134, 1129, + 1130, 1139, 1140, 805, 806, 807, 1143, 808, 809, 810, + 1273, 811, 974, 812, 813, 1090, 1178, 1034, 1353, 1094, + + 933, 934, 935, 1274, 936, 937, 938, 1093, 939, 1134, + 940, 941, 1139, 1140, 1353, 978, 658, 658, 658, 658, + 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, + 658, 658, 658, 658, 658, 658, 658, 658, 658, 658, + 658, 658, 661, 661, 661, 661, 661, 661, 661, 661, + 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, + 661, 661, 661, 661, 661, 661, 661, 661, 997, 1230, + 1231, 997, 1095, 661, 661, 661, 661, 661, 661, 661, + 661, 661, 661, 661, 661, 661, 661, 661, 661, 661, + 661, 661, 661, 661, 661, 661, 661, 661, 661, 1041, + + 590, 1041, 1041, 1005, 1042, 1141, 1005, 1126, 1043, 1044, + 1126, 1166, 1127, 1353, 1166, 1142, 1045, 1046, 1159, 1144, + 1047, 1048, 1155, 1049, 1264, 1043, 1044, 1050, 1131, 417, + 875, 1265, 417, 1045, 1046, 1051, 1141, 1047, 1048, 1169, + 1049, 1067, 1097, 739, 1050, 1068, 1142, 1052, 747, 1069, + 1144, 1132, 1051, 1011, 1098, 1070, 1011, 1017, 1170, 1131, + 1128, 1071, 1013, 1099, 1052, 1013, 1014, 1100, 1518, 1014, + 1169, 1171, 1067, 1097, 739, 1272, 1068, 1208, 1272, 747, + 1069, 734, 735, 736, 734, 1098, 1070, 1172, 1017, 1170, + 1209, 1210, 1071, 1171, 1099, 1110, 1516, 1110, 1100, 1111, + + 1111, 1111, 1111, 1111, 1111, 1111, 1111, 1111, 1208, 1053, + 1054, 1055, 1353, 1056, 1057, 1058, 1211, 1059, 1212, 1060, + 1061, 1209, 1210, 1219, 1133, 1237, 1053, 1054, 1055, 1253, + 1056, 1057, 1058, 1353, 1059, 1234, 1060, 1061, 1234, 1372, + 1235, 1072, 1108, 734, 735, 736, 734, 1211, 1253, 1212, + 1109, 1109, 1109, 1109, 1219, 1353, 1237, 1353, 1109, 1109, + 1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, + 1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, 1109, + 1109, 1109, 1109, 1109, 1135, 1173, 1174, 1251, 1236, 1260, + 1261, 1214, 1239, 1150, 1238, 1515, 1136, 1242, 1247, 1248, + + 1249, 1250, 1252, 1239, 1251, 1137, 1275, 1173, 1174, 1138, + 1214, 1239, 1148, 1317, 1148, 1135, 1149, 1149, 1149, 1149, + 1149, 1149, 1149, 1149, 1149, 1238, 1240, 1136, 1242, 1247, + 1248, 1249, 1250, 1252, 1239, 1276, 1137, 1275, 1131, 1247, + 1138, 1187, 590, 1187, 1187, 1301, 1188, 1247, 1301, 1234, + 1189, 1190, 1234, 1295, 1235, 1151, 1295, 1131, 1191, 1192, + 1353, 1247, 1193, 1194, 1375, 1195, 1276, 1189, 1190, 1196, + 1247, 1247, 1381, 1247, 1353, 1191, 1192, 1197, 1247, 1193, + 1194, 1278, 1195, 1213, 1243, 1234, 1196, 1214, 1234, 1198, + 1235, 1215, 1247, 1282, 1197, 1279, 1244, 1216, 1283, 1241, + + 1247, 1353, 1247, 1217, 1247, 1245, 1198, 1302, 1126, 1246, + 1353, 1126, 1278, 1127, 1213, 1243, 1353, 981, 1214, 1247, + 1303, 1356, 1215, 1247, 1282, 1139, 1279, 1244, 1216, 1283, + 982, 1247, 1247, 1304, 1217, 1305, 1245, 1256, 1236, 1256, + 1246, 1257, 1257, 1257, 1257, 1257, 1257, 1257, 1257, 1257, + 1247, 1199, 1200, 1201, 1247, 1202, 1203, 1204, 1302, 1205, + 1139, 1206, 1207, 1247, 1304, 1139, 1305, 1139, 1199, 1200, + 1201, 1303, 1202, 1203, 1204, 1322, 1205, 1234, 1206, 1207, + 1234, 1353, 1235, 1218, 1254, 1353, 1418, 1166, 1296, 1297, + 1166, 1139, 1255, 1255, 1255, 1255, 1139, 1139, 1139, 1139, + + 1255, 1255, 1255, 1255, 1255, 1255, 1255, 1255, 1255, 1255, + 1255, 1255, 1255, 1255, 1255, 1255, 1255, 1255, 1255, 1255, + 1255, 1255, 1255, 1255, 1255, 1255, 1234, 1139, 1139, 1234, + 1236, 1235, 1189, 1190, 1311, 1353, 1307, 1312, 1139, 1139, + 1191, 1192, 1329, 1139, 1193, 1194, 1166, 1195, 1353, 1166, + 1308, 1196, 1139, 1280, 1324, 1332, 1281, 1324, 1139, 1285, + 417, 875, 1320, 417, 1353, 1311, 1247, 1307, 1312, 1139, + 1139, 1198, 1126, 1126, 1139, 1126, 1126, 1127, 1127, 1236, + 993, 1308, 1353, 1139, 1280, 1353, 1332, 1281, 1257, 1257, + 1257, 1257, 1257, 1257, 1257, 1257, 1257, 1247, 1284, 1284, + + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, 1284, + 1284, 1284, 1284, 1284, 1333, 1128, 1128, 734, 735, 736, + 734, 1129, 1131, 1199, 1200, 1201, 1353, 1202, 1203, 1204, + 1139, 1205, 1353, 1206, 1207, 1189, 1190, 1126, 1316, 1353, + 1126, 1131, 1127, 1191, 1192, 1333, 1353, 1193, 1194, 1371, + 1195, 969, 1129, 1353, 1196, 1353, 1353, 795, 796, 1353, + 990, 991, 1286, 1362, 1309, 797, 798, 1310, 1353, 799, + 800, 1486, 801, 1353, 1198, 1353, 802, 1139, 972, 1325, + 1326, 1485, 969, 1484, 1314, 734, 735, 736, 734, 1367, + + 1128, 1341, 735, 1342, 1341, 1309, 804, 968, 1310, 1149, + 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1139, 972, + 1353, 1353, 795, 796, 1344, 735, 1345, 1344, 1353, 1353, + 797, 798, 1483, 1353, 799, 800, 1366, 801, 968, 1369, + 1370, 802, 1347, 735, 1348, 1347, 1199, 1200, 1201, 1315, + 1202, 1203, 1204, 970, 1205, 1134, 1206, 1207, 985, 1353, + 986, 804, 734, 735, 736, 734, 971, 1162, 805, 806, + 807, 1139, 808, 809, 810, 1353, 811, 1323, 812, 813, + 795, 796, 1353, 1156, 970, 1353, 1134, 1353, 797, 798, + 1157, 1353, 799, 800, 1382, 801, 1353, 971, 1353, 802, + + 1126, 1126, 1139, 1126, 1126, 1355, 1355, 803, 979, 1353, + 1130, 1353, 973, 1479, 1353, 1140, 974, 1144, 1353, 804, + 975, 1131, 1477, 805, 806, 807, 976, 808, 809, 810, + 1353, 811, 977, 812, 813, 590, 590, 590, 590, 979, + 1354, 1130, 1353, 973, 1132, 1353, 1140, 974, 1144, 1376, + 1377, 975, 1131, 1128, 1353, 1353, 1467, 976, 1152, 1153, + 1572, 795, 796, 977, 1305, 1356, 1379, 1380, 1353, 797, + 798, 1353, 1353, 799, 800, 1141, 801, 1353, 1142, 1304, + 802, 805, 806, 807, 1368, 808, 809, 810, 803, 811, + 1353, 812, 813, 1135, 1145, 1305, 1301, 1130, 1143, 1301, + + 804, 1353, 974, 1139, 1139, 1136, 1141, 1466, 1318, 1142, + 1304, 1139, 978, 1145, 1137, 1143, 1353, 1133, 1138, 1368, + 1301, 974, 1126, 1301, 1135, 1126, 1126, 1355, 1130, 1126, + 1353, 1355, 1318, 1465, 1139, 1139, 1136, 1353, 1353, 1353, + 1353, 1458, 1139, 1353, 1353, 1137, 1148, 1353, 1148, 1138, + 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1149, 1353, + 1312, 1139, 805, 806, 807, 1139, 808, 809, 810, 1139, + 811, 1353, 812, 813, 1139, 1128, 1307, 1139, 1319, 1128, + 1353, 1301, 1126, 1311, 1301, 1126, 1353, 1355, 1139, 1353, + 1308, 1312, 1139, 1353, 1353, 1353, 1139, 747, 1319, 1324, + + 1139, 1353, 1324, 1450, 1353, 1139, 1361, 1307, 1139, 1309, + 1139, 1437, 1310, 1453, 1311, 795, 796, 1379, 1380, 1139, + 1436, 1308, 1139, 797, 798, 1365, 1301, 799, 800, 1301, + 801, 1363, 1353, 1453, 802, 1128, 1353, 1361, 1353, 1353, + 1309, 1139, 1314, 1310, 1149, 1149, 1149, 1149, 1149, 1149, + 1149, 1149, 1149, 1139, 804, 1435, 1365, 795, 796, 1434, + 1376, 1377, 1363, 1433, 1364, 797, 798, 1360, 1432, 799, + 800, 1360, 801, 1353, 1428, 1126, 802, 1454, 1126, 1316, + 1355, 1358, 1361, 1358, 1315, 1359, 1359, 1359, 1359, 1359, + 1359, 1359, 1359, 1359, 1353, 1364, 804, 1454, 1360, 1572, + + 1378, 1130, 1360, 1503, 1369, 1370, 1139, 1572, 1572, 1572, + 1572, 1427, 1363, 1361, 1139, 1398, 805, 806, 807, 1316, + 808, 809, 810, 1503, 811, 1364, 812, 813, 1128, 1181, + 1365, 1390, 1130, 1126, 1325, 1326, 1126, 1139, 1127, 1386, + 1378, 747, 1358, 1363, 1358, 1139, 1359, 1359, 1359, 1359, + 1359, 1359, 1359, 1359, 1359, 1390, 1364, 1387, 805, 806, + 807, 1365, 808, 809, 810, 1455, 811, 1408, 812, 813, + 1386, 1388, 1139, 747, 1389, 1344, 735, 1345, 1344, 1394, + 735, 1342, 1394, 1409, 1415, 1380, 1128, 1455, 1387, 1408, + 1426, 1388, 1394, 735, 1342, 1394, 1389, 1394, 735, 1342, + + 1394, 1402, 1425, 1139, 1395, 735, 1345, 1395, 1395, 735, + 1345, 1395, 1395, 735, 1345, 1395, 1396, 735, 1348, 1396, + 1396, 735, 1348, 1396, 1396, 735, 1348, 1396, 795, 796, + 1126, 1424, 1402, 1126, 1131, 1127, 797, 798, 1139, 1126, + 799, 800, 1126, 801, 1127, 1126, 1361, 802, 1126, 1403, + 1127, 1421, 1410, 1411, 1422, 803, 1359, 1359, 1359, 1359, + 1359, 1359, 1359, 1359, 1359, 1131, 1464, 804, 1126, 1139, + 1499, 1126, 1423, 1127, 1410, 1411, 1126, 1361, 1420, 1126, + 1403, 1127, 1421, 1400, 1420, 1422, 1394, 735, 1342, 1394, + 1464, 1429, 1401, 1430, 1499, 1404, 1451, 1404, 1128, 1405, + + 1405, 1405, 1405, 1405, 1405, 1405, 1405, 1405, 1395, 735, + 1345, 1395, 1396, 735, 1348, 1396, 734, 735, 736, 734, + 1126, 1128, 1429, 1126, 1430, 1127, 1419, 1451, 1418, 805, + 806, 807, 1417, 808, 809, 810, 1572, 811, 1452, 812, + 813, 1572, 1126, 1439, 1500, 1126, 1439, 1127, 1440, 1572, + 1572, 1572, 1572, 1405, 1405, 1405, 1405, 1405, 1405, 1405, + 1405, 1405, 795, 796, 1504, 1416, 1378, 1460, 1500, 1452, + 797, 798, 1414, 1128, 799, 800, 1139, 801, 795, 796, + 1443, 802, 1413, 1443, 1504, 1444, 797, 798, 1461, 1447, + 799, 800, 1447, 801, 1448, 1128, 1441, 802, 1460, 1126, + + 747, 804, 1126, 1456, 1127, 1456, 747, 1457, 1457, 1457, + 1457, 1457, 1457, 1457, 1457, 1457, 1572, 804, 1462, 1461, + 1412, 1463, 1481, 1409, 1572, 1572, 1572, 1572, 1482, 1443, + 1501, 747, 1443, 1445, 1444, 1502, 1406, 747, 1462, 1139, + 1505, 1468, 1449, 1463, 1468, 1468, 1440, 1139, 1468, 1398, + 1440, 1468, 1128, 1481, 1468, 1468, 1440, 1397, 1468, 1482, + 1440, 1501, 1505, 805, 806, 807, 1502, 808, 809, 810, + 1139, 811, 1471, 812, 813, 1471, 1393, 1444, 1139, 805, + 806, 807, 1445, 808, 809, 810, 1392, 811, 1471, 812, + 813, 1471, 1471, 1444, 1441, 1471, 1471, 1444, 1441, 1471, + + 1474, 1444, 1391, 1474, 1441, 1448, 1474, 1474, 1441, 1474, + 1474, 1448, 1448, 1474, 1385, 1383, 1474, 1469, 1448, 734, + 735, 736, 734, 1126, 1468, 1445, 1126, 1468, 1127, 1440, + 1470, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, 1457, + 1525, 1445, 1548, 1526, 1382, 1445, 1381, 1550, 1527, 1445, + 1375, 1471, 1374, 1449, 1471, 1373, 1444, 1372, 1472, 1449, + 1449, 1371, 1525, 1368, 1548, 1474, 1449, 1526, 1474, 1550, + 1448, 1473, 1527, 1368, 1572, 1475, 1468, 1441, 1367, 1468, + 1366, 1440, 1572, 1572, 1572, 1572, 1528, 1468, 1476, 1489, + 1468, 1489, 1440, 1490, 1490, 1490, 1490, 1490, 1490, 1490, + + 1490, 1490, 1471, 1468, 1445, 1471, 1468, 1444, 1440, 1471, + 1528, 1549, 1471, 1556, 1444, 1493, 1572, 1493, 1449, 1494, + 1494, 1494, 1494, 1494, 1494, 1494, 1494, 1494, 1438, 1441, + 1555, 1549, 1362, 1442, 1353, 1556, 1438, 1438, 1438, 1438, + 1507, 1442, 1442, 1442, 1442, 1557, 1561, 1551, 1478, 1468, + 1555, 1564, 1468, 1353, 1440, 1445, 1508, 1352, 1471, 1487, + 1350, 1471, 1510, 1444, 1349, 1557, 1561, 1488, 1488, 1488, + 1488, 1551, 1339, 1564, 1338, 1488, 1488, 1488, 1488, 1488, + 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, + 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, 1488, + + 1488, 1337, 1441, 1471, 1336, 1335, 1471, 1334, 1444, 1329, + 1328, 1511, 1474, 1491, 1327, 1474, 1323, 1448, 1322, 1321, + 1320, 1492, 1492, 1492, 1492, 734, 735, 736, 734, 1492, + 1492, 1492, 1492, 1492, 1492, 1492, 1492, 1492, 1492, 1492, + 1492, 1492, 1492, 1492, 1492, 1492, 1492, 1492, 1492, 1492, + 1492, 1492, 1492, 1492, 1492, 1560, 1445, 1474, 1474, 1568, + 1474, 1474, 1448, 1448, 1317, 1513, 1126, 1495, 1316, 1126, + 1150, 1127, 968, 1306, 1300, 1496, 1496, 1496, 1496, 1560, + 1299, 1568, 1298, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, - 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1454, 1429, - 1292, 1454, 1222, 1428, 1219, 1218, 1498, 1457, 1217, 1214, - - 1457, 1188, 1432, 1497, 1501, 1479, 1479, 1479, 1479, 1479, - 1479, 1479, 1479, 1479, 1483, 1483, 1483, 1483, 1483, 1483, - 1483, 1483, 1483, 1430, 1213, 1210, 1209, 1434, 1199, 1175, - 1174, 1430, 1430, 1430, 1430, 1434, 1434, 1434, 1434, 1174, - 1173, 1429, 1457, 1172, 1171, 1457, 1170, 1432, 1028, 1168, - 1433, 1457, 744, 1167, 1457, 1166, 1432, 1161, 1460, 1460, - 1507, 1460, 1460, 1436, 1436, 1156, 1154, 1153, 1499, 1499, - 1499, 1499, 1499, 1499, 1499, 1499, 1499, 1499, 1499, 1499, - 1499, 1499, 1499, 1499, 1499, 1499, 1499, 1499, 1499, 1499, - 1499, 1499, 1499, 1499, 1152, 1433, 1460, 1151, 1150, 1460, - - 1149, 1436, 1454, 1146, 1500, 1454, 1145, 1428, 1137, 1136, - 1135, 1504, 1503, 1120, 1118, 1117, 1116, 1115, 1114, 1113, - 1110, 1109, 1502, 1502, 1502, 1502, 1502, 1502, 1502, 1502, - 1502, 1502, 1502, 1502, 1502, 1502, 1502, 1502, 1502, 1502, - 1502, 1502, 1502, 1502, 1502, 1502, 1502, 1502, 1460, 1437, - 1100, 1460, 1099, 1436, 1454, 1429, 1084, 1454, 1457, 1428, - 1082, 1457, 1081, 1432, 1455, 1487, 1487, 1487, 1487, 1487, - 1487, 1487, 1487, 1487, 1078, 1457, 1077, 1509, 1457, 1460, - 1432, 1076, 1460, 1460, 1436, 1073, 1460, 1047, 1436, 1072, - 1069, 1068, 1058, 1034, 1033, 1032, 1031, 1025, 1024, 1023, - - 1022, 1437, 1021, 1020, 1019, 1019, 1018, 1429, 734, 1015, - 891, 1433, 1008, 1004, 992, 992, 1510, 991, 991, 989, - 1458, 988, 985, 984, 983, 980, 799, 979, 1433, 1456, - 976, 975, 1437, 1511, 965, 963, 1437, 1512, 962, 959, - 958, 1461, 957, 954, 1454, 1514, 928, 1454, 953, 1428, - 1459, 950, 949, 939, 1513, 915, 914, 1519, 1462, 1519, - 913, 1520, 1520, 1520, 1520, 1520, 1520, 1520, 1520, 1520, - 912, 908, 907, 906, 905, 904, 903, 902, 901, 751, - 744, 744, 900, 894, 885, 883, 882, 880, 880, 879, - 879, 872, 693, 868, 856, 856, 853, 1429, 1521, 853, - - 851, 851, 852, 850, 824, 816, 1522, 1522, 1522, 1522, - 810, 810, 769, 769, 1522, 1522, 1522, 1522, 1522, 1522, - 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, - 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, - 1457, 767, 767, 1457, 765, 1432, 764, 763, 762, 761, - 760, 759, 756, 1523, 755, 1523, 750, 1524, 1524, 1524, - 1524, 1524, 1524, 1524, 1524, 1524, 749, 734, 555, 552, - 729, 725, 724, 723, 722, 721, 721, 714, 1558, 311, - 698, 697, 696, 497, 695, 690, 690, 1558, 1558, 1558, - 649, 1558, 1558, 1433, 1525, 1558, 465, 1558, 606, 606, - - 605, 605, 1526, 1526, 1526, 1526, 597, 596, 595, 594, - 1526, 1526, 1526, 1526, 1526, 1526, 1526, 1526, 1526, 1526, - 1526, 1526, 1526, 1526, 1526, 1526, 1526, 1526, 1526, 1526, - 1526, 1526, 1526, 1526, 1526, 1526, 1460, 593, 592, 1460, - 591, 1436, 587, 587, 585, 585, 582, 581, 580, 1527, - 577, 1527, 576, 1528, 1528, 1528, 1528, 1528, 1528, 1528, - 1528, 1528, 575, 572, 375, 571, 570, 569, 559, 366, - 363, 553, 552, 355, 546, 545, 544, 543, 542, 541, - 535, 535, 534, 534, 530, 529, 527, 526, 523, 1437, - 1529, 152, 311, 506, 506, 501, 501, 499, 1530, 1530, - - 1530, 1530, 499, 500, 498, 496, 1530, 1530, 1530, 1530, - 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, - 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1530, - 1530, 1530, 1454, 291, 490, 1454, 485, 1428, 484, 481, - 472, 468, 465, 1558, 408, 406, 404, 227, 225, 1520, - 1520, 1520, 1520, 1520, 1520, 1520, 1520, 1520, 220, 1457, - 392, 388, 1457, 390, 1432, 388, 386, 385, 208, 202, - 205, 204, 195, 204, 349, 348, 1524, 1524, 1524, 1524, - 1524, 1524, 1524, 1524, 1524, 1429, 1535, 1535, 1535, 1535, - 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, - 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, - 1535, 1535, 1433, 1536, 1536, 1536, 1536, 1536, 1536, 1536, + 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1496, 1474, + 1449, 1514, 1474, 1294, 1448, 1293, 1292, 1291, 1468, 1128, + 1288, 1468, 1497, 1440, 1497, 1565, 1498, 1498, 1498, 1498, + 1498, 1498, 1498, 1498, 1498, 1490, 1490, 1490, 1490, 1490, + 1490, 1490, 1490, 1490, 1446, 1569, 1287, 1571, 1438, 1565, + 1258, 1208, 1446, 1446, 1446, 1446, 1438, 1438, 1438, 1438, + 1277, 1271, 1449, 1468, 1270, 1269, 1468, 1569, 1440, 1571, + 1268, 1441, 1267, 1266, 1468, 1126, 1263, 1468, 1126, 1440, + 1127, 1468, 1471, 1262, 1468, 1471, 1440, 1444, 1233, 1506, + 1506, 1506, 1506, 1506, 1506, 1506, 1506, 1506, 1506, 1506, + + 1506, 1506, 1506, 1506, 1506, 1506, 1506, 1506, 1506, 1506, + 1506, 1506, 1506, 1506, 1506, 1232, 1441, 1471, 1471, 1229, + 1471, 1471, 1444, 1444, 1228, 1227, 1474, 1508, 1128, 1474, + 1442, 1448, 1224, 1198, 1507, 1511, 1223, 1220, 1442, 1442, + 1442, 1442, 1184, 1509, 1509, 1509, 1509, 1509, 1509, 1509, + 1509, 1509, 1509, 1509, 1509, 1509, 1509, 1509, 1509, 1509, + 1509, 1509, 1509, 1509, 1509, 1509, 1509, 1509, 1509, 1471, + 1445, 1510, 1471, 1183, 1444, 1183, 1182, 1181, 1474, 1514, + 1180, 1474, 1179, 1448, 1032, 1177, 1494, 1494, 1494, 1494, + 1494, 1494, 1494, 1494, 1494, 1498, 1498, 1498, 1498, 1498, + + 1498, 1498, 1498, 1498, 1517, 1446, 734, 735, 736, 734, + 747, 1176, 1175, 1446, 1446, 1446, 1446, 1172, 1165, 1163, + 1162, 1161, 1445, 1474, 1468, 1160, 1474, 1468, 1448, 1440, + 1468, 1449, 1159, 1468, 1471, 1440, 1158, 1471, 1471, 1444, + 1155, 1471, 1474, 1444, 1154, 1474, 1146, 1448, 1125, 1512, + 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, + 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, + 1512, 1512, 1512, 1512, 1512, 1474, 1449, 1441, 1474, 1474, + 1448, 1124, 1474, 1441, 1448, 1123, 1469, 1445, 1122, 1121, + 1120, 1445, 1520, 1117, 1116, 1449, 1472, 1087, 1126, 1519, + + 1522, 1126, 1086, 1127, 1475, 1470, 1083, 1126, 1082, 1521, + 1126, 1081, 1127, 1473, 1078, 1052, 1077, 1523, 1074, 1038, + 1037, 1468, 1036, 1035, 1468, 1029, 1440, 1028, 1449, 1027, + 1026, 1025, 1513, 1022, 1529, 1022, 1529, 1524, 1530, 1530, + 1530, 1530, 1530, 1530, 1530, 1530, 1530, 1018, 1012, 1008, + 1476, 1128, 996, 996, 995, 995, 993, 992, 989, 988, + 1128, 987, 984, 804, 983, 980, 967, 966, 963, 962, + 961, 958, 932, 957, 1441, 1531, 954, 918, 917, 916, + 915, 911, 910, 1532, 1532, 1532, 1532, 909, 908, 905, + 904, 1532, 1532, 1532, 1532, 1532, 1532, 1532, 1532, 1532, + + 1532, 1532, 1532, 1532, 1532, 1532, 1532, 1532, 1532, 1532, + 1532, 1532, 1532, 1532, 1532, 1532, 1532, 1471, 754, 559, + 1471, 897, 1444, 735, 890, 888, 887, 885, 885, 884, + 1533, 884, 1533, 877, 1534, 1534, 1534, 1534, 1534, 1534, + 1534, 1534, 1534, 694, 873, 861, 861, 858, 858, 856, + 856, 857, 855, 829, 821, 815, 815, 772, 772, 770, + 770, 768, 767, 766, 765, 764, 763, 762, 759, 758, + 1445, 1535, 556, 553, 730, 726, 725, 724, 723, 1536, + 1536, 1536, 1536, 722, 722, 715, 1572, 1536, 1536, 1536, + 1536, 1536, 1536, 1536, 1536, 1536, 1536, 1536, 1536, 1536, + 1536, 1536, 1536, 1536, 1536, 1536, 1536, 1536, 1536, 1536, - 1536, 1536, 1536, 1536, 1536, 1536, 1536, 1536, 1536, 1460, - 347, 346, 1460, 345, 1436, 344, 331, 152, 305, 303, - 300, 299, 278, 277, 239, 125, 1528, 1528, 1528, 1528, - 1528, 1528, 1528, 1528, 1528, 124, 239, 104, 224, 223, - 213, 212, 211, 210, 205, 204, 200, 188, 186, 184, - 182, 181, 180, 179, 173, 171, 161, 160, 156, 127, - 125, 124, 1437, 1537, 1537, 1537, 1537, 1537, 1537, 1537, - - 1537, 1537, 1537, 1537, 1537, 1537, 1537, 1537, 1537, 1537, - 1537, 1537, 1537, 1537, 1537, 1537, 1537, 1537, 1537, 38, - 38, 38, 38, 38, 38, 38, 38, 38, 38, 38, - 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, - 39, 56, 56, 56, 56, 56, 56, 56, 56, 56, - 56, 56, 68, 68, 68, 68, 68, 68, 68, 68, - 68, 68, 68, 73, 73, 73, 73, 73, 73, 73, - 73, 73, 73, 73, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42, 42, 90, 90, 90, 90, 90, - 90, 90, 90, 90, 90, 90, 94, 94, 94, 94, - - 94, 94, 94, 94, 94, 94, 94, 98, 98, 98, - 98, 98, 98, 98, 98, 98, 98, 98, 101, 101, - 101, 101, 101, 101, 101, 101, 101, 101, 101, 114, - 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, - 128, 128, 128, 128, 162, 162, 108, 162, 162, 162, - 162, 162, 162, 162, 162, 172, 1558, 102, 102, 172, - 172, 172, 172, 172, 172, 172, 177, 177, 38, 38, - 177, 177, 177, 177, 177, 177, 177, 183, 183, 1558, - 183, 183, 183, 183, 183, 183, 183, 183, 185, 1558, - 1558, 1558, 185, 185, 185, 185, 185, 185, 185, 187, - - 1558, 1558, 1558, 187, 187, 187, 187, 187, 187, 187, - 189, 1558, 1558, 1558, 189, 189, 189, 189, 189, 189, - 189, 206, 206, 1558, 206, 206, 206, 206, 206, 206, - 206, 206, 214, 214, 1558, 214, 214, 214, 214, 214, - 214, 214, 214, 219, 219, 1558, 219, 219, 219, 219, - 219, 219, 219, 219, 229, 229, 1558, 229, 229, 229, - 229, 229, 229, 229, 229, 245, 245, 245, 245, 245, - 245, 245, 245, 245, 245, 245, 128, 128, 128, 128, - 280, 280, 1558, 280, 280, 280, 280, 280, 280, 280, - 280, 282, 282, 1558, 282, 282, 282, 282, 282, 282, - - 282, 282, 290, 290, 1558, 290, 290, 290, 290, 290, - 290, 290, 290, 295, 295, 1558, 295, 295, 295, 295, - 295, 295, 295, 295, 301, 1558, 301, 301, 302, 302, - 304, 1558, 1558, 304, 304, 172, 1558, 1558, 1558, 172, - 172, 172, 172, 172, 172, 172, 177, 177, 1558, 1558, - 177, 177, 177, 177, 177, 177, 177, 183, 183, 1558, - 183, 183, 183, 183, 183, 183, 183, 183, 185, 1558, - 1558, 1558, 185, 185, 185, 185, 185, 185, 185, 187, - 1558, 1558, 1558, 187, 187, 187, 187, 187, 187, 187, - 189, 1558, 1558, 1558, 189, 189, 189, 189, 189, 189, - - 189, 353, 353, 353, 353, 353, 353, 353, 353, 353, - 353, 353, 362, 362, 1558, 362, 362, 362, 362, 362, - 362, 362, 362, 387, 387, 1558, 387, 387, 387, 387, - 387, 387, 387, 387, 389, 389, 1558, 389, 389, 389, - 389, 389, 389, 389, 389, 219, 219, 1558, 219, 219, - 219, 219, 219, 219, 219, 219, 229, 229, 1558, 229, - 229, 229, 229, 229, 229, 229, 229, 416, 416, 416, - 416, 416, 416, 416, 416, 416, 416, 416, 290, 290, - 1558, 290, 290, 290, 290, 290, 290, 290, 290, 495, - 495, 1558, 495, 495, 495, 495, 495, 495, 495, 495, - - 280, 280, 1558, 280, 280, 280, 280, 280, 280, 280, - 280, 497, 497, 1558, 497, 497, 497, 497, 497, 497, - 497, 497, 502, 502, 1558, 502, 502, 502, 502, 502, - 502, 502, 502, 503, 503, 1558, 503, 503, 503, 503, - 503, 503, 503, 503, 504, 504, 504, 504, 504, 1558, - 504, 504, 504, 504, 504, 505, 505, 1558, 505, 505, - 505, 505, 505, 505, 505, 505, 508, 508, 509, 509, - 509, 509, 1558, 509, 509, 509, 509, 509, 509, 510, - 510, 510, 510, 510, 1558, 510, 510, 510, 510, 510, - 547, 547, 1558, 547, 547, 547, 547, 547, 547, 547, - - 547, 353, 353, 353, 353, 353, 353, 353, 353, 353, - 353, 353, 554, 554, 1558, 554, 554, 554, 554, 554, - 554, 554, 554, 583, 583, 1558, 583, 583, 583, 583, - 583, 583, 583, 583, 584, 584, 1558, 584, 584, 584, - 584, 584, 584, 584, 584, 586, 586, 1558, 586, 586, - 586, 586, 586, 586, 586, 586, 590, 590, 1558, 590, - 590, 590, 590, 590, 590, 590, 590, 598, 598, 1558, - 598, 598, 598, 598, 598, 598, 598, 598, 229, 229, - 1558, 229, 229, 229, 229, 229, 229, 229, 229, 638, - 638, 1558, 638, 638, 638, 638, 638, 638, 638, 638, - - 640, 640, 1558, 640, 640, 640, 640, 640, 640, 640, - 640, 648, 648, 1558, 648, 648, 648, 648, 648, 648, - 648, 648, 684, 684, 1558, 684, 684, 684, 684, 684, - 684, 684, 684, 688, 688, 1558, 688, 688, 688, 688, - 688, 688, 688, 688, 495, 495, 1558, 495, 495, 495, - 495, 495, 495, 495, 495, 693, 693, 1558, 693, 693, - 693, 693, 693, 693, 693, 693, 694, 694, 1558, 694, - 694, 694, 694, 694, 694, 694, 694, 504, 504, 504, - 504, 504, 504, 504, 504, 504, 504, 504, 304, 304, - 509, 509, 509, 509, 509, 509, 509, 509, 509, 509, - - 509, 510, 510, 510, 510, 510, 510, 510, 510, 510, - 510, 510, 640, 640, 1558, 640, 640, 640, 640, 640, - 640, 640, 640, 547, 547, 1558, 547, 547, 547, 547, - 547, 547, 547, 547, 732, 732, 1558, 732, 732, 732, - 732, 732, 732, 732, 732, 583, 583, 1558, 583, 583, - 583, 583, 583, 583, 583, 583, 766, 766, 1558, 766, - 766, 766, 766, 766, 766, 766, 766, 768, 768, 1558, - 768, 768, 768, 768, 768, 768, 768, 768, 809, 809, - 1558, 809, 809, 809, 809, 809, 809, 809, 809, 598, - 598, 1558, 598, 598, 598, 598, 598, 598, 598, 598, - - 811, 811, 1558, 811, 811, 811, 811, 811, 811, 811, - 811, 812, 812, 1558, 812, 812, 812, 812, 812, 812, - 812, 812, 229, 229, 1558, 229, 229, 229, 229, 229, - 229, 229, 229, 813, 813, 1558, 813, 813, 813, 813, - 813, 813, 813, 813, 814, 814, 1558, 814, 814, 814, - 814, 814, 814, 814, 814, 815, 815, 1558, 815, 815, - 815, 815, 815, 815, 815, 815, 416, 416, 1558, 416, - 416, 416, 416, 416, 416, 416, 416, 823, 823, 1558, - 823, 823, 823, 823, 823, 823, 823, 823, 843, 843, - 1558, 843, 843, 843, 843, 843, 843, 843, 843, 847, - - 847, 1558, 847, 847, 847, 847, 847, 847, 847, 847, - 638, 638, 1558, 638, 638, 638, 638, 638, 638, 638, - 638, 849, 849, 1558, 849, 849, 849, 849, 849, 849, - 849, 849, 854, 854, 1558, 854, 854, 854, 854, 854, - 854, 854, 854, 855, 855, 855, 855, 855, 855, 855, - 855, 855, 855, 855, 859, 859, 859, 859, 859, 859, - 859, 859, 859, 859, 859, 860, 860, 860, 860, 860, - 860, 860, 860, 860, 860, 860, 861, 861, 1558, 861, - 861, 861, 861, 861, 861, 861, 861, 862, 862, 1558, - 862, 862, 862, 862, 862, 862, 862, 862, 863, 863, - - 1558, 863, 863, 863, 863, 863, 863, 863, 863, 864, - 864, 1558, 864, 864, 864, 864, 864, 864, 864, 864, - 865, 865, 1558, 865, 865, 865, 865, 865, 865, 865, - 865, 866, 866, 1558, 866, 866, 866, 866, 866, 866, - 866, 866, 684, 684, 1558, 684, 684, 684, 684, 684, - 684, 684, 684, 867, 867, 1558, 867, 867, 867, 867, - 867, 867, 867, 867, 688, 688, 1558, 688, 688, 688, - 688, 688, 688, 688, 688, 870, 1558, 870, 870, 870, - 870, 870, 870, 870, 870, 870, 849, 849, 1558, 849, - 849, 849, 849, 849, 849, 849, 849, 547, 547, 547, - - 547, 547, 547, 547, 547, 547, 547, 547, 888, 888, - 1558, 888, 888, 888, 888, 888, 888, 888, 888, 916, - 916, 1558, 916, 916, 916, 916, 916, 916, 916, 916, - 766, 766, 1558, 766, 766, 766, 766, 766, 766, 766, - 766, 917, 917, 1558, 917, 917, 917, 917, 917, 917, - 917, 917, 768, 768, 1558, 768, 768, 768, 768, 768, - 768, 768, 768, 990, 990, 1558, 990, 990, 990, 990, - 990, 990, 990, 990, 809, 809, 1558, 809, 809, 809, - 809, 809, 809, 809, 809, 811, 811, 1558, 811, 811, - 811, 811, 811, 811, 811, 811, 812, 812, 1558, 812, - - 812, 812, 812, 812, 812, 812, 812, 813, 813, 1558, - 813, 813, 813, 813, 813, 813, 813, 813, 814, 814, - 1558, 814, 814, 814, 814, 814, 814, 814, 814, 815, - 815, 1558, 815, 815, 815, 815, 815, 815, 815, 815, - 823, 823, 1558, 823, 823, 823, 823, 823, 823, 823, - 823, 994, 994, 1558, 994, 994, 994, 994, 994, 994, - 994, 994, 995, 995, 1558, 995, 995, 995, 995, 995, - 995, 995, 995, 996, 996, 1558, 996, 996, 996, 996, - 996, 996, 996, 996, 997, 997, 1558, 997, 997, 997, - 997, 997, 997, 997, 997, 998, 998, 1558, 998, 998, - - 998, 998, 998, 998, 998, 998, 999, 999, 1558, 999, - 999, 999, 999, 999, 999, 999, 999, 843, 843, 1558, - 843, 843, 843, 843, 843, 843, 843, 843, 1000, 1000, - 1558, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 847, - 847, 1558, 847, 847, 847, 847, 847, 847, 847, 847, - 1002, 1002, 1558, 1002, 1002, 1002, 1002, 1002, 1002, 1002, - 1002, 855, 855, 855, 855, 855, 855, 855, 855, 855, - 855, 855, 859, 859, 859, 859, 859, 859, 859, 859, - 859, 859, 859, 860, 860, 860, 860, 860, 860, 860, - 860, 860, 860, 860, 861, 861, 1558, 861, 861, 861, - - 861, 861, 861, 861, 861, 862, 862, 1558, 862, 862, - 862, 862, 862, 862, 862, 862, 863, 863, 1558, 863, - 863, 863, 863, 863, 863, 863, 863, 864, 864, 1558, - 864, 864, 864, 864, 864, 864, 864, 864, 865, 865, - 1558, 865, 865, 865, 865, 865, 865, 865, 865, 866, - 866, 1558, 866, 866, 866, 866, 866, 866, 866, 866, - 867, 867, 1558, 867, 867, 867, 867, 867, 867, 867, - 867, 870, 1558, 870, 870, 870, 870, 870, 870, 870, - 870, 870, 1011, 1011, 1558, 1011, 1011, 1011, 1011, 1011, - 1011, 1011, 1011, 1035, 1035, 1558, 1035, 1035, 1035, 1035, - - 1035, 1035, 1035, 1035, 1036, 1036, 1558, 1036, 1036, 1036, - 1036, 1036, 1036, 1036, 1036, 1138, 1558, 1138, 1138, 1155, - 1155, 1558, 1155, 1155, 1155, 1155, 1155, 1155, 1155, 1155, - 994, 994, 1558, 994, 994, 994, 994, 994, 994, 994, - 994, 995, 995, 1558, 995, 995, 995, 995, 995, 995, - 995, 995, 996, 996, 1558, 996, 996, 996, 996, 996, - 996, 996, 996, 997, 997, 1558, 997, 997, 997, 997, - 997, 997, 997, 997, 998, 998, 1558, 998, 998, 998, - 998, 998, 998, 998, 998, 999, 999, 1558, 999, 999, - 999, 999, 999, 999, 999, 999, 1000, 1000, 1558, 1000, - - 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1158, 1158, 1158, - 1158, 1158, 1158, 1158, 1158, 1158, 1158, 1158, 1159, 1159, - 1558, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 1159, 1176, - 1176, 1558, 1176, 1176, 1176, 1176, 1176, 1176, 1176, 1176, - 1177, 1177, 1558, 1177, 1177, 1177, 1177, 1177, 1177, 1177, - 1177, 1318, 1318, 1558, 1318, 1318, 1318, 1318, 1318, 1318, - 1318, 1318, 1319, 1319, 1558, 1319, 1319, 1319, 1319, 1319, - 1319, 1319, 1319, 1328, 1328, 1328, 1328, 1328, 1328, 1328, - 1328, 1328, 1328, 1328, 1331, 1331, 1331, 1331, 1331, 1331, - 1331, 1331, 1331, 1331, 1331, 1334, 1334, 1334, 1334, 1334, - - 1334, 1334, 1334, 1334, 1334, 1334, 1339, 1339, 1558, 1339, - 1339, 1339, 1339, 1339, 1339, 1339, 1339, 1138, 1558, 1138, - 1558, 1138, 1138, 1370, 1370, 1558, 1370, 1370, 1370, 1370, - 1370, 1370, 1370, 1370, 1387, 1558, 1387, 1387, 1394, 1558, - 1394, 1394, 1426, 1426, 1558, 1426, 1426, 1426, 1426, 1426, - 1426, 1426, 1426, 1430, 1430, 1558, 1430, 1430, 1430, 1430, - 1430, 1430, 1430, 1430, 1434, 1434, 1558, 1434, 1434, 1434, - 1434, 1434, 1434, 1434, 1434, 1470, 1558, 1470, 1470, 37, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558 + 1536, 1536, 1536, 1474, 311, 699, 1474, 698, 1448, 697, + 498, 696, 691, 691, 1572, 1572, 1537, 1572, 1537, 650, + 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1538, 1572, + 1572, 1572, 466, 1572, 607, 607, 606, 606, 598, 597, + 596, 595, 594, 593, 592, 588, 588, 586, 586, 583, + 582, 581, 578, 577, 576, 573, 1449, 1539, 376, 572, + 571, 366, 363, 554, 553, 1540, 1540, 1540, 1540, 355, + 547, 546, 545, 1540, 1540, 1540, 1540, 1540, 1540, 1540, + 1540, 1540, 1540, 1540, 1540, 1540, 1540, 1540, 1540, 1540, + + 1540, 1540, 1540, 1540, 1540, 1540, 1540, 1540, 1540, 1468, + 544, 543, 1468, 542, 1440, 536, 536, 535, 535, 531, + 530, 528, 527, 524, 152, 311, 1530, 1530, 1530, 1530, + 1530, 1530, 1530, 1530, 1530, 507, 1471, 507, 502, 1471, + 502, 1444, 500, 500, 501, 499, 497, 291, 491, 486, + 485, 482, 473, 1534, 1534, 1534, 1534, 1534, 1534, 1534, + 1534, 1534, 1441, 1545, 1545, 1545, 1545, 1545, 1545, 1545, + 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, + 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1545, 1445, + 1546, 1546, 1546, 1546, 1546, 1546, 1546, 1546, 1546, 1546, + + 1546, 1546, 1546, 1546, 1546, 1546, 1546, 1546, 1546, 1546, + 1546, 1546, 1546, 1546, 1546, 1546, 1474, 469, 466, 1474, + 1572, 1448, 409, 407, 405, 227, 225, 220, 393, 389, + 391, 389, 387, 1538, 1538, 1538, 1538, 1538, 1538, 1538, + 1538, 1538, 386, 208, 202, 205, 204, 195, 204, 349, + 348, 347, 346, 345, 344, 331, 152, 305, 303, 300, + 299, 278, 277, 239, 125, 124, 239, 104, 224, 1449, + 1547, 1547, 1547, 1547, 1547, 1547, 1547, 1547, 1547, 1547, + 1547, 1547, 1547, 1547, 1547, 1547, 1547, 1547, 1547, 1547, + 1547, 1547, 1547, 1547, 1547, 1547, 38, 38, 38, 38, + + 38, 38, 38, 38, 38, 38, 38, 39, 39, 39, + 39, 39, 39, 39, 39, 39, 39, 39, 56, 56, + 56, 56, 56, 56, 56, 56, 56, 56, 56, 68, + 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, + 73, 73, 73, 73, 73, 73, 73, 73, 73, 73, + 73, 42, 42, 42, 42, 42, 42, 42, 42, 42, + 42, 42, 90, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 94, 94, 94, 94, 94, 94, 94, + 94, 94, 94, 94, 98, 98, 98, 98, 98, 98, + 98, 98, 98, 98, 98, 101, 101, 101, 101, 101, + + 101, 101, 101, 101, 101, 101, 114, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 128, 128, 128, + 128, 162, 162, 223, 162, 162, 162, 162, 162, 162, + 162, 162, 172, 213, 212, 211, 172, 172, 172, 172, + 172, 172, 172, 177, 177, 210, 205, 177, 177, 177, + 177, 177, 177, 177, 183, 183, 204, 183, 183, 183, + 183, 183, 183, 183, 183, 185, 200, 188, 186, 185, + 185, 185, 185, 185, 185, 185, 187, 184, 182, 181, + 187, 187, 187, 187, 187, 187, 187, 189, 180, 179, + 173, 189, 189, 189, 189, 189, 189, 189, 206, 206, + + 171, 206, 206, 206, 206, 206, 206, 206, 206, 214, + 214, 161, 214, 214, 214, 214, 214, 214, 214, 214, + 219, 219, 160, 219, 219, 219, 219, 219, 219, 219, + 219, 229, 229, 156, 229, 229, 229, 229, 229, 229, + 229, 229, 245, 245, 245, 245, 245, 245, 245, 245, + 245, 245, 245, 128, 128, 128, 128, 280, 280, 127, + 280, 280, 280, 280, 280, 280, 280, 280, 282, 282, + 125, 282, 282, 282, 282, 282, 282, 282, 282, 290, + 290, 124, 290, 290, 290, 290, 290, 290, 290, 290, + 295, 295, 108, 295, 295, 295, 295, 295, 295, 295, + + 295, 301, 1572, 301, 301, 302, 302, 304, 102, 102, + 304, 304, 172, 38, 38, 1572, 172, 172, 172, 172, + 172, 172, 172, 177, 177, 1572, 1572, 177, 177, 177, + 177, 177, 177, 177, 183, 183, 1572, 183, 183, 183, + 183, 183, 183, 183, 183, 185, 1572, 1572, 1572, 185, + 185, 185, 185, 185, 185, 185, 187, 1572, 1572, 1572, + 187, 187, 187, 187, 187, 187, 187, 189, 1572, 1572, + 1572, 189, 189, 189, 189, 189, 189, 189, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 362, + 362, 1572, 362, 362, 362, 362, 362, 362, 362, 362, + + 388, 388, 1572, 388, 388, 388, 388, 388, 388, 388, + 388, 390, 390, 1572, 390, 390, 390, 390, 390, 390, + 390, 390, 219, 219, 1572, 219, 219, 219, 219, 219, + 219, 219, 219, 229, 229, 1572, 229, 229, 229, 229, + 229, 229, 229, 229, 417, 417, 417, 417, 417, 417, + 417, 417, 417, 417, 417, 290, 290, 1572, 290, 290, + 290, 290, 290, 290, 290, 290, 496, 496, 1572, 496, + 496, 496, 496, 496, 496, 496, 496, 280, 280, 1572, + 280, 280, 280, 280, 280, 280, 280, 280, 498, 498, + 1572, 498, 498, 498, 498, 498, 498, 498, 498, 503, + + 503, 1572, 503, 503, 503, 503, 503, 503, 503, 503, + 504, 504, 1572, 504, 504, 504, 504, 504, 504, 504, + 504, 505, 505, 505, 505, 505, 1572, 505, 505, 505, + 505, 505, 506, 506, 1572, 506, 506, 506, 506, 506, + 506, 506, 506, 509, 509, 510, 510, 510, 510, 1572, + 510, 510, 510, 510, 510, 510, 511, 511, 511, 511, + 511, 1572, 511, 511, 511, 511, 511, 548, 548, 1572, + 548, 548, 548, 548, 548, 548, 548, 548, 353, 353, + 353, 353, 353, 353, 353, 353, 353, 353, 353, 555, + 555, 1572, 555, 555, 555, 555, 555, 555, 555, 555, + + 584, 584, 1572, 584, 584, 584, 584, 584, 584, 584, + 584, 585, 585, 1572, 585, 585, 585, 585, 585, 585, + 585, 585, 587, 587, 1572, 587, 587, 587, 587, 587, + 587, 587, 587, 591, 591, 1572, 591, 591, 591, 591, + 591, 591, 591, 591, 599, 599, 1572, 599, 599, 599, + 599, 599, 599, 599, 599, 229, 229, 1572, 229, 229, + 229, 229, 229, 229, 229, 229, 639, 639, 1572, 639, + 639, 639, 639, 639, 639, 639, 639, 641, 641, 1572, + 641, 641, 641, 641, 641, 641, 641, 641, 649, 649, + 1572, 649, 649, 649, 649, 649, 649, 649, 649, 685, + + 685, 1572, 685, 685, 685, 685, 685, 685, 685, 685, + 689, 689, 1572, 689, 689, 689, 689, 689, 689, 689, + 689, 496, 496, 1572, 496, 496, 496, 496, 496, 496, + 496, 496, 694, 694, 1572, 694, 694, 694, 694, 694, + 694, 694, 694, 695, 695, 1572, 695, 695, 695, 695, + 695, 695, 695, 695, 505, 505, 505, 505, 505, 505, + 505, 505, 505, 505, 505, 304, 304, 510, 510, 510, + 510, 510, 510, 510, 510, 510, 510, 510, 511, 511, + 511, 511, 511, 511, 511, 511, 511, 511, 511, 641, + 641, 1572, 641, 641, 641, 641, 641, 641, 641, 641, + + 548, 548, 1572, 548, 548, 548, 548, 548, 548, 548, + 548, 733, 733, 1572, 733, 733, 733, 733, 733, 733, + 733, 733, 584, 584, 1572, 584, 584, 584, 584, 584, + 584, 584, 584, 769, 769, 1572, 769, 769, 769, 769, + 769, 769, 769, 769, 771, 771, 1572, 771, 771, 771, + 771, 771, 771, 771, 771, 814, 814, 1572, 814, 814, + 814, 814, 814, 814, 814, 814, 599, 599, 1572, 599, + 599, 599, 599, 599, 599, 599, 599, 816, 816, 1572, + 816, 816, 816, 816, 816, 816, 816, 816, 817, 817, + 1572, 817, 817, 817, 817, 817, 817, 817, 817, 229, + + 229, 1572, 229, 229, 229, 229, 229, 229, 229, 229, + 818, 818, 1572, 818, 818, 818, 818, 818, 818, 818, + 818, 819, 819, 1572, 819, 819, 819, 819, 819, 819, + 819, 819, 820, 820, 1572, 820, 820, 820, 820, 820, + 820, 820, 820, 417, 417, 1572, 417, 417, 417, 417, + 417, 417, 417, 417, 828, 828, 1572, 828, 828, 828, + 828, 828, 828, 828, 828, 848, 848, 1572, 848, 848, + 848, 848, 848, 848, 848, 848, 852, 852, 1572, 852, + 852, 852, 852, 852, 852, 852, 852, 639, 639, 1572, + 639, 639, 639, 639, 639, 639, 639, 639, 854, 854, + + 1572, 854, 854, 854, 854, 854, 854, 854, 854, 859, + 859, 1572, 859, 859, 859, 859, 859, 859, 859, 859, + 860, 860, 860, 860, 860, 860, 860, 860, 860, 860, + 860, 864, 864, 864, 864, 864, 864, 864, 864, 864, + 864, 864, 865, 865, 865, 865, 865, 865, 865, 865, + 865, 865, 865, 866, 866, 1572, 866, 866, 866, 866, + 866, 866, 866, 866, 867, 867, 1572, 867, 867, 867, + 867, 867, 867, 867, 867, 868, 868, 1572, 868, 868, + 868, 868, 868, 868, 868, 868, 869, 869, 1572, 869, + 869, 869, 869, 869, 869, 869, 869, 870, 870, 1572, + + 870, 870, 870, 870, 870, 870, 870, 870, 871, 871, + 1572, 871, 871, 871, 871, 871, 871, 871, 871, 685, + 685, 1572, 685, 685, 685, 685, 685, 685, 685, 685, + 872, 872, 1572, 872, 872, 872, 872, 872, 872, 872, + 872, 689, 689, 1572, 689, 689, 689, 689, 689, 689, + 689, 689, 875, 1572, 875, 875, 875, 875, 875, 875, + 875, 875, 875, 854, 854, 1572, 854, 854, 854, 854, + 854, 854, 854, 854, 548, 548, 548, 548, 548, 548, + 548, 548, 548, 548, 548, 893, 893, 1572, 893, 893, + 893, 893, 893, 893, 893, 893, 919, 919, 1572, 919, + + 919, 919, 919, 919, 919, 919, 919, 769, 769, 1572, + 769, 769, 769, 769, 769, 769, 769, 769, 920, 920, + 1572, 920, 920, 920, 920, 920, 920, 920, 920, 771, + 771, 1572, 771, 771, 771, 771, 771, 771, 771, 771, + 994, 994, 1572, 994, 994, 994, 994, 994, 994, 994, + 994, 814, 814, 1572, 814, 814, 814, 814, 814, 814, + 814, 814, 816, 816, 1572, 816, 816, 816, 816, 816, + 816, 816, 816, 817, 817, 1572, 817, 817, 817, 817, + 817, 817, 817, 817, 818, 818, 1572, 818, 818, 818, + 818, 818, 818, 818, 818, 819, 819, 1572, 819, 819, + + 819, 819, 819, 819, 819, 819, 820, 820, 1572, 820, + 820, 820, 820, 820, 820, 820, 820, 828, 828, 1572, + 828, 828, 828, 828, 828, 828, 828, 828, 998, 998, + 1572, 998, 998, 998, 998, 998, 998, 998, 998, 999, + 999, 1572, 999, 999, 999, 999, 999, 999, 999, 999, + 1000, 1000, 1572, 1000, 1000, 1000, 1000, 1000, 1000, 1000, + 1000, 1001, 1001, 1572, 1001, 1001, 1001, 1001, 1001, 1001, + 1001, 1001, 1002, 1002, 1572, 1002, 1002, 1002, 1002, 1002, + 1002, 1002, 1002, 1003, 1003, 1572, 1003, 1003, 1003, 1003, + 1003, 1003, 1003, 1003, 848, 848, 1572, 848, 848, 848, + + 848, 848, 848, 848, 848, 1004, 1004, 1572, 1004, 1004, + 1004, 1004, 1004, 1004, 1004, 1004, 852, 852, 1572, 852, + 852, 852, 852, 852, 852, 852, 852, 1006, 1006, 1572, + 1006, 1006, 1006, 1006, 1006, 1006, 1006, 1006, 860, 860, + 860, 860, 860, 860, 860, 860, 860, 860, 860, 864, + 864, 864, 864, 864, 864, 864, 864, 864, 864, 864, + 865, 865, 865, 865, 865, 865, 865, 865, 865, 865, + 865, 866, 866, 1572, 866, 866, 866, 866, 866, 866, + 866, 866, 867, 867, 1572, 867, 867, 867, 867, 867, + 867, 867, 867, 868, 868, 1572, 868, 868, 868, 868, + + 868, 868, 868, 868, 869, 869, 1572, 869, 869, 869, + 869, 869, 869, 869, 869, 870, 870, 1572, 870, 870, + 870, 870, 870, 870, 870, 870, 871, 871, 1572, 871, + 871, 871, 871, 871, 871, 871, 871, 872, 872, 1572, + 872, 872, 872, 872, 872, 872, 872, 872, 875, 1572, + 875, 875, 875, 875, 875, 875, 875, 875, 875, 1015, + 1015, 1572, 1015, 1015, 1015, 1015, 1015, 1015, 1015, 1015, + 1039, 1039, 1572, 1039, 1039, 1039, 1039, 1039, 1039, 1039, + 1039, 1040, 1040, 1572, 1040, 1040, 1040, 1040, 1040, 1040, + 1040, 1040, 1147, 1572, 1147, 1147, 1164, 1164, 1572, 1164, + + 1164, 1164, 1164, 1164, 1164, 1164, 1164, 998, 998, 1572, + 998, 998, 998, 998, 998, 998, 998, 998, 999, 999, + 1572, 999, 999, 999, 999, 999, 999, 999, 999, 1000, + 1000, 1572, 1000, 1000, 1000, 1000, 1000, 1000, 1000, 1000, + 1001, 1001, 1572, 1001, 1001, 1001, 1001, 1001, 1001, 1001, + 1001, 1002, 1002, 1572, 1002, 1002, 1002, 1002, 1002, 1002, + 1002, 1002, 1003, 1003, 1572, 1003, 1003, 1003, 1003, 1003, + 1003, 1003, 1003, 1004, 1004, 1572, 1004, 1004, 1004, 1004, + 1004, 1004, 1004, 1004, 1167, 1167, 1167, 1167, 1167, 1167, + 1167, 1167, 1167, 1167, 1167, 1168, 1168, 1572, 1168, 1168, + + 1168, 1168, 1168, 1168, 1168, 1168, 1185, 1185, 1572, 1185, + 1185, 1185, 1185, 1185, 1185, 1185, 1185, 1186, 1186, 1572, + 1186, 1186, 1186, 1186, 1186, 1186, 1186, 1186, 1330, 1330, + 1572, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 1330, 1331, + 1331, 1572, 1331, 1331, 1331, 1331, 1331, 1331, 1331, 1331, + 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340, 1340, + 1340, 1343, 1343, 1343, 1343, 1343, 1343, 1343, 1343, 1343, + 1343, 1343, 1346, 1346, 1346, 1346, 1346, 1346, 1346, 1346, + 1346, 1346, 1346, 1351, 1351, 1572, 1351, 1351, 1351, 1351, + 1351, 1351, 1351, 1351, 1147, 1572, 1147, 1572, 1147, 1147, + + 1357, 1572, 1357, 1572, 1357, 1357, 1384, 1384, 1572, 1384, + 1384, 1384, 1384, 1384, 1384, 1384, 1384, 1407, 1572, 1407, + 1407, 1438, 1438, 1572, 1438, 1438, 1438, 1438, 1438, 1438, + 1438, 1438, 1442, 1442, 1572, 1442, 1442, 1442, 1442, 1442, + 1442, 1442, 1442, 1446, 1446, 1572, 1446, 1446, 1446, 1446, + 1446, 1446, 1446, 1446, 1459, 1572, 1459, 1459, 37, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572 + } ; -static const flex_int16_t yy_chk[7515] = +static const flex_int16_t yy_chk[7701] = { 0, 0, 0, 3, 3, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, @@ -1843,17 +1868,17 @@ static const flex_int16_t yy_chk[7515] = 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - 7, 7, 7, 7, 8, 8, 8, 8, 15, 9, - 10, 25, 25, 25, 25, 7, 27, 27, 27, 8, - 26, 26, 26, 26, 250, 25, 25, 9, 10, 28, - 28, 28, 29, 30, 26, 26, 33, 33, 250, 29, - 30, 34, 34, 15, 1613, 48, 29, 30, 48, 15, - 378, 15, 378, 7, 9, 10, 59, 8, 233, 59, - - 40, 40, 40, 40, 25, 233, 25, 66, 66, 40, - 66, 87, 87, 26, 15, 26, 40, 783, 67, 783, - 15, 67, 15, 284, 284, 9, 10, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 5, 5, 5, 5, 5, 5, 5, 7, 7, 7, + 7, 8, 8, 8, 8, 15, 9, 10, 25, 25, + 25, 25, 7, 27, 27, 27, 8, 26, 26, 26, + 26, 250, 25, 25, 9, 10, 28, 28, 28, 29, + 30, 26, 26, 33, 33, 250, 29, 30, 34, 34, + 15, 1756, 48, 29, 30, 48, 15, 379, 15, 379, + + 7, 9, 10, 59, 8, 233, 59, 40, 40, 40, + 40, 25, 233, 25, 66, 66, 40, 66, 87, 87, + 26, 15, 26, 40, 787, 67, 787, 15, 67, 15, + 284, 284, 9, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, @@ -1867,8 +1892,8 @@ static const flex_int16_t yy_chk[7515] = 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, - 11, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, + 11, 11, 11, 11, 11, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, @@ -1881,19 +1906,22 @@ static const flex_int16_t yy_chk[7515] = 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, - 13, 13, 13, 13, 13, 16, 43, 43, 43, 43, - - 260, 135, 55, 44, 44, 44, 44, 55, 368, 260, - 43, 43, 44, 44, 86, 86, 86, 86, 44, 44, - 60, 60, 60, 60, 60, 60, 60, 99, 99, 1635, - 16, 91, 91, 91, 91, 370, 16, 111, 16, 368, - 111, 1725, 99, 135, 55, 103, 103, 103, 103, 43, - 104, 104, 126, 269, 127, 126, 44, 127, 104, 136, - 139, 16, 136, 139, 269, 104, 370, 16, 139, 16, + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + + 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, + 13, 13, 13, 13, 13, 13, 16, 43, 43, 43, + 43, 260, 135, 55, 44, 44, 44, 44, 55, 368, + 260, 43, 43, 44, 44, 86, 86, 86, 86, 44, + 44, 60, 60, 60, 60, 60, 60, 60, 99, 99, + 1751, 16, 91, 91, 91, 91, 369, 16, 111, 16, + 368, 111, 1749, 99, 135, 55, 103, 103, 103, 103, + 43, 104, 104, 126, 269, 127, 126, 44, 127, 104, + 136, 139, 16, 136, 139, 269, 104, 369, 16, 139, + 16, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, @@ -1901,32 +1929,32 @@ static const flex_int16_t yy_chk[7515] = 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, + 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, - - 19, 19, 19, 19, 21, 21, 21, 21, 21, 21, + 19, 19, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, - 21, 21, 21, 21, 21, 21, 21, 21, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, + 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, + 21, 21, 21, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, + 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, @@ -1934,727 +1962,744 @@ static const flex_int16_t yy_chk[7515] = 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, - 23, 23, 45, 45, 45, 45, 371, 164, 165, 155, - 164, 165, 150, 52, 155, 130, 52, 45, 130, 1736, - 53, 53, 53, 53, 248, 83, 150, 52, 83, 53, - - 53, 84, 84, 84, 84, 138, 53, 371, 138, 83, - 83, 296, 296, 148, 138, 97, 148, 166, 97, 516, - 166, 155, 148, 311, 311, 45, 51, 51, 51, 51, - 51, 51, 51, 51, 51, 51, 52, 51, 130, 197, - 51, 51, 51, 53, 167, 84, 248, 167, 83, 108, - 108, 108, 108, 1280, 84, 150, 84, 97, 108, 197, - 249, 113, 51, 150, 159, 108, 97, 159, 113, 321, - 197, 168, 159, 113, 168, 113, 169, 51, 51, 169, - 321, 51, 51, 51, 51, 51, 51, 51, 97, 51, - 197, 170, 51, 51, 170, 51, 51, 51, 516, 51, - - 51, 51, 51, 51, 51, 51, 107, 51, 51, 51, - 113, 419, 249, 107, 109, 109, 109, 109, 107, 270, - 270, 270, 107, 107, 107, 419, 107, 439, 109, 109, - 110, 110, 110, 110, 113, 115, 115, 115, 115, 435, - 177, 107, 113, 177, 456, 110, 116, 116, 116, 116, - 115, 325, 325, 423, 107, 116, 116, 117, 117, 117, - 117, 116, 116, 178, 1280, 149, 178, 109, 149, 442, - 236, 239, 117, 236, 239, 123, 123, 123, 123, 149, - 328, 328, 518, 110, 123, 123, 204, 439, 115, 204, - 123, 123, 1186, 151, 151, 151, 151, 382, 382, 116, - - 132, 132, 132, 132, 132, 132, 132, 132, 435, 134, - 117, 121, 121, 134, 121, 134, 134, 265, 149, 456, - 265, 134, 162, 162, 162, 162, 134, 121, 123, 134, - 442, 152, 152, 152, 152, 423, 220, 220, 121, 204, - 152, 152, 223, 223, 121, 121, 151, 152, 121, 422, - 121, 220, 121, 422, 121, 121, 121, 223, 121, 240, - 121, 518, 240, 515, 121, 154, 154, 240, 154, 121, - 154, 121, 241, 121, 275, 241, 121, 275, 154, 154, - 241, 121, 410, 410, 152, 154, 121, 122, 122, 122, - 122, 122, 122, 122, 122, 122, 122, 276, 122, 513, - - 276, 122, 122, 122, 147, 276, 147, 1186, 147, 147, - 147, 147, 147, 147, 147, 147, 147, 575, 156, 156, - 156, 156, 190, 122, 575, 190, 1737, 156, 156, 191, - 191, 191, 191, 428, 156, 515, 190, 190, 122, 122, - 413, 413, 122, 122, 122, 122, 122, 122, 122, 1742, - 122, 651, 194, 122, 122, 194, 122, 122, 122, 651, - 122, 122, 122, 122, 122, 122, 122, 194, 122, 122, - 122, 156, 157, 428, 513, 190, 157, 163, 157, 157, - 163, 779, 438, 431, 157, 192, 192, 192, 192, 157, - 253, 253, 157, 253, 779, 163, 163, 163, 163, 217, - - 192, 195, 195, 195, 195, 194, 200, 200, 200, 200, - 201, 201, 201, 201, 202, 202, 202, 202, 207, 207, - 207, 207, 210, 210, 210, 210, 222, 217, 222, 519, - 430, 261, 227, 227, 261, 492, 492, 222, 217, 222, - 227, 222, 431, 230, 217, 195, 230, 227, 222, 231, - 200, 431, 231, 462, 195, 438, 195, 462, 217, 200, - 261, 200, 208, 208, 208, 208, 1282, 234, 238, 217, - 430, 1020, 261, 234, 222, 217, 231, 230, 234, 238, - 242, 242, 242, 242, 234, 238, 230, 1020, 279, 208, - 234, 279, 231, 531, 531, 242, 208, 208, 231, 238, - - 208, 208, 256, 208, 234, 256, 331, 208, 519, 331, - 238, 243, 243, 243, 243, 234, 238, 244, 244, 244, - 244, 234, 246, 246, 246, 246, 243, 208, 247, 247, - 247, 247, 244, 242, 1604, 262, 256, 246, 262, 572, - 572, 293, 262, 247, 293, 256, 313, 313, 308, 313, - 293, 308, 262, 324, 263, 258, 324, 308, 258, 332, - 263, 324, 332, 1557, 243, 263, 310, 310, 310, 310, - 244, 263, 1282, 318, 558, 246, 318, 263, 642, 642, - 561, 247, 258, 208, 208, 208, 208, 208, 208, 1556, - 208, 263, 208, 208, 251, 251, 258, 251, 258, 313, - - 652, 652, 263, 272, 258, 558, 333, 318, 263, 333, - 251, 561, 334, 563, 272, 334, 318, 707, 707, 310, - 272, 251, 335, 336, 1215, 335, 336, 251, 251, 337, - 564, 251, 337, 251, 272, 251, 565, 251, 251, 251, - 1555, 251, 272, 251, 563, 272, 338, 251, 318, 338, - 737, 272, 251, 318, 251, 339, 251, 340, 339, 251, - 340, 564, 341, 342, 251, 341, 342, 565, 737, 251, - 252, 252, 252, 252, 252, 252, 252, 252, 252, 252, - 343, 252, 517, 343, 252, 252, 252, 306, 306, 306, - 306, 306, 306, 306, 306, 306, 350, 350, 350, 350, - - 351, 351, 351, 351, 401, 352, 252, 401, 352, 354, - 402, 403, 354, 402, 403, 665, 355, 355, 355, 355, - 352, 252, 252, 665, 354, 252, 252, 252, 252, 252, - 252, 252, 404, 252, 661, 404, 252, 252, 661, 252, - 252, 252, 1215, 252, 252, 252, 252, 252, 252, 252, - 517, 252, 252, 252, 315, 315, 1554, 315, 352, 357, - 355, 517, 354, 361, 361, 361, 361, 710, 710, 355, - 315, 355, 366, 366, 366, 366, 787, 787, 1553, 357, - 315, 315, 566, 315, 910, 315, 405, 315, 315, 405, - 357, 315, 571, 315, 315, 315, 733, 315, 315, 315, - - 315, 315, 406, 315, 910, 406, 407, 315, 408, 407, - 357, 408, 315, 566, 315, 409, 315, 436, 409, 315, - 391, 391, 391, 391, 315, 391, 802, 733, 802, 315, - 316, 316, 316, 316, 316, 316, 316, 316, 316, 316, - 467, 316, 735, 467, 316, 316, 316, 855, 571, 417, - 417, 417, 417, 424, 424, 855, 424, 418, 418, 418, - 418, 1087, 425, 425, 417, 425, 316, 798, 420, 420, - 420, 420, 418, 735, 436, 445, 445, 436, 445, 1087, - 798, 316, 316, 420, 1221, 316, 316, 316, 316, 316, - 316, 316, 468, 316, 738, 468, 316, 316, 440, 316, - - 316, 316, 417, 316, 316, 316, 316, 316, 316, 316, - 418, 316, 316, 316, 363, 363, 363, 363, 1552, 372, - 421, 420, 421, 372, 1551, 738, 441, 372, 445, 421, - 806, 806, 469, 372, 421, 469, 421, 452, 452, 372, - 452, 363, 427, 427, 470, 427, 1218, 470, 363, 363, - 372, 433, 363, 363, 372, 363, 817, 817, 372, 363, - 432, 432, 440, 432, 372, 429, 429, 434, 429, 466, - 372, 421, 466, 440, 466, 471, 427, 433, 471, 363, - 433, 820, 820, 443, 433, 427, 441, 441, 441, 432, - 909, 909, 429, 434, 433, 421, 739, 1221, 741, 434, - - 447, 432, 472, 421, 434, 472, 429, 859, 429, 473, - 434, 859, 473, 372, 429, 443, 434, 447, 447, 447, - 447, 447, 447, 447, 447, 474, 443, 739, 474, 741, - 434, 475, 443, 1550, 475, 363, 363, 363, 363, 363, - 363, 434, 363, 455, 363, 363, 443, 434, 437, 450, - 860, 911, 911, 450, 443, 450, 450, 443, 860, 454, - 454, 450, 454, 443, 476, 1218, 450, 476, 454, 450, - 931, 1241, 931, 437, 437, 437, 437, 437, 437, 437, - 437, 437, 437, 437, 437, 437, 437, 437, 437, 437, - 437, 437, 437, 437, 437, 437, 437, 437, 437, 464, - - 464, 477, 464, 455, 477, 1241, 455, 478, 464, 1549, - 478, 455, 459, 479, 480, 481, 479, 480, 481, 1189, - 459, 459, 459, 459, 482, 935, 935, 482, 459, 459, - 459, 459, 459, 459, 459, 459, 459, 459, 459, 459, - 459, 459, 459, 459, 459, 459, 459, 459, 459, 459, - 459, 459, 459, 459, 460, 460, 460, 460, 460, 460, - 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, - 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, - 483, 484, 1548, 483, 484, 460, 460, 460, 460, 460, - 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, + 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, + 23, 23, 23, 23, 45, 45, 45, 45, 370, 164, + 165, 155, 164, 165, 150, 52, 155, 130, 52, 45, + 130, 1739, 53, 53, 53, 53, 248, 83, 150, 52, + 83, 53, 53, 84, 84, 84, 84, 138, 53, 370, + 138, 83, 83, 296, 296, 148, 138, 97, 148, 166, + 97, 517, 166, 155, 148, 311, 311, 45, 51, 51, + 51, 51, 51, 51, 51, 51, 51, 51, 52, 51, + 130, 197, 51, 51, 51, 53, 167, 84, 248, 167, + 83, 108, 108, 108, 108, 1649, 84, 150, 84, 97, + + 108, 197, 249, 113, 51, 150, 159, 108, 97, 159, + 113, 321, 197, 168, 159, 113, 168, 113, 169, 51, + 51, 169, 321, 51, 51, 51, 51, 51, 51, 51, + 97, 51, 197, 170, 51, 51, 170, 51, 51, 51, + 517, 51, 51, 51, 51, 51, 51, 51, 107, 51, + 51, 51, 113, 420, 249, 107, 109, 109, 109, 109, + 107, 270, 270, 270, 107, 107, 107, 420, 107, 440, + 109, 109, 110, 110, 110, 110, 113, 115, 115, 115, + 115, 436, 177, 107, 113, 177, 457, 110, 116, 116, + 116, 116, 115, 325, 325, 424, 107, 116, 116, 117, + + 117, 117, 117, 116, 116, 178, 1627, 149, 178, 109, + 149, 783, 236, 239, 117, 236, 239, 123, 123, 123, + 123, 149, 328, 328, 783, 110, 123, 123, 204, 440, + 115, 204, 123, 123, 1618, 151, 151, 151, 151, 383, + 383, 116, 132, 132, 132, 132, 132, 132, 132, 132, + 436, 134, 117, 121, 121, 134, 121, 134, 134, 265, + 149, 457, 265, 134, 162, 162, 162, 162, 134, 121, + 123, 134, 371, 152, 152, 152, 152, 424, 220, 220, + 121, 204, 152, 152, 223, 223, 121, 121, 151, 152, + 121, 423, 121, 220, 121, 423, 121, 121, 121, 223, + + 121, 240, 121, 371, 240, 443, 121, 154, 154, 240, + 154, 121, 154, 121, 241, 121, 275, 241, 121, 275, + 154, 154, 241, 121, 411, 411, 152, 154, 121, 122, + 122, 122, 122, 122, 122, 122, 122, 122, 122, 276, + 122, 514, 276, 122, 122, 122, 147, 276, 147, 571, + 147, 147, 147, 147, 147, 147, 147, 147, 147, 1233, + 156, 156, 156, 156, 190, 122, 443, 190, 571, 156, + 156, 191, 191, 191, 191, 429, 156, 758, 190, 190, + 122, 122, 414, 414, 122, 122, 122, 122, 122, 122, + 122, 1204, 122, 372, 194, 122, 122, 194, 122, 122, + + 122, 758, 122, 122, 122, 122, 122, 122, 122, 194, + 122, 122, 122, 156, 157, 429, 514, 190, 157, 163, + 157, 157, 163, 803, 372, 432, 157, 192, 192, 192, + 192, 157, 253, 253, 157, 253, 803, 163, 163, 163, + 163, 217, 192, 195, 195, 195, 195, 194, 200, 200, + 200, 200, 201, 201, 201, 201, 202, 202, 202, 202, + 207, 207, 207, 207, 210, 210, 210, 210, 222, 217, + 222, 1233, 431, 261, 227, 227, 261, 374, 516, 222, + 217, 222, 227, 222, 432, 230, 217, 195, 230, 227, + 222, 231, 200, 432, 231, 463, 195, 1204, 195, 463, + + 217, 200, 261, 200, 208, 208, 208, 208, 374, 234, + 238, 217, 431, 1196, 261, 234, 222, 217, 231, 230, + 234, 238, 242, 242, 242, 242, 234, 238, 230, 1292, + 208, 208, 234, 279, 231, 442, 279, 242, 208, 208, + 231, 238, 208, 208, 256, 208, 234, 256, 331, 208, + 516, 331, 238, 243, 243, 243, 243, 234, 238, 244, + 244, 244, 244, 234, 246, 246, 246, 246, 243, 208, + 247, 247, 247, 247, 244, 242, 439, 258, 256, 246, + 258, 262, 272, 293, 262, 247, 293, 256, 262, 493, + 493, 308, 293, 272, 308, 442, 442, 442, 262, 272, + + 308, 1198, 313, 313, 258, 313, 243, 310, 310, 310, + 310, 332, 244, 272, 332, 532, 532, 246, 258, 318, + 258, 272, 318, 247, 272, 333, 258, 441, 333, 1569, + 272, 208, 208, 208, 1196, 208, 208, 208, 519, 208, + 1198, 208, 208, 251, 251, 1292, 251, 334, 324, 439, + 334, 324, 263, 318, 335, 313, 324, 335, 263, 251, + 310, 336, 318, 263, 336, 337, 560, 1565, 337, 263, + 251, 338, 573, 573, 338, 263, 251, 251, 339, 561, + 251, 339, 251, 1564, 251, 520, 251, 251, 251, 263, + 251, 441, 251, 1561, 318, 340, 251, 560, 340, 318, + + 263, 251, 441, 251, 341, 251, 263, 341, 251, 342, + 561, 343, 342, 251, 343, 643, 643, 519, 251, 252, + 252, 252, 252, 252, 252, 252, 252, 252, 252, 402, + 252, 518, 402, 252, 252, 252, 306, 306, 306, 306, + 306, 306, 306, 306, 306, 350, 350, 350, 350, 351, + 351, 351, 351, 403, 352, 252, 403, 352, 354, 404, + 405, 354, 404, 405, 520, 355, 355, 355, 355, 352, + 252, 252, 1258, 354, 252, 252, 252, 252, 252, 252, + 252, 406, 252, 662, 406, 252, 252, 662, 252, 252, + 252, 572, 252, 252, 252, 252, 252, 252, 252, 518, + + 252, 252, 252, 315, 315, 1258, 315, 352, 357, 355, + 518, 354, 361, 361, 361, 361, 1265, 652, 355, 315, + 355, 366, 366, 366, 366, 652, 576, 1560, 357, 315, + 315, 563, 315, 576, 315, 407, 315, 315, 407, 357, + 315, 1228, 315, 315, 315, 565, 315, 315, 315, 315, + 315, 408, 315, 572, 408, 409, 315, 410, 409, 357, + 410, 315, 563, 315, 468, 315, 437, 468, 315, 392, + 392, 392, 392, 315, 392, 807, 565, 807, 315, 316, + 316, 316, 316, 316, 316, 316, 316, 316, 316, 469, + 316, 566, 469, 316, 316, 316, 666, 567, 418, 418, + + 418, 418, 425, 425, 666, 425, 419, 419, 419, 419, + 741, 426, 426, 418, 426, 316, 568, 421, 421, 421, + 421, 419, 566, 437, 446, 446, 437, 446, 567, 741, + 316, 316, 421, 1265, 316, 316, 316, 316, 316, 316, + 316, 470, 316, 570, 470, 316, 316, 568, 316, 316, + 316, 418, 316, 316, 316, 316, 316, 316, 316, 419, + 316, 316, 316, 363, 363, 363, 363, 1228, 373, 422, + 421, 422, 373, 1199, 570, 759, 373, 446, 422, 653, + 653, 467, 373, 422, 467, 422, 467, 737, 373, 363, + 363, 428, 428, 471, 428, 759, 471, 363, 363, 373, + + 434, 363, 363, 373, 363, 708, 708, 373, 363, 433, + 433, 739, 433, 373, 430, 430, 742, 430, 737, 373, + 422, 453, 453, 860, 453, 428, 434, 931, 363, 434, + 435, 860, 472, 434, 428, 472, 455, 455, 433, 455, + 931, 430, 739, 434, 422, 455, 456, 742, 473, 864, + 433, 473, 422, 864, 444, 430, 435, 430, 474, 711, + 711, 474, 435, 430, 1225, 451, 865, 435, 373, 451, + 954, 451, 451, 435, 865, 465, 465, 451, 465, 435, + 475, 1199, 451, 475, 465, 451, 444, 791, 791, 954, + 363, 363, 363, 435, 363, 363, 363, 444, 363, 476, + + 363, 363, 476, 444, 435, 477, 456, 1116, 477, 456, + 435, 438, 478, 479, 456, 478, 479, 444, 480, 481, + 482, 480, 481, 482, 483, 444, 484, 483, 444, 484, + 485, 1116, 488, 485, 444, 488, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 438, 438, 438, 438, 438, 438, 438, 438, + 438, 438, 448, 489, 490, 492, 489, 490, 492, 497, + 500, 1221, 497, 500, 486, 524, 1221, 486, 524, 448, + 448, 448, 448, 448, 448, 448, 448, 460, 1225, 523, + 526, 521, 486, 526, 1557, 521, 460, 521, 521, 527, + + 811, 811, 527, 521, 460, 460, 460, 460, 521, 822, + 822, 521, 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, 460, - 460, 461, 487, 488, 489, 487, 488, 489, 491, 496, - 499, 491, 496, 499, 954, 954, 1189, 461, 461, 461, - 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, + 460, 460, 460, 460, 460, 460, 460, 460, 461, 486, + 528, 529, 530, 528, 529, 530, 513, 531, 513, 523, + 531, 537, 523, 538, 537, 539, 538, 523, 539, 935, + 743, 935, 513, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, - 461, 461, 461, 523, 525, 522, 523, 525, 461, 461, + 461, 461, 461, 461, 461, 461, 461, 461, 461, 540, + 541, 743, 540, 541, 461, 461, 461, 461, 461, 461, + 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, 461, - 461, 461, 461, 461, 463, 514, 514, 526, 514, 527, - 526, 485, 527, 953, 485, 512, 463, 512, 463, 927, - - 463, 463, 463, 463, 463, 463, 463, 463, 463, 485, - 520, 512, 927, 957, 520, 522, 520, 520, 522, 514, - 957, 528, 520, 522, 528, 1188, 529, 520, 514, 529, - 520, 530, 536, 537, 530, 536, 537, 538, 539, 540, - 538, 539, 540, 544, 545, 560, 544, 545, 548, 953, - 983, 548, 549, 549, 549, 549, 485, 983, 552, 743, - 514, 552, 544, 548, 1188, 514, 601, 549, 560, 601, - 512, 568, 1190, 562, 567, 568, 560, 605, 512, 611, - 605, 607, 611, 1281, 607, 562, 567, 568, 608, 607, - 743, 608, 979, 568, 562, 567, 608, 612, 562, 567, - - 612, 548, 612, 613, 562, 567, 613, 614, 980, 980, - 614, 552, 555, 555, 555, 555, 562, 567, 615, 616, - 617, 615, 616, 617, 618, 562, 567, 618, 619, 562, - 567, 619, 1209, 620, 621, 560, 620, 621, 622, 555, - 623, 622, 624, 623, 1547, 624, 555, 555, 979, 625, - 555, 555, 625, 555, 745, 626, 627, 555, 626, 627, - 628, 629, 630, 628, 629, 630, 631, 633, 634, 631, - 633, 634, 635, 637, 1209, 635, 637, 555, 650, 670, - 671, 650, 670, 671, 631, 745, 1190, 650, 662, 662, - 662, 662, 662, 662, 662, 662, 662, 664, 672, 673, - - 664, 672, 673, 1281, 674, 677, 664, 674, 677, 678, - 680, 681, 678, 680, 681, 682, 683, 686, 682, 683, - 686, 687, 689, 691, 687, 689, 691, 692, 1046, 696, - 692, 631, 696, 555, 555, 555, 555, 555, 555, 1259, - 555, 1046, 555, 555, 588, 588, 588, 588, 699, 588, - 701, 699, 702, 701, 703, 702, 704, 703, 705, 704, - 706, 705, 713, 706, 714, 713, 715, 714, 1123, 715, - 716, 588, 717, 716, 718, 717, 747, 718, 588, 588, - 742, 719, 588, 588, 719, 588, 1123, 720, 724, 588, - 720, 724, 726, 727, 742, 726, 727, 588, 728, 729, - - 1216, 728, 729, 730, 730, 730, 730, 747, 748, 588, - 731, 731, 731, 731, 734, 734, 734, 734, 740, 772, - 761, 774, 740, 761, 775, 742, 744, 744, 744, 744, - 791, 740, 1197, 746, 746, 746, 746, 1185, 816, 748, - 793, 816, 824, 829, 830, 824, 829, 830, 1546, 740, - 772, 794, 774, 740, 831, 775, 832, 831, 1185, 832, - 746, 791, 740, 746, 1259, 588, 588, 588, 588, 588, - 588, 793, 588, 746, 588, 588, 589, 589, 589, 589, - 833, 589, 794, 833, 836, 776, 1223, 836, 795, 776, - 1072, 746, 795, 776, 746, 837, 795, 839, 837, 776, - - 839, 1545, 795, 589, 746, 776, 840, 889, 795, 840, - 589, 589, 1021, 1021, 589, 589, 776, 589, 1216, 795, - 776, 589, 841, 795, 776, 841, 1197, 795, 842, 589, - 776, 842, 845, 795, 846, 845, 776, 846, 889, 795, - 848, 589, 851, 848, 868, 851, 1072, 868, 761, 761, - 869, 871, 872, 869, 871, 872, 873, 874, 875, 873, - 874, 875, 876, 877, 878, 876, 877, 878, 881, 883, - 884, 881, 883, 884, 885, 886, 1211, 885, 886, 776, - 887, 1211, 795, 887, 890, 890, 890, 890, 891, 991, - 993, 891, 991, 993, 1027, 1027, 1223, 589, 589, 589, - - 589, 589, 589, 1050, 589, 1050, 589, 589, 656, 656, - 656, 656, 656, 656, 656, 656, 656, 656, 656, 656, - 656, 656, 656, 656, 656, 656, 656, 656, 656, 656, - 656, 656, 656, 656, 659, 659, 659, 659, 659, 659, - 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, - 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, - 1001, 1004, 1192, 1001, 1004, 659, 659, 659, 659, 659, - 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, - 659, 659, 659, 659, 659, 659, 659, 659, 659, 659, - 659, 770, 770, 770, 770, 771, 770, 893, 898, 898, - - 898, 898, 771, 771, 896, 1007, 771, 771, 1007, 771, - 897, 1006, 1006, 771, 1006, 899, 920, 922, 770, 923, - 938, 771, 941, 943, 944, 770, 770, 945, 893, 770, - 770, 790, 770, 771, 946, 896, 770, 898, 790, 790, - 964, 897, 790, 790, 770, 790, 899, 920, 922, 790, - 923, 938, 942, 941, 943, 944, 770, 790, 945, 948, - 1054, 1054, 1192, 948, 942, 946, 967, 1544, 898, 790, - 969, 964, 970, 942, 971, 948, 972, 942, 1012, 1009, - 1015, 948, 1009, 942, 1010, 1013, 1194, 1010, 1013, 771, - 771, 771, 771, 771, 771, 942, 771, 967, 771, 771, - - 940, 969, 974, 970, 942, 971, 974, 972, 942, 1012, - 1222, 1015, 770, 770, 770, 770, 770, 770, 974, 770, - 1543, 770, 770, 940, 974, 790, 790, 790, 790, 790, - 790, 940, 790, 1249, 790, 790, 857, 857, 857, 857, - 857, 857, 857, 857, 857, 857, 857, 857, 857, 857, - 857, 857, 857, 857, 857, 857, 857, 857, 857, 857, - 857, 857, 858, 858, 858, 858, 858, 858, 858, 858, - 858, 858, 858, 858, 858, 858, 858, 858, 858, 858, - 858, 858, 858, 858, 858, 858, 858, 858, 1073, 1073, - 940, 1194, 1222, 858, 858, 858, 858, 858, 858, 858, - - 858, 858, 858, 858, 858, 858, 858, 858, 858, 858, - 858, 858, 858, 858, 858, 858, 858, 858, 858, 918, - 918, 918, 918, 919, 918, 1014, 1014, 1014, 1014, 1542, - 919, 919, 1016, 1249, 919, 919, 924, 919, 1017, 1039, - 924, 919, 1156, 966, 924, 1156, 918, 1181, 1541, 919, - 924, 1041, 1042, 918, 918, 1057, 924, 918, 918, 1060, - 918, 919, 1062, 1016, 918, 1059, 966, 924, 1063, 1017, - 1039, 924, 918, 947, 966, 924, 1019, 1019, 1019, 1019, - 1181, 924, 1041, 1042, 918, 947, 1057, 924, 1059, 1199, - 1060, 1540, 1064, 1062, 947, 1076, 1059, 1065, 947, 1063, - - 1083, 952, 1076, 952, 947, 952, 952, 952, 952, 952, - 952, 952, 952, 952, 1199, 1085, 947, 919, 919, 919, - 919, 919, 919, 1064, 919, 947, 919, 919, 1065, 947, - 924, 1083, 1067, 966, 1088, 1089, 1067, 1240, 1539, 1271, - 918, 918, 918, 918, 918, 918, 1085, 918, 1067, 918, - 918, 951, 1227, 1157, 1067, 1059, 1157, 1227, 1240, 951, - 951, 951, 951, 1271, 1538, 1088, 1089, 951, 951, 951, - 951, 951, 951, 951, 951, 951, 951, 951, 951, 951, - 951, 951, 951, 951, 951, 951, 951, 951, 951, 951, - 951, 951, 951, 968, 973, 1090, 1043, 1091, 1092, 1090, - - 1043, 1093, 1095, 1097, 1043, 968, 973, 1098, 1090, 1119, - 1043, 1121, 1092, 1124, 968, 973, 1043, 1084, 968, 973, - 1084, 1125, 1084, 1127, 968, 973, 1090, 1043, 1091, 1247, - 1090, 1043, 1093, 1095, 1097, 1043, 968, 973, 1098, 1090, - 1119, 1043, 1121, 1092, 1124, 968, 973, 1043, 1196, 968, - 973, 978, 1125, 978, 1127, 978, 978, 978, 978, 978, - 978, 978, 978, 978, 1037, 1037, 1037, 1037, 1038, 1037, - 1084, 1115, 1193, 1252, 1115, 1038, 1038, 1248, 1214, 1038, - 1038, 1219, 1038, 1061, 1094, 1129, 1038, 1094, 1126, 1094, - 1043, 1037, 1126, 1128, 1038, 1061, 1131, 1133, 1037, 1037, - - 1066, 1126, 1037, 1037, 1061, 1037, 1038, 1128, 1061, 1037, - 1134, 1160, 1066, 1187, 1061, 1120, 1129, 1037, 1120, 1126, - 1120, 1066, 1534, 1126, 1533, 1066, 1061, 1131, 1133, 1037, - 1151, 1066, 1126, 1151, 1274, 1061, 1247, 1094, 1128, 1061, - 1253, 1134, 1160, 1066, 1130, 1158, 1158, 1130, 1158, 1130, - 1217, 1196, 1066, 1254, 1252, 1193, 1066, 1162, 1162, 1162, - 1162, 1248, 1038, 1038, 1038, 1038, 1038, 1038, 1120, 1038, - 1187, 1038, 1038, 1103, 1103, 1103, 1103, 1103, 1103, 1103, - 1103, 1103, 1191, 1187, 1219, 1037, 1037, 1037, 1037, 1037, - 1037, 1274, 1037, 1220, 1037, 1037, 1070, 1130, 1532, 1115, - - 1115, 1214, 1214, 1210, 1070, 1070, 1070, 1070, 1163, 1163, - 1163, 1163, 1070, 1070, 1070, 1070, 1070, 1070, 1070, 1070, - 1070, 1070, 1070, 1070, 1070, 1070, 1070, 1070, 1070, 1070, - 1070, 1070, 1070, 1070, 1070, 1070, 1070, 1070, 1071, 1182, - 1071, 1180, 1071, 1071, 1071, 1071, 1071, 1071, 1071, 1071, - 1071, 1096, 1253, 1254, 1096, 1183, 1096, 1102, 1151, 1151, - 1170, 1170, 1170, 1170, 1102, 1102, 1180, 1258, 1102, 1102, - 1217, 1102, 1182, 1246, 1191, 1102, 1191, 1217, 1096, 1220, - 1183, 1096, 1104, 1102, 1171, 1171, 1171, 1171, 1210, 1104, - 1104, 1096, 1257, 1104, 1104, 1102, 1104, 1180, 1265, 1279, - - 1104, 1531, 1265, 1182, 1096, 1255, 1246, 1518, 1104, 1096, - 1250, 1183, 1096, 1172, 1172, 1172, 1172, 1203, 1275, 1195, - 1104, 1251, 1096, 1101, 1101, 1101, 1101, 1101, 1101, 1101, - 1101, 1101, 1101, 1101, 1101, 1101, 1101, 1101, 1101, 1101, - 1101, 1101, 1101, 1101, 1101, 1101, 1101, 1101, 1101, 1213, - 1198, 1102, 1102, 1102, 1102, 1102, 1102, 1201, 1102, 1203, - 1102, 1102, 1132, 1200, 1204, 1132, 1517, 1132, 1174, 1174, - 1174, 1174, 1276, 1516, 1208, 1224, 1104, 1104, 1104, 1104, - 1104, 1104, 1266, 1104, 1205, 1104, 1104, 1138, 1200, 1132, - 1203, 1201, 1132, 1258, 1138, 1138, 1198, 1204, 1138, 1138, - - 1224, 1138, 1132, 1250, 1275, 1138, 1195, 1195, 1251, 1213, - 1206, 1200, 1226, 1138, 1257, 1132, 1515, 1205, 1279, 1200, - 1132, 1228, 1201, 1132, 1266, 1138, 1255, 1198, 1204, 1229, - 1233, 1224, 1292, 1132, 1139, 1139, 1139, 1139, 1139, 1139, - 1139, 1139, 1139, 1206, 1508, 1292, 1226, 1225, 1205, 1140, - 1225, 1234, 1225, 1507, 1208, 1506, 1140, 1140, 1208, 1233, - 1140, 1140, 1232, 1140, 1229, 1213, 1230, 1140, 1184, 1268, - 1208, 1273, 1236, 1233, 1206, 1140, 1208, 1226, 1200, 1276, - 1505, 1138, 1138, 1138, 1138, 1138, 1138, 1140, 1138, 1184, - 1138, 1138, 1495, 1184, 1234, 1229, 1232, 1184, 1212, 1230, - - 1225, 1236, 1260, 1184, 1233, 1228, 1212, 1268, 1212, 1184, - 1212, 1212, 1212, 1212, 1212, 1212, 1212, 1212, 1212, 1287, - 1184, 1239, 1277, 1228, 1184, 1234, 1238, 1232, 1184, 1492, - 1230, 1260, 1236, 1263, 1184, 1270, 1179, 1286, 1268, 1264, - 1184, 1273, 1267, 1140, 1140, 1140, 1140, 1140, 1140, 1278, - 1140, 1238, 1140, 1140, 1178, 1178, 1178, 1178, 1179, 1178, - 1270, 1356, 1260, 1267, 1202, 1179, 1179, 1239, 1235, 1179, - 1179, 1235, 1179, 1235, 1264, 1261, 1179, 1356, 1261, 1231, - 1261, 1178, 1238, 1184, 1179, 1202, 1285, 1207, 1178, 1178, - 1263, 1270, 1178, 1178, 1267, 1178, 1179, 1202, 1239, 1178, - - 1231, 1288, 1489, 1263, 1231, 1264, 1202, 1178, 1207, 1262, - 1202, 1283, 1262, 1231, 1262, 1291, 1202, 1488, 1291, 1178, - 1207, 1235, 1256, 1284, 1475, 1256, 1474, 1256, 1202, 1207, - 1287, 1231, 1289, 1207, 1293, 1231, 1473, 1202, 1313, 1207, - 1277, 1202, 1269, 1237, 1231, 1269, 1237, 1269, 1237, 1286, - 1472, 1207, 1179, 1179, 1179, 1179, 1179, 1179, 1313, 1179, - 1207, 1179, 1179, 1289, 1207, 1293, 1296, 1278, 1471, 1243, - 1237, 1312, 1312, 1237, 1465, 1178, 1178, 1178, 1178, 1178, - 1178, 1269, 1178, 1237, 1178, 1178, 1285, 1285, 1464, 1290, - 1322, 1243, 1290, 1322, 1290, 1269, 1237, 1296, 1243, 1243, - - 1288, 1237, 1243, 1243, 1237, 1243, 1244, 1284, 1245, 1243, - 1314, 1314, 1269, 1343, 1237, 1297, 1343, 1243, 1244, 1244, - 1244, 1244, 1244, 1244, 1244, 1244, 1244, 1284, 1298, 1243, - 1245, 1298, 1463, 1298, 1283, 1283, 1453, 1245, 1245, 1299, - 1320, 1245, 1245, 1452, 1245, 1451, 1297, 1272, 1245, 1344, - 1256, 1256, 1272, 1349, 1345, 1450, 1245, 1345, 1357, 1357, - 1272, 1272, 1272, 1272, 1449, 1350, 1351, 1298, 1245, 1448, - 1299, 1320, 1327, 1327, 1327, 1327, 1328, 1328, 1328, 1328, - 1344, 1298, 1363, 1363, 1349, 1243, 1243, 1243, 1243, 1243, - 1243, 1447, 1243, 1446, 1243, 1243, 1350, 1351, 1298, 1329, - - 1329, 1329, 1329, 1330, 1330, 1330, 1330, 1331, 1331, 1331, - 1331, 1332, 1332, 1332, 1332, 1333, 1333, 1333, 1333, 1334, - 1334, 1334, 1334, 1443, 1245, 1245, 1245, 1245, 1245, 1245, - 1440, 1245, 1372, 1245, 1245, 1335, 1335, 1335, 1335, 1336, - 1336, 1336, 1336, 1342, 1348, 1438, 1424, 1348, 1385, 1348, - 1342, 1342, 1408, 1355, 1342, 1342, 1355, 1342, 1355, 1387, - 1423, 1342, 1387, 1372, 1387, 1422, 1347, 1421, 1347, 1342, - 1347, 1347, 1347, 1347, 1347, 1347, 1347, 1347, 1347, 1385, - 1353, 1342, 1353, 1408, 1353, 1353, 1353, 1353, 1353, 1353, - 1353, 1353, 1353, 1380, 1380, 1380, 1380, 1348, 1381, 1381, - - 1381, 1381, 1382, 1382, 1382, 1382, 1355, 1420, 1418, 1417, - 1420, 1416, 1387, 1388, 1388, 1388, 1388, 1388, 1388, 1388, - 1388, 1388, 1389, 1413, 1412, 1389, 1411, 1389, 1391, 1391, - 1391, 1391, 1391, 1391, 1391, 1391, 1391, 1342, 1342, 1342, - 1342, 1342, 1342, 1392, 1342, 1410, 1342, 1342, 1414, 1409, - 1392, 1392, 1406, 1439, 1392, 1392, 1394, 1392, 1444, 1402, - 1466, 1392, 1401, 1394, 1394, 1400, 1395, 1394, 1394, 1395, - 1394, 1395, 1490, 1396, 1394, 1389, 1396, 1403, 1396, 1414, - 1403, 1392, 1403, 1404, 1439, 1399, 1404, 1398, 1404, 1444, - 1405, 1466, 1397, 1405, 1394, 1405, 1407, 1415, 1390, 1407, - - 1384, 1407, 1419, 1490, 1383, 1415, 1415, 1415, 1415, 1379, - 1419, 1419, 1419, 1419, 1378, 1425, 1377, 1376, 1425, 1395, - 1425, 1375, 1426, 1374, 1373, 1426, 1396, 1426, 1427, 1428, - 1403, 1427, 1428, 1427, 1428, 1369, 1404, 1392, 1392, 1392, - 1392, 1392, 1392, 1405, 1392, 1368, 1392, 1392, 1367, 1407, - 1394, 1394, 1394, 1394, 1394, 1394, 1366, 1394, 1429, 1394, - 1394, 1429, 1430, 1429, 1365, 1430, 1431, 1430, 1425, 1431, - 1364, 1431, 1362, 1432, 1433, 1426, 1432, 1433, 1432, 1433, - 1361, 1427, 1428, 1360, 1434, 1435, 1359, 1434, 1435, 1434, - 1435, 1436, 1437, 1358, 1436, 1437, 1436, 1437, 1441, 1441, - - 1441, 1441, 1442, 1442, 1442, 1442, 1354, 1468, 1352, 1346, - 1468, 1429, 1468, 1454, 1338, 1430, 1454, 1337, 1454, 1431, - 1429, 1326, 1325, 1324, 1323, 1470, 1432, 1433, 1470, 1321, - 1470, 1491, 1318, 1429, 1317, 1316, 1433, 1434, 1435, 1491, - 1491, 1491, 1491, 1457, 1436, 1437, 1457, 1460, 1457, 1433, - 1460, 1445, 1460, 1445, 1437, 1445, 1445, 1445, 1445, 1445, - 1445, 1445, 1445, 1445, 1315, 1456, 1454, 1437, 1456, 1311, - 1456, 1477, 1310, 1309, 1477, 1308, 1477, 1307, 1456, 1306, - 1456, 1305, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, - 1456, 1304, 1459, 1496, 1303, 1459, 1457, 1459, 1302, 1301, - - 1460, 1496, 1496, 1496, 1496, 1459, 1300, 1459, 1295, 1459, - 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1459, 1456, 1294, - 1242, 1441, 1455, 1177, 1477, 1455, 1176, 1455, 1175, 1173, - 1479, 1481, 1455, 1479, 1481, 1479, 1481, 1169, 1168, 1167, - 1455, 1455, 1455, 1455, 1166, 1459, 1165, 1164, 1455, 1455, - 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, - 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, 1455, - 1455, 1455, 1455, 1455, 1161, 1455, 1458, 1154, 1153, 1458, - 1152, 1458, 1150, 1479, 1481, 1483, 1458, 1149, 1483, 1148, - 1483, 1147, 1146, 1145, 1458, 1458, 1458, 1458, 1144, 1143, - - 1142, 1141, 1458, 1458, 1458, 1458, 1458, 1458, 1458, 1458, - 1458, 1458, 1458, 1458, 1458, 1458, 1458, 1458, 1458, 1458, - 1458, 1458, 1458, 1458, 1458, 1458, 1458, 1458, 1136, 1458, - 1461, 1485, 1135, 1461, 1485, 1461, 1485, 1122, 1483, 1487, - 1461, 1118, 1487, 1117, 1487, 1116, 1114, 1113, 1461, 1461, - 1461, 1461, 1112, 1111, 1110, 1109, 1461, 1461, 1461, 1461, - 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, - 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, 1461, - 1461, 1461, 1462, 1461, 1485, 1462, 1108, 1462, 1107, 1106, - 1105, 1494, 1487, 1100, 1494, 1462, 1494, 1462, 1099, 1462, - - 1462, 1462, 1462, 1462, 1462, 1462, 1462, 1462, 1467, 1467, - 1467, 1467, 1467, 1467, 1467, 1467, 1467, 1499, 1086, 1082, - 1081, 1502, 1080, 1079, 1078, 1499, 1499, 1499, 1499, 1502, - 1502, 1502, 1502, 1077, 1075, 1462, 1476, 1493, 1074, 1476, - 1493, 1476, 1493, 1520, 1494, 1069, 1520, 1068, 1520, 1535, - 1522, 1524, 1058, 1522, 1524, 1522, 1524, 1535, 1535, 1535, - 1535, 1056, 1476, 1476, 1476, 1476, 1476, 1476, 1476, 1476, - 1476, 1476, 1476, 1476, 1476, 1476, 1476, 1476, 1476, 1476, - 1476, 1476, 1476, 1476, 1476, 1476, 1476, 1476, 1478, 1476, - 1493, 1478, 1055, 1478, 1053, 1052, 1520, 1482, 1051, 1049, - - 1482, 1048, 1482, 1522, 1524, 1478, 1478, 1478, 1478, 1478, - 1478, 1478, 1478, 1478, 1482, 1482, 1482, 1482, 1482, 1482, - 1482, 1482, 1482, 1536, 1047, 1045, 1044, 1537, 1040, 1034, - 1033, 1536, 1536, 1536, 1536, 1537, 1537, 1537, 1537, 1032, - 1031, 1478, 1480, 1030, 1029, 1480, 1028, 1480, 1026, 1025, - 1482, 1526, 1024, 1023, 1526, 1022, 1526, 1018, 1528, 1530, - 1493, 1528, 1530, 1528, 1530, 992, 989, 988, 1480, 1480, - 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, - 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, 1480, - 1480, 1480, 1480, 1480, 987, 1480, 1484, 986, 985, 1484, - - 984, 1484, 1497, 982, 1526, 1497, 981, 1497, 977, 976, - 975, 1528, 1530, 965, 963, 962, 961, 960, 959, 958, - 956, 955, 1484, 1484, 1484, 1484, 1484, 1484, 1484, 1484, - 1484, 1484, 1484, 1484, 1484, 1484, 1484, 1484, 1484, 1484, - 1484, 1484, 1484, 1484, 1484, 1484, 1484, 1484, 1486, 1484, - 950, 1486, 949, 1486, 1498, 1497, 939, 1498, 1500, 1498, - 937, 1500, 936, 1500, 1497, 1486, 1486, 1486, 1486, 1486, - 1486, 1486, 1486, 1486, 934, 1501, 933, 1497, 1501, 1503, - 1501, 932, 1503, 1504, 1503, 930, 1504, 929, 1504, 928, - 926, 925, 921, 915, 914, 913, 912, 908, 907, 906, - - 905, 1486, 904, 903, 902, 901, 900, 1498, 895, 894, - 892, 1500, 880, 856, 822, 821, 1498, 819, 818, 808, - 1500, 807, 805, 804, 803, 801, 800, 799, 1501, 1498, - 797, 796, 1503, 1500, 792, 789, 1504, 1501, 788, 786, - 785, 1503, 784, 782, 1509, 1504, 781, 1509, 780, 1509, - 1501, 778, 777, 773, 1503, 765, 764, 1509, 1504, 1509, - 763, 1509, 1509, 1509, 1509, 1509, 1509, 1509, 1509, 1509, - 762, 760, 759, 758, 757, 756, 755, 754, 753, 752, - 751, 750, 749, 736, 725, 723, 721, 712, 711, 709, - 708, 700, 694, 690, 654, 653, 647, 1509, 1510, 646, - - 645, 644, 643, 641, 610, 606, 1510, 1510, 1510, 1510, - 591, 590, 587, 586, 1510, 1510, 1510, 1510, 1510, 1510, - 1510, 1510, 1510, 1510, 1510, 1510, 1510, 1510, 1510, 1510, - 1510, 1510, 1510, 1510, 1510, 1510, 1510, 1510, 1510, 1510, - 1511, 585, 584, 1511, 582, 1511, 581, 580, 579, 578, - 577, 576, 574, 1511, 573, 1511, 570, 1511, 1511, 1511, - 1511, 1511, 1511, 1511, 1511, 1511, 569, 559, 556, 550, - 546, 543, 542, 541, 535, 533, 532, 524, 521, 511, - 510, 509, 506, 505, 504, 494, 493, 458, 457, 453, - 451, 449, 448, 1511, 1512, 444, 426, 416, 415, 414, - - 412, 411, 1512, 1512, 1512, 1512, 399, 397, 396, 395, - 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, - 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, 1512, - 1512, 1512, 1512, 1512, 1512, 1512, 1513, 394, 393, 1513, - 392, 1513, 390, 389, 388, 387, 385, 384, 383, 1513, - 381, 1513, 380, 1513, 1513, 1513, 1513, 1513, 1513, 1513, - 1513, 1513, 379, 377, 376, 375, 374, 373, 369, 367, - 364, 359, 358, 356, 349, 348, 347, 346, 345, 344, - 330, 329, 327, 326, 323, 322, 320, 319, 317, 1513, - 1514, 314, 312, 298, 297, 289, 288, 287, 1514, 1514, - - 1514, 1514, 286, 285, 283, 278, 1514, 1514, 1514, 1514, - 1514, 1514, 1514, 1514, 1514, 1514, 1514, 1514, 1514, 1514, - 1514, 1514, 1514, 1514, 1514, 1514, 1514, 1514, 1514, 1514, - 1514, 1514, 1519, 274, 271, 1519, 268, 1519, 267, 264, - 259, 257, 255, 245, 237, 235, 232, 228, 226, 1519, - 1519, 1519, 1519, 1519, 1519, 1519, 1519, 1519, 221, 1523, - 218, 216, 1523, 215, 1523, 214, 213, 211, 209, 203, - 199, 198, 196, 193, 182, 181, 1523, 1523, 1523, 1523, - 1523, 1523, 1523, 1523, 1523, 1519, 1521, 1521, 1521, 1521, - 1521, 1521, 1521, 1521, 1521, 1521, 1521, 1521, 1521, 1521, - - 1521, 1521, 1521, 1521, 1521, 1521, 1521, 1521, 1521, 1521, - 1521, 1521, 1523, 1525, 1525, 1525, 1525, 1525, 1525, 1525, - 1525, 1525, 1525, 1525, 1525, 1525, 1525, 1525, 1525, 1525, - 1525, 1525, 1525, 1525, 1525, 1525, 1525, 1525, 1525, 1527, - 180, 176, 1527, 175, 1527, 174, 161, 153, 146, 145, - 143, 140, 125, 124, 120, 119, 1527, 1527, 1527, 1527, - 1527, 1527, 1527, 1527, 1527, 118, 112, 105, 102, 100, - 96, 95, 93, 92, 89, 88, 85, 81, 78, 75, - 72, 71, 70, 69, 65, 62, 58, 57, 54, 49, - 47, 46, 1527, 1529, 1529, 1529, 1529, 1529, 1529, 1529, - - 1529, 1529, 1529, 1529, 1529, 1529, 1529, 1529, 1529, 1529, - 1529, 1529, 1529, 1529, 1529, 1529, 1529, 1529, 1529, 1559, - 1559, 1559, 1559, 1559, 1559, 1559, 1559, 1559, 1559, 1559, - 1560, 1560, 1560, 1560, 1560, 1560, 1560, 1560, 1560, 1560, - 1560, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, 1561, - 1561, 1561, 1562, 1562, 1562, 1562, 1562, 1562, 1562, 1562, - 1562, 1562, 1562, 1563, 1563, 1563, 1563, 1563, 1563, 1563, - 1563, 1563, 1563, 1563, 1564, 1564, 1564, 1564, 1564, 1564, - 1564, 1564, 1564, 1564, 1564, 1565, 1565, 1565, 1565, 1565, - 1565, 1565, 1565, 1565, 1565, 1565, 1566, 1566, 1566, 1566, - - 1566, 1566, 1566, 1566, 1566, 1566, 1566, 1567, 1567, 1567, - 1567, 1567, 1567, 1567, 1567, 1567, 1567, 1567, 1568, 1568, - 1568, 1568, 1568, 1568, 1568, 1568, 1568, 1568, 1568, 1569, - 1569, 1569, 1569, 1569, 1569, 1569, 1569, 1569, 1569, 1569, - 1570, 1570, 1570, 1570, 1571, 1571, 41, 1571, 1571, 1571, - 1571, 1571, 1571, 1571, 1571, 1572, 37, 36, 35, 1572, - 1572, 1572, 1572, 1572, 1572, 1572, 1573, 1573, 18, 17, - 1573, 1573, 1573, 1573, 1573, 1573, 1573, 1574, 1574, 0, - 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1575, 0, - 0, 0, 1575, 1575, 1575, 1575, 1575, 1575, 1575, 1576, - - 0, 0, 0, 1576, 1576, 1576, 1576, 1576, 1576, 1576, - 1577, 0, 0, 0, 1577, 1577, 1577, 1577, 1577, 1577, - 1577, 1578, 1578, 0, 1578, 1578, 1578, 1578, 1578, 1578, - 1578, 1578, 1579, 1579, 0, 1579, 1579, 1579, 1579, 1579, - 1579, 1579, 1579, 1580, 1580, 0, 1580, 1580, 1580, 1580, - 1580, 1580, 1580, 1580, 1581, 1581, 0, 1581, 1581, 1581, + 462, 513, 546, 602, 606, 546, 602, 606, 1259, 513, + 559, 559, 559, 559, 825, 825, 462, 462, 462, 462, + 462, 462, 462, 462, 462, 462, 462, 462, 462, 462, + 462, 462, 462, 462, 462, 462, 462, 462, 462, 462, + 462, 462, 612, 515, 515, 612, 515, 462, 462, 462, + 462, 462, 462, 462, 462, 462, 462, 462, 462, 462, + 462, 462, 462, 462, 462, 462, 462, 462, 462, 462, + 462, 462, 462, 464, 1555, 553, 961, 515, 553, 545, + + 562, 614, 545, 961, 614, 464, 515, 464, 1051, 464, + 464, 464, 464, 464, 464, 464, 464, 464, 545, 549, + 745, 1051, 549, 562, 550, 550, 550, 550, 564, 569, + 1551, 562, 613, 569, 549, 613, 1259, 613, 515, 550, + 564, 615, 608, 515, 615, 608, 569, 957, 553, 564, + 608, 745, 569, 564, 609, 616, 913, 609, 616, 564, + 617, 618, 609, 617, 618, 619, 620, 621, 619, 620, + 621, 564, 549, 556, 556, 556, 556, 913, 622, 623, + 564, 622, 623, 624, 564, 625, 624, 626, 625, 627, + 626, 628, 627, 1206, 628, 629, 562, 1550, 629, 556, + + 556, 630, 631, 632, 630, 631, 632, 556, 556, 957, + 634, 556, 556, 634, 556, 1549, 635, 636, 556, 635, + 636, 632, 638, 651, 665, 638, 651, 665, 671, 906, + 906, 671, 651, 665, 672, 912, 912, 672, 556, 663, + 663, 663, 663, 663, 663, 663, 663, 663, 673, 674, + 675, 673, 674, 675, 678, 679, 681, 678, 679, 681, + 682, 683, 684, 682, 683, 684, 687, 688, 632, 687, + 688, 690, 692, 693, 690, 692, 693, 697, 700, 702, + 697, 700, 702, 703, 704, 705, 703, 704, 705, 706, + 707, 714, 706, 707, 714, 715, 716, 1206, 715, 716, + + 556, 556, 556, 1528, 556, 556, 556, 1055, 556, 1055, + 556, 556, 589, 589, 589, 589, 717, 589, 718, 717, + 719, 718, 720, 719, 721, 720, 725, 721, 727, 725, + 728, 727, 729, 728, 730, 729, 1117, 730, 589, 589, + 731, 731, 731, 731, 748, 735, 589, 589, 735, 746, + 589, 589, 1231, 589, 750, 751, 1117, 589, 732, 732, + 732, 732, 752, 746, 753, 589, 734, 734, 734, 734, + 738, 738, 738, 738, 744, 748, 764, 589, 744, 764, + 746, 747, 747, 747, 747, 750, 751, 744, 775, 776, + 777, 778, 779, 752, 746, 753, 1155, 749, 749, 749, + + 749, 781, 795, 796, 797, 744, 1269, 798, 1202, 744, + 821, 799, 1154, 821, 829, 801, 1155, 829, 744, 775, + 776, 777, 778, 779, 749, 834, 835, 749, 834, 835, + 914, 914, 781, 795, 796, 797, 1154, 749, 798, 589, + 589, 589, 799, 589, 589, 589, 801, 589, 1527, 589, + 589, 590, 590, 590, 590, 749, 590, 836, 749, 1300, + 836, 774, 774, 837, 838, 1200, 837, 838, 749, 774, + 774, 1231, 841, 774, 774, 841, 774, 590, 590, 842, + 774, 844, 842, 1230, 844, 590, 590, 780, 774, 590, + 590, 780, 590, 1526, 845, 780, 590, 845, 895, 846, + + 774, 780, 846, 847, 590, 850, 847, 780, 850, 1202, + 851, 764, 764, 851, 853, 983, 590, 853, 780, 1077, + 856, 873, 780, 856, 873, 874, 780, 876, 874, 895, + 876, 877, 780, 878, 877, 1269, 878, 879, 780, 880, + 879, 881, 880, 882, 881, 883, 882, 886, 883, 888, + 886, 889, 888, 890, 889, 891, 890, 892, 891, 1300, + 892, 1293, 774, 774, 774, 1270, 774, 774, 774, 1230, + 774, 894, 774, 774, 894, 939, 939, 983, 590, 590, + 590, 1077, 590, 590, 590, 1200, 590, 780, 590, 590, + 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, + + 657, 657, 657, 657, 657, 657, 657, 657, 657, 657, + 657, 657, 657, 657, 657, 657, 660, 660, 660, 660, + 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, + 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, + 660, 660, 958, 958, 984, 984, 896, 660, 660, 660, + 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, + 660, 660, 660, 660, 660, 660, 660, 660, 660, 660, + 660, 660, 660, 773, 773, 773, 773, 896, 773, 898, + 987, 995, 794, 794, 995, 899, 900, 987, 1293, 902, + 794, 794, 1203, 903, 794, 794, 923, 794, 1270, 773, + + 773, 794, 901, 901, 901, 901, 924, 773, 773, 794, + 898, 773, 773, 925, 773, 800, 899, 900, 773, 800, + 902, 794, 926, 800, 903, 927, 773, 923, 929, 800, + 943, 944, 946, 948, 949, 800, 950, 924, 773, 951, + 953, 901, 942, 1525, 925, 942, 800, 942, 969, 970, + 800, 952, 1240, 926, 800, 952, 927, 1240, 980, 929, + 800, 943, 944, 946, 948, 949, 800, 950, 952, 978, + 951, 953, 901, 978, 952, 1203, 945, 980, 972, 969, + 970, 974, 975, 794, 794, 794, 978, 794, 794, 794, + 1090, 794, 978, 794, 794, 942, 1031, 1031, 1226, 945, + + 773, 773, 773, 1090, 773, 773, 773, 945, 773, 972, + 773, 773, 974, 975, 1229, 800, 862, 862, 862, 862, + 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + 862, 862, 862, 862, 862, 862, 862, 862, 862, 862, + 862, 862, 863, 863, 863, 863, 863, 863, 863, 863, + 863, 863, 863, 863, 863, 863, 863, 863, 863, 863, + 863, 863, 863, 863, 863, 863, 863, 863, 997, 1059, + 1059, 997, 945, 863, 863, 863, 863, 863, 863, 863, + 863, 863, 863, 863, 863, 863, 863, 863, 863, 863, + 863, 863, 863, 863, 863, 863, 863, 863, 863, 921, + + 921, 921, 921, 1005, 921, 976, 1005, 968, 922, 922, + 968, 1008, 968, 1291, 1008, 977, 922, 922, 1229, 979, + 922, 922, 1226, 922, 1081, 921, 921, 922, 971, 1010, + 1010, 1081, 1010, 921, 921, 922, 976, 921, 921, 1016, + 921, 928, 947, 1018, 921, 928, 977, 922, 1019, 928, + 979, 971, 921, 1011, 947, 928, 1011, 1020, 1021, 971, + 968, 928, 1013, 947, 921, 1013, 1014, 947, 1505, 1014, + 1016, 1023, 928, 947, 1018, 1089, 928, 1043, 1089, 1019, + 928, 1017, 1017, 1017, 1017, 947, 928, 1023, 1020, 1021, + 1044, 1045, 928, 1023, 947, 956, 1500, 956, 947, 956, + + 956, 956, 956, 956, 956, 956, 956, 956, 1043, 922, + 922, 922, 1261, 922, 922, 922, 1046, 922, 1047, 922, + 922, 1044, 1045, 1049, 971, 1063, 921, 921, 921, 1074, + 921, 921, 921, 1223, 921, 1062, 921, 921, 1062, 1291, + 1062, 928, 955, 1022, 1022, 1022, 1022, 1046, 1074, 1047, + 955, 955, 955, 955, 1049, 1298, 1063, 1294, 955, 955, + 955, 955, 955, 955, 955, 955, 955, 955, 955, 955, + 955, 955, 955, 955, 955, 955, 955, 955, 955, 955, + 955, 955, 955, 955, 973, 1025, 1025, 1072, 1062, 1078, + 1078, 1072, 1095, 1223, 1064, 1499, 973, 1066, 1068, 1069, + + 1070, 1071, 1073, 1065, 1072, 973, 1091, 1025, 1025, 973, + 1072, 1095, 982, 1261, 982, 973, 982, 982, 982, 982, + 982, 982, 982, 982, 982, 1064, 1065, 973, 1066, 1068, + 1069, 1070, 1071, 1073, 1065, 1093, 973, 1091, 1133, 1096, + 973, 1041, 1041, 1041, 1041, 1127, 1041, 1097, 1127, 1088, + 1042, 1042, 1088, 1122, 1088, 1223, 1122, 1133, 1042, 1042, + 1197, 1099, 1042, 1042, 1294, 1042, 1093, 1041, 1041, 1042, + 1096, 1102, 1298, 1104, 1266, 1041, 1041, 1042, 1097, 1041, + 1041, 1100, 1041, 1048, 1067, 1092, 1041, 1048, 1092, 1042, + 1092, 1048, 1099, 1105, 1041, 1100, 1067, 1048, 1106, 1065, + + 1107, 1236, 1102, 1048, 1104, 1067, 1041, 1128, 1126, 1067, + 1271, 1126, 1100, 1126, 1048, 1067, 1273, 1197, 1048, 1098, + 1128, 1273, 1048, 1098, 1105, 1486, 1100, 1067, 1048, 1106, + 1197, 1107, 1098, 1129, 1048, 1131, 1067, 1076, 1092, 1076, + 1067, 1076, 1076, 1076, 1076, 1076, 1076, 1076, 1076, 1076, + 1098, 1042, 1042, 1042, 1098, 1042, 1042, 1042, 1236, 1042, + 1134, 1042, 1042, 1098, 1129, 1135, 1131, 1137, 1041, 1041, + 1041, 1236, 1041, 1041, 1041, 1266, 1041, 1101, 1041, 1041, + 1101, 1264, 1101, 1048, 1075, 1207, 1477, 1165, 1122, 1122, + 1165, 1134, 1075, 1075, 1075, 1075, 1135, 1140, 1137, 1467, + + 1075, 1075, 1075, 1075, 1075, 1075, 1075, 1075, 1075, 1075, + 1075, 1075, 1075, 1075, 1075, 1075, 1075, 1075, 1075, 1075, + 1075, 1075, 1075, 1075, 1075, 1075, 1103, 1142, 1140, 1103, + 1101, 1103, 1109, 1109, 1143, 1290, 1138, 1144, 1145, 1136, + 1109, 1109, 1271, 1136, 1109, 1109, 1166, 1109, 1241, 1166, + 1138, 1109, 1136, 1103, 1160, 1169, 1103, 1160, 1142, 1109, + 1167, 1167, 1264, 1167, 1260, 1143, 1103, 1138, 1144, 1145, + 1136, 1109, 1130, 1139, 1136, 1130, 1139, 1130, 1139, 1103, + 1207, 1138, 1205, 1136, 1103, 1209, 1169, 1103, 1110, 1110, + 1110, 1110, 1110, 1110, 1110, 1110, 1110, 1103, 1108, 1108, + + 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, + 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, + 1108, 1108, 1108, 1108, 1170, 1130, 1139, 1171, 1171, 1171, + 1171, 1209, 1241, 1109, 1109, 1109, 1190, 1109, 1109, 1109, + 1466, 1109, 1286, 1109, 1109, 1111, 1111, 1141, 1260, 1267, + 1141, 1241, 1141, 1111, 1111, 1170, 1227, 1111, 1111, 1290, + 1111, 1190, 1209, 1193, 1111, 1201, 1285, 1147, 1147, 1277, + 1205, 1205, 1111, 1277, 1141, 1147, 1147, 1141, 1299, 1147, + 1147, 1465, 1147, 1189, 1111, 1232, 1147, 1141, 1193, 1160, + 1160, 1464, 1190, 1463, 1147, 1172, 1172, 1172, 1172, 1286, + + 1141, 1179, 1179, 1179, 1179, 1141, 1147, 1189, 1141, 1148, + 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1148, 1141, 1193, + 1191, 1212, 1149, 1149, 1180, 1180, 1180, 1180, 1224, 1214, + 1149, 1149, 1462, 1192, 1149, 1149, 1285, 1149, 1189, 1318, + 1318, 1149, 1181, 1181, 1181, 1181, 1111, 1111, 1111, 1149, + 1111, 1111, 1111, 1191, 1111, 1212, 1111, 1111, 1201, 1188, + 1201, 1149, 1183, 1183, 1183, 1183, 1192, 1232, 1147, 1147, + 1147, 1214, 1147, 1147, 1147, 1219, 1147, 1267, 1147, 1147, + 1188, 1188, 1215, 1227, 1191, 1210, 1212, 1195, 1188, 1188, + 1227, 1194, 1188, 1188, 1299, 1188, 1211, 1192, 1287, 1188, + + 1208, 1234, 1214, 1208, 1234, 1208, 1234, 1188, 1195, 1220, + 1210, 1288, 1194, 1455, 1262, 1215, 1194, 1219, 1218, 1188, + 1194, 1211, 1450, 1149, 1149, 1149, 1194, 1149, 1149, 1149, + 1239, 1149, 1194, 1149, 1149, 1187, 1187, 1187, 1187, 1195, + 1187, 1210, 1216, 1194, 1211, 1217, 1215, 1194, 1219, 1324, + 1324, 1194, 1211, 1208, 1237, 1278, 1436, 1194, 1224, 1224, + 1302, 1187, 1187, 1194, 1239, 1302, 1326, 1326, 1242, 1187, + 1187, 1243, 1213, 1187, 1187, 1216, 1187, 1245, 1217, 1237, + 1187, 1188, 1188, 1188, 1287, 1188, 1188, 1188, 1187, 1188, + 1263, 1188, 1188, 1213, 1220, 1239, 1235, 1278, 1218, 1235, + + 1187, 1235, 1218, 1242, 1243, 1213, 1216, 1435, 1262, 1217, + 1237, 1245, 1194, 1220, 1213, 1218, 1297, 1211, 1213, 1288, + 1301, 1218, 1238, 1301, 1213, 1238, 1247, 1238, 1278, 1247, + 1295, 1247, 1262, 1434, 1242, 1243, 1213, 1251, 1222, 1252, + 1244, 1428, 1245, 1253, 1250, 1213, 1222, 1246, 1222, 1213, + 1222, 1222, 1222, 1222, 1222, 1222, 1222, 1222, 1222, 1248, + 1252, 1244, 1187, 1187, 1187, 1244, 1187, 1187, 1187, 1250, + 1187, 1276, 1187, 1187, 1244, 1238, 1246, 1253, 1263, 1247, + 1289, 1272, 1249, 1251, 1272, 1249, 1272, 1249, 1248, 1279, + 1246, 1252, 1244, 1280, 1255, 1296, 1244, 1426, 1263, 1268, + + 1250, 1283, 1268, 1419, 1268, 1244, 1276, 1246, 1253, 1249, + 1279, 1415, 1249, 1423, 1251, 1255, 1255, 1297, 1297, 1248, + 1414, 1246, 1249, 1255, 1255, 1283, 1355, 1255, 1255, 1355, + 1255, 1280, 1256, 1423, 1255, 1249, 1257, 1276, 1275, 1282, + 1249, 1279, 1255, 1249, 1256, 1256, 1256, 1256, 1256, 1256, + 1256, 1256, 1256, 1249, 1255, 1413, 1283, 1257, 1257, 1412, + 1295, 1295, 1280, 1411, 1282, 1257, 1257, 1275, 1410, 1257, + 1257, 1304, 1257, 1274, 1401, 1281, 1257, 1424, 1281, 1296, + 1281, 1274, 1305, 1274, 1257, 1274, 1274, 1274, 1274, 1274, + 1274, 1274, 1274, 1274, 1284, 1282, 1257, 1424, 1275, 1284, + + 1296, 1307, 1304, 1483, 1289, 1289, 1308, 1284, 1284, 1284, + 1284, 1400, 1309, 1305, 1281, 1398, 1255, 1255, 1255, 1325, + 1255, 1255, 1255, 1483, 1255, 1311, 1255, 1255, 1281, 1397, + 1312, 1335, 1307, 1310, 1268, 1268, 1310, 1308, 1310, 1332, + 1325, 1393, 1303, 1309, 1303, 1281, 1303, 1303, 1303, 1303, + 1303, 1303, 1303, 1303, 1303, 1335, 1311, 1333, 1257, 1257, + 1257, 1312, 1257, 1257, 1257, 1425, 1257, 1369, 1257, 1257, + 1332, 1334, 1310, 1392, 1334, 1339, 1339, 1339, 1339, 1340, + 1340, 1340, 1340, 1369, 1377, 1377, 1310, 1425, 1333, 1369, + 1391, 1334, 1341, 1341, 1341, 1341, 1334, 1342, 1342, 1342, + + 1342, 1360, 1390, 1310, 1343, 1343, 1343, 1343, 1344, 1344, + 1344, 1344, 1345, 1345, 1345, 1345, 1346, 1346, 1346, 1346, + 1347, 1347, 1347, 1347, 1348, 1348, 1348, 1348, 1354, 1354, + 1357, 1389, 1360, 1357, 1362, 1357, 1354, 1354, 1363, 1359, + 1354, 1354, 1359, 1354, 1359, 1361, 1364, 1354, 1361, 1365, + 1361, 1386, 1371, 1371, 1387, 1354, 1358, 1358, 1358, 1358, + 1358, 1358, 1358, 1358, 1358, 1362, 1433, 1354, 1368, 1363, + 1478, 1368, 1388, 1368, 1371, 1371, 1457, 1364, 1383, 1457, + 1365, 1457, 1386, 1357, 1382, 1387, 1394, 1394, 1394, 1394, + 1433, 1402, 1359, 1403, 1478, 1366, 1421, 1366, 1361, 1366, + + 1366, 1366, 1366, 1366, 1366, 1366, 1366, 1366, 1395, 1395, + 1395, 1395, 1396, 1396, 1396, 1396, 1454, 1454, 1454, 1454, + 1408, 1368, 1402, 1408, 1403, 1408, 1381, 1421, 1380, 1354, + 1354, 1354, 1379, 1354, 1354, 1354, 1399, 1354, 1422, 1354, + 1354, 1399, 1409, 1416, 1479, 1409, 1416, 1409, 1416, 1399, + 1399, 1399, 1399, 1404, 1404, 1404, 1404, 1404, 1404, 1404, + 1404, 1404, 1405, 1405, 1484, 1378, 1376, 1429, 1479, 1422, + 1405, 1405, 1375, 1408, 1405, 1405, 1374, 1405, 1407, 1407, + 1417, 1405, 1373, 1417, 1484, 1417, 1407, 1407, 1430, 1418, + 1407, 1407, 1418, 1407, 1418, 1409, 1416, 1407, 1429, 1420, + + 1451, 1405, 1420, 1427, 1420, 1427, 1452, 1427, 1427, 1427, + 1427, 1427, 1427, 1427, 1427, 1427, 1431, 1407, 1432, 1430, + 1372, 1432, 1460, 1370, 1431, 1431, 1431, 1431, 1461, 1437, + 1481, 1451, 1437, 1417, 1437, 1482, 1367, 1452, 1432, 1501, + 1485, 1438, 1418, 1432, 1438, 1439, 1438, 1502, 1439, 1350, + 1439, 1440, 1420, 1460, 1440, 1441, 1440, 1349, 1441, 1461, + 1441, 1481, 1485, 1405, 1405, 1405, 1482, 1405, 1405, 1405, + 1501, 1405, 1442, 1405, 1405, 1442, 1338, 1442, 1502, 1407, + 1407, 1407, 1437, 1407, 1407, 1407, 1337, 1407, 1443, 1407, + 1407, 1443, 1444, 1443, 1438, 1444, 1445, 1444, 1439, 1445, + + 1446, 1445, 1336, 1446, 1440, 1446, 1447, 1448, 1441, 1447, + 1448, 1447, 1448, 1449, 1330, 1329, 1449, 1441, 1449, 1453, + 1453, 1453, 1453, 1459, 1468, 1442, 1459, 1468, 1459, 1468, + 1441, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, 1456, + 1515, 1443, 1541, 1516, 1328, 1444, 1327, 1543, 1517, 1445, + 1323, 1471, 1322, 1446, 1471, 1321, 1471, 1320, 1445, 1447, + 1448, 1319, 1515, 1317, 1541, 1474, 1449, 1516, 1474, 1543, + 1474, 1445, 1517, 1316, 1480, 1449, 1470, 1468, 1315, 1470, + 1314, 1470, 1480, 1480, 1480, 1480, 1518, 1488, 1449, 1470, + 1488, 1470, 1488, 1470, 1470, 1470, 1470, 1470, 1470, 1470, + + 1470, 1470, 1473, 1490, 1471, 1473, 1490, 1473, 1490, 1492, + 1518, 1542, 1492, 1553, 1492, 1473, 1313, 1473, 1474, 1473, + 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1473, 1506, 1470, + 1552, 1542, 1306, 1509, 1254, 1553, 1506, 1506, 1506, 1506, + 1488, 1509, 1509, 1509, 1509, 1554, 1559, 1544, 1453, 1469, + 1552, 1562, 1469, 1186, 1469, 1473, 1490, 1185, 1494, 1469, + 1184, 1494, 1492, 1494, 1182, 1554, 1559, 1469, 1469, 1469, + 1469, 1544, 1178, 1562, 1177, 1469, 1469, 1469, 1469, 1469, + 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, + 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, 1469, + + 1469, 1176, 1469, 1472, 1175, 1174, 1472, 1173, 1472, 1163, + 1162, 1494, 1496, 1472, 1161, 1496, 1159, 1496, 1158, 1157, + 1156, 1472, 1472, 1472, 1472, 1548, 1548, 1548, 1548, 1472, + 1472, 1472, 1472, 1472, 1472, 1472, 1472, 1472, 1472, 1472, + 1472, 1472, 1472, 1472, 1472, 1472, 1472, 1472, 1472, 1472, + 1472, 1472, 1472, 1472, 1472, 1558, 1472, 1475, 1498, 1566, + 1475, 1498, 1475, 1498, 1153, 1496, 1504, 1475, 1152, 1504, + 1151, 1504, 1150, 1132, 1125, 1475, 1475, 1475, 1475, 1558, + 1124, 1566, 1123, 1475, 1475, 1475, 1475, 1475, 1475, 1475, + 1475, 1475, 1475, 1475, 1475, 1475, 1475, 1475, 1475, 1475, + + 1475, 1475, 1475, 1475, 1475, 1475, 1475, 1475, 1475, 1476, + 1475, 1498, 1476, 1121, 1476, 1120, 1119, 1118, 1489, 1504, + 1115, 1489, 1476, 1489, 1476, 1563, 1476, 1476, 1476, 1476, + 1476, 1476, 1476, 1476, 1476, 1489, 1489, 1489, 1489, 1489, + 1489, 1489, 1489, 1489, 1512, 1567, 1114, 1570, 1545, 1563, + 1113, 1112, 1512, 1512, 1512, 1512, 1545, 1545, 1545, 1545, + 1094, 1087, 1476, 1487, 1086, 1085, 1487, 1567, 1487, 1570, + 1084, 1489, 1083, 1082, 1530, 1503, 1080, 1530, 1503, 1530, + 1503, 1532, 1534, 1079, 1532, 1534, 1532, 1534, 1061, 1487, + 1487, 1487, 1487, 1487, 1487, 1487, 1487, 1487, 1487, 1487, + + 1487, 1487, 1487, 1487, 1487, 1487, 1487, 1487, 1487, 1487, + 1487, 1487, 1487, 1487, 1487, 1060, 1487, 1491, 1536, 1058, + 1491, 1536, 1491, 1536, 1057, 1056, 1538, 1530, 1503, 1538, + 1546, 1538, 1054, 1053, 1532, 1534, 1052, 1050, 1546, 1546, + 1546, 1546, 1038, 1491, 1491, 1491, 1491, 1491, 1491, 1491, + 1491, 1491, 1491, 1491, 1491, 1491, 1491, 1491, 1491, 1491, + 1491, 1491, 1491, 1491, 1491, 1491, 1491, 1491, 1491, 1493, + 1491, 1536, 1493, 1037, 1493, 1036, 1035, 1034, 1497, 1538, + 1033, 1497, 1032, 1497, 1030, 1029, 1493, 1493, 1493, 1493, + 1493, 1493, 1493, 1493, 1493, 1497, 1497, 1497, 1497, 1497, + + 1497, 1497, 1497, 1497, 1503, 1547, 1568, 1568, 1568, 1568, + 1028, 1027, 1026, 1547, 1547, 1547, 1547, 1024, 996, 993, + 992, 991, 1493, 1495, 1507, 990, 1495, 1507, 1495, 1507, + 1508, 1497, 989, 1508, 1510, 1508, 988, 1510, 1511, 1510, + 986, 1511, 1513, 1511, 985, 1513, 981, 1513, 967, 1495, + 1495, 1495, 1495, 1495, 1495, 1495, 1495, 1495, 1495, 1495, + 1495, 1495, 1495, 1495, 1495, 1495, 1495, 1495, 1495, 1495, + 1495, 1495, 1495, 1495, 1495, 1514, 1495, 1507, 1514, 1540, + 1514, 966, 1540, 1508, 1540, 965, 1507, 1510, 964, 963, + 962, 1511, 1508, 960, 959, 1513, 1510, 941, 1556, 1507, + + 1511, 1556, 940, 1556, 1513, 1508, 938, 1571, 937, 1510, + 1571, 936, 1571, 1511, 934, 933, 932, 1513, 930, 918, + 917, 1519, 916, 915, 1519, 911, 1519, 910, 1514, 909, + 908, 907, 1540, 905, 1519, 904, 1519, 1514, 1519, 1519, + 1519, 1519, 1519, 1519, 1519, 1519, 1519, 897, 885, 861, + 1514, 1556, 827, 826, 824, 823, 813, 812, 810, 809, + 1571, 808, 806, 805, 804, 802, 793, 792, 790, 789, + 788, 786, 785, 784, 1519, 1520, 782, 768, 767, 766, + 765, 763, 762, 1520, 1520, 1520, 1520, 761, 760, 757, + 756, 1520, 1520, 1520, 1520, 1520, 1520, 1520, 1520, 1520, + + 1520, 1520, 1520, 1520, 1520, 1520, 1520, 1520, 1520, 1520, + 1520, 1520, 1520, 1520, 1520, 1520, 1520, 1521, 755, 754, + 1521, 740, 1521, 736, 726, 724, 722, 713, 712, 710, + 1521, 709, 1521, 701, 1521, 1521, 1521, 1521, 1521, 1521, + 1521, 1521, 1521, 695, 691, 655, 654, 648, 647, 646, + 645, 644, 642, 611, 607, 592, 591, 588, 587, 586, + 585, 583, 582, 581, 580, 579, 578, 577, 575, 574, + 1521, 1522, 557, 551, 547, 544, 543, 542, 536, 1522, + 1522, 1522, 1522, 534, 533, 525, 522, 1522, 1522, 1522, + 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, + + 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, 1522, + 1522, 1522, 1522, 1523, 512, 511, 1523, 510, 1523, 507, + 506, 505, 495, 494, 459, 458, 1523, 454, 1523, 452, + 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 1523, 450, + 449, 445, 427, 417, 416, 415, 413, 412, 400, 398, + 397, 396, 395, 394, 393, 391, 390, 389, 388, 386, + 385, 384, 382, 381, 380, 378, 1523, 1524, 377, 376, + 375, 367, 364, 359, 358, 1524, 1524, 1524, 1524, 356, + 349, 348, 347, 1524, 1524, 1524, 1524, 1524, 1524, 1524, + 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, + + 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1524, 1529, + 346, 345, 1529, 344, 1529, 330, 329, 327, 326, 323, + 322, 320, 319, 317, 314, 312, 1529, 1529, 1529, 1529, + 1529, 1529, 1529, 1529, 1529, 298, 1533, 297, 289, 1533, + 288, 1533, 287, 286, 285, 283, 278, 274, 271, 268, + 267, 264, 259, 1533, 1533, 1533, 1533, 1533, 1533, 1533, + 1533, 1533, 1529, 1531, 1531, 1531, 1531, 1531, 1531, 1531, + 1531, 1531, 1531, 1531, 1531, 1531, 1531, 1531, 1531, 1531, + 1531, 1531, 1531, 1531, 1531, 1531, 1531, 1531, 1531, 1533, + 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, + + 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, 1535, + 1535, 1535, 1535, 1535, 1535, 1535, 1537, 257, 255, 1537, + 245, 1537, 237, 235, 232, 228, 226, 221, 218, 216, + 215, 214, 213, 1537, 1537, 1537, 1537, 1537, 1537, 1537, + 1537, 1537, 211, 209, 203, 199, 198, 196, 193, 182, + 181, 180, 176, 175, 174, 161, 153, 146, 145, 143, + 140, 125, 124, 120, 119, 118, 112, 105, 102, 1537, + 1539, 1539, 1539, 1539, 1539, 1539, 1539, 1539, 1539, 1539, + 1539, 1539, 1539, 1539, 1539, 1539, 1539, 1539, 1539, 1539, + 1539, 1539, 1539, 1539, 1539, 1539, 1573, 1573, 1573, 1573, + + 1573, 1573, 1573, 1573, 1573, 1573, 1573, 1574, 1574, 1574, + 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1574, 1575, 1575, + 1575, 1575, 1575, 1575, 1575, 1575, 1575, 1575, 1575, 1576, + 1576, 1576, 1576, 1576, 1576, 1576, 1576, 1576, 1576, 1576, + 1577, 1577, 1577, 1577, 1577, 1577, 1577, 1577, 1577, 1577, + 1577, 1578, 1578, 1578, 1578, 1578, 1578, 1578, 1578, 1578, + 1578, 1578, 1579, 1579, 1579, 1579, 1579, 1579, 1579, 1579, + 1579, 1579, 1579, 1580, 1580, 1580, 1580, 1580, 1580, 1580, + 1580, 1580, 1580, 1580, 1581, 1581, 1581, 1581, 1581, 1581, 1581, 1581, 1581, 1581, 1581, 1582, 1582, 1582, 1582, 1582, + 1582, 1582, 1582, 1582, 1582, 1582, 1583, 1583, 1583, 1583, - 1584, 1584, 0, 1584, 1584, 1584, 1584, 1584, 1584, 1584, - 1584, 1585, 1585, 0, 1585, 1585, 1585, 1585, 1585, 1585, - - 1585, 1585, 1586, 1586, 0, 1586, 1586, 1586, 1586, 1586, - 1586, 1586, 1586, 1587, 1587, 0, 1587, 1587, 1587, 1587, - 1587, 1587, 1587, 1587, 1588, 0, 1588, 1588, 1589, 1589, - 1590, 0, 0, 1590, 1590, 1591, 0, 0, 0, 1591, - 1591, 1591, 1591, 1591, 1591, 1591, 1592, 1592, 0, 0, - 1592, 1592, 1592, 1592, 1592, 1592, 1592, 1593, 1593, 0, - 1593, 1593, 1593, 1593, 1593, 1593, 1593, 1593, 1594, 0, - 0, 0, 1594, 1594, 1594, 1594, 1594, 1594, 1594, 1595, - 0, 0, 0, 1595, 1595, 1595, 1595, 1595, 1595, 1595, - 1596, 0, 0, 0, 1596, 1596, 1596, 1596, 1596, 1596, - - 1596, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, 1597, - 1597, 1597, 1598, 1598, 0, 1598, 1598, 1598, 1598, 1598, - 1598, 1598, 1598, 1599, 1599, 0, 1599, 1599, 1599, 1599, - 1599, 1599, 1599, 1599, 1600, 1600, 0, 1600, 1600, 1600, - 1600, 1600, 1600, 1600, 1600, 1601, 1601, 0, 1601, 1601, - 1601, 1601, 1601, 1601, 1601, 1601, 1602, 1602, 0, 1602, - 1602, 1602, 1602, 1602, 1602, 1602, 1602, 1603, 1603, 1603, - 1603, 1603, 1603, 1603, 1603, 1603, 1603, 1603, 1605, 1605, - 0, 1605, 1605, 1605, 1605, 1605, 1605, 1605, 1605, 1606, - 1606, 0, 1606, 1606, 1606, 1606, 1606, 1606, 1606, 1606, - - 1607, 1607, 0, 1607, 1607, 1607, 1607, 1607, 1607, 1607, - 1607, 1608, 1608, 0, 1608, 1608, 1608, 1608, 1608, 1608, - 1608, 1608, 1609, 1609, 0, 1609, 1609, 1609, 1609, 1609, - 1609, 1609, 1609, 1610, 1610, 0, 1610, 1610, 1610, 1610, - 1610, 1610, 1610, 1610, 1611, 1611, 1611, 1611, 1611, 0, - 1611, 1611, 1611, 1611, 1611, 1612, 1612, 0, 1612, 1612, - 1612, 1612, 1612, 1612, 1612, 1612, 1614, 1614, 1615, 1615, - 1615, 1615, 0, 1615, 1615, 1615, 1615, 1615, 1615, 1616, - 1616, 1616, 1616, 1616, 0, 1616, 1616, 1616, 1616, 1616, - 1617, 1617, 0, 1617, 1617, 1617, 1617, 1617, 1617, 1617, - - 1617, 1618, 1618, 1618, 1618, 1618, 1618, 1618, 1618, 1618, - 1618, 1618, 1619, 1619, 0, 1619, 1619, 1619, 1619, 1619, - 1619, 1619, 1619, 1620, 1620, 0, 1620, 1620, 1620, 1620, - 1620, 1620, 1620, 1620, 1621, 1621, 0, 1621, 1621, 1621, - 1621, 1621, 1621, 1621, 1621, 1622, 1622, 0, 1622, 1622, - 1622, 1622, 1622, 1622, 1622, 1622, 1623, 1623, 0, 1623, - 1623, 1623, 1623, 1623, 1623, 1623, 1623, 1624, 1624, 0, - 1624, 1624, 1624, 1624, 1624, 1624, 1624, 1624, 1625, 1625, - 0, 1625, 1625, 1625, 1625, 1625, 1625, 1625, 1625, 1626, - 1626, 0, 1626, 1626, 1626, 1626, 1626, 1626, 1626, 1626, - - 1627, 1627, 0, 1627, 1627, 1627, 1627, 1627, 1627, 1627, - 1627, 1628, 1628, 0, 1628, 1628, 1628, 1628, 1628, 1628, - 1628, 1628, 1629, 1629, 0, 1629, 1629, 1629, 1629, 1629, - 1629, 1629, 1629, 1630, 1630, 0, 1630, 1630, 1630, 1630, - 1630, 1630, 1630, 1630, 1631, 1631, 0, 1631, 1631, 1631, - 1631, 1631, 1631, 1631, 1631, 1632, 1632, 0, 1632, 1632, - 1632, 1632, 1632, 1632, 1632, 1632, 1633, 1633, 0, 1633, - 1633, 1633, 1633, 1633, 1633, 1633, 1633, 1634, 1634, 1634, - 1634, 1634, 1634, 1634, 1634, 1634, 1634, 1634, 1636, 1636, - 1637, 1637, 1637, 1637, 1637, 1637, 1637, 1637, 1637, 1637, - - 1637, 1638, 1638, 1638, 1638, 1638, 1638, 1638, 1638, 1638, - 1638, 1638, 1639, 1639, 0, 1639, 1639, 1639, 1639, 1639, - 1639, 1639, 1639, 1640, 1640, 0, 1640, 1640, 1640, 1640, - 1640, 1640, 1640, 1640, 1641, 1641, 0, 1641, 1641, 1641, - 1641, 1641, 1641, 1641, 1641, 1642, 1642, 0, 1642, 1642, - 1642, 1642, 1642, 1642, 1642, 1642, 1643, 1643, 0, 1643, - 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1644, 1644, 0, - 1644, 1644, 1644, 1644, 1644, 1644, 1644, 1644, 1645, 1645, - 0, 1645, 1645, 1645, 1645, 1645, 1645, 1645, 1645, 1646, - 1646, 0, 1646, 1646, 1646, 1646, 1646, 1646, 1646, 1646, - - 1647, 1647, 0, 1647, 1647, 1647, 1647, 1647, 1647, 1647, - 1647, 1648, 1648, 0, 1648, 1648, 1648, 1648, 1648, 1648, - 1648, 1648, 1649, 1649, 0, 1649, 1649, 1649, 1649, 1649, - 1649, 1649, 1649, 1650, 1650, 0, 1650, 1650, 1650, 1650, - 1650, 1650, 1650, 1650, 1651, 1651, 0, 1651, 1651, 1651, - 1651, 1651, 1651, 1651, 1651, 1652, 1652, 0, 1652, 1652, - 1652, 1652, 1652, 1652, 1652, 1652, 1653, 1653, 0, 1653, - 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1654, 1654, 0, - 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1654, 1655, 1655, - 0, 1655, 1655, 1655, 1655, 1655, 1655, 1655, 1655, 1656, - - 1656, 0, 1656, 1656, 1656, 1656, 1656, 1656, 1656, 1656, - 1657, 1657, 0, 1657, 1657, 1657, 1657, 1657, 1657, 1657, - 1657, 1658, 1658, 0, 1658, 1658, 1658, 1658, 1658, 1658, - 1658, 1658, 1659, 1659, 0, 1659, 1659, 1659, 1659, 1659, - 1659, 1659, 1659, 1660, 1660, 1660, 1660, 1660, 1660, 1660, - 1660, 1660, 1660, 1660, 1661, 1661, 1661, 1661, 1661, 1661, - 1661, 1661, 1661, 1661, 1661, 1662, 1662, 1662, 1662, 1662, - 1662, 1662, 1662, 1662, 1662, 1662, 1663, 1663, 0, 1663, - 1663, 1663, 1663, 1663, 1663, 1663, 1663, 1664, 1664, 0, - 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1664, 1665, 1665, - - 0, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1665, 1666, - 1666, 0, 1666, 1666, 1666, 1666, 1666, 1666, 1666, 1666, - 1667, 1667, 0, 1667, 1667, 1667, 1667, 1667, 1667, 1667, - 1667, 1668, 1668, 0, 1668, 1668, 1668, 1668, 1668, 1668, - 1668, 1668, 1669, 1669, 0, 1669, 1669, 1669, 1669, 1669, - 1669, 1669, 1669, 1670, 1670, 0, 1670, 1670, 1670, 1670, - 1670, 1670, 1670, 1670, 1671, 1671, 0, 1671, 1671, 1671, - 1671, 1671, 1671, 1671, 1671, 1672, 0, 1672, 1672, 1672, - 1672, 1672, 1672, 1672, 1672, 1672, 1673, 1673, 0, 1673, - 1673, 1673, 1673, 1673, 1673, 1673, 1673, 1674, 1674, 1674, - - 1674, 1674, 1674, 1674, 1674, 1674, 1674, 1674, 1675, 1675, - 0, 1675, 1675, 1675, 1675, 1675, 1675, 1675, 1675, 1676, - 1676, 0, 1676, 1676, 1676, 1676, 1676, 1676, 1676, 1676, - 1677, 1677, 0, 1677, 1677, 1677, 1677, 1677, 1677, 1677, - 1677, 1678, 1678, 0, 1678, 1678, 1678, 1678, 1678, 1678, - 1678, 1678, 1679, 1679, 0, 1679, 1679, 1679, 1679, 1679, - 1679, 1679, 1679, 1680, 1680, 0, 1680, 1680, 1680, 1680, - 1680, 1680, 1680, 1680, 1681, 1681, 0, 1681, 1681, 1681, - 1681, 1681, 1681, 1681, 1681, 1682, 1682, 0, 1682, 1682, - 1682, 1682, 1682, 1682, 1682, 1682, 1683, 1683, 0, 1683, - - 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1684, 1684, 0, - 1684, 1684, 1684, 1684, 1684, 1684, 1684, 1684, 1685, 1685, - 0, 1685, 1685, 1685, 1685, 1685, 1685, 1685, 1685, 1686, - 1686, 0, 1686, 1686, 1686, 1686, 1686, 1686, 1686, 1686, - 1687, 1687, 0, 1687, 1687, 1687, 1687, 1687, 1687, 1687, - 1687, 1688, 1688, 0, 1688, 1688, 1688, 1688, 1688, 1688, - 1688, 1688, 1689, 1689, 0, 1689, 1689, 1689, 1689, 1689, - 1689, 1689, 1689, 1690, 1690, 0, 1690, 1690, 1690, 1690, - 1690, 1690, 1690, 1690, 1691, 1691, 0, 1691, 1691, 1691, - 1691, 1691, 1691, 1691, 1691, 1692, 1692, 0, 1692, 1692, - - 1692, 1692, 1692, 1692, 1692, 1692, 1693, 1693, 0, 1693, - 1693, 1693, 1693, 1693, 1693, 1693, 1693, 1694, 1694, 0, - 1694, 1694, 1694, 1694, 1694, 1694, 1694, 1694, 1695, 1695, - 0, 1695, 1695, 1695, 1695, 1695, 1695, 1695, 1695, 1696, - 1696, 0, 1696, 1696, 1696, 1696, 1696, 1696, 1696, 1696, - 1697, 1697, 0, 1697, 1697, 1697, 1697, 1697, 1697, 1697, - 1697, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, 1698, - 1698, 1698, 1699, 1699, 1699, 1699, 1699, 1699, 1699, 1699, - 1699, 1699, 1699, 1700, 1700, 1700, 1700, 1700, 1700, 1700, - 1700, 1700, 1700, 1700, 1701, 1701, 0, 1701, 1701, 1701, - - 1701, 1701, 1701, 1701, 1701, 1702, 1702, 0, 1702, 1702, - 1702, 1702, 1702, 1702, 1702, 1702, 1703, 1703, 0, 1703, - 1703, 1703, 1703, 1703, 1703, 1703, 1703, 1704, 1704, 0, - 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1704, 1705, 1705, - 0, 1705, 1705, 1705, 1705, 1705, 1705, 1705, 1705, 1706, - 1706, 0, 1706, 1706, 1706, 1706, 1706, 1706, 1706, 1706, - 1707, 1707, 0, 1707, 1707, 1707, 1707, 1707, 1707, 1707, - 1707, 1708, 0, 1708, 1708, 1708, 1708, 1708, 1708, 1708, - 1708, 1708, 1709, 1709, 0, 1709, 1709, 1709, 1709, 1709, - 1709, 1709, 1709, 1710, 1710, 0, 1710, 1710, 1710, 1710, - - 1710, 1710, 1710, 1710, 1711, 1711, 0, 1711, 1711, 1711, - 1711, 1711, 1711, 1711, 1711, 1712, 0, 1712, 1712, 1713, - 1713, 0, 1713, 1713, 1713, 1713, 1713, 1713, 1713, 1713, - 1714, 1714, 0, 1714, 1714, 1714, 1714, 1714, 1714, 1714, + 1583, 1583, 1583, 1583, 1583, 1583, 1583, 1584, 1584, 1584, + 1584, 1585, 1585, 100, 1585, 1585, 1585, 1585, 1585, 1585, + 1585, 1585, 1586, 96, 95, 93, 1586, 1586, 1586, 1586, + 1586, 1586, 1586, 1587, 1587, 92, 89, 1587, 1587, 1587, + 1587, 1587, 1587, 1587, 1588, 1588, 88, 1588, 1588, 1588, + 1588, 1588, 1588, 1588, 1588, 1589, 85, 81, 78, 1589, + 1589, 1589, 1589, 1589, 1589, 1589, 1590, 75, 72, 71, + 1590, 1590, 1590, 1590, 1590, 1590, 1590, 1591, 70, 69, + 65, 1591, 1591, 1591, 1591, 1591, 1591, 1591, 1592, 1592, + + 62, 1592, 1592, 1592, 1592, 1592, 1592, 1592, 1592, 1593, + 1593, 58, 1593, 1593, 1593, 1593, 1593, 1593, 1593, 1593, + 1594, 1594, 57, 1594, 1594, 1594, 1594, 1594, 1594, 1594, + 1594, 1595, 1595, 54, 1595, 1595, 1595, 1595, 1595, 1595, + 1595, 1595, 1596, 1596, 1596, 1596, 1596, 1596, 1596, 1596, + 1596, 1596, 1596, 1597, 1597, 1597, 1597, 1598, 1598, 49, + 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1598, 1599, 1599, + 47, 1599, 1599, 1599, 1599, 1599, 1599, 1599, 1599, 1600, + 1600, 46, 1600, 1600, 1600, 1600, 1600, 1600, 1600, 1600, + 1601, 1601, 41, 1601, 1601, 1601, 1601, 1601, 1601, 1601, + + 1601, 1602, 37, 1602, 1602, 1603, 1603, 1604, 36, 35, + 1604, 1604, 1605, 18, 17, 0, 1605, 1605, 1605, 1605, + 1605, 1605, 1605, 1606, 1606, 0, 0, 1606, 1606, 1606, + 1606, 1606, 1606, 1606, 1607, 1607, 0, 1607, 1607, 1607, + 1607, 1607, 1607, 1607, 1607, 1608, 0, 0, 0, 1608, + 1608, 1608, 1608, 1608, 1608, 1608, 1609, 0, 0, 0, + 1609, 1609, 1609, 1609, 1609, 1609, 1609, 1610, 0, 0, + 0, 1610, 1610, 1610, 1610, 1610, 1610, 1610, 1611, 1611, + 1611, 1611, 1611, 1611, 1611, 1611, 1611, 1611, 1611, 1612, + 1612, 0, 1612, 1612, 1612, 1612, 1612, 1612, 1612, 1612, + + 1613, 1613, 0, 1613, 1613, 1613, 1613, 1613, 1613, 1613, + 1613, 1614, 1614, 0, 1614, 1614, 1614, 1614, 1614, 1614, + 1614, 1614, 1615, 1615, 0, 1615, 1615, 1615, 1615, 1615, + 1615, 1615, 1615, 1616, 1616, 0, 1616, 1616, 1616, 1616, + 1616, 1616, 1616, 1616, 1617, 1617, 1617, 1617, 1617, 1617, + 1617, 1617, 1617, 1617, 1617, 1619, 1619, 0, 1619, 1619, + 1619, 1619, 1619, 1619, 1619, 1619, 1620, 1620, 0, 1620, + 1620, 1620, 1620, 1620, 1620, 1620, 1620, 1621, 1621, 0, + 1621, 1621, 1621, 1621, 1621, 1621, 1621, 1621, 1622, 1622, + 0, 1622, 1622, 1622, 1622, 1622, 1622, 1622, 1622, 1623, + + 1623, 0, 1623, 1623, 1623, 1623, 1623, 1623, 1623, 1623, + 1624, 1624, 0, 1624, 1624, 1624, 1624, 1624, 1624, 1624, + 1624, 1625, 1625, 1625, 1625, 1625, 0, 1625, 1625, 1625, + 1625, 1625, 1626, 1626, 0, 1626, 1626, 1626, 1626, 1626, + 1626, 1626, 1626, 1628, 1628, 1629, 1629, 1629, 1629, 0, + 1629, 1629, 1629, 1629, 1629, 1629, 1630, 1630, 1630, 1630, + 1630, 0, 1630, 1630, 1630, 1630, 1630, 1631, 1631, 0, + 1631, 1631, 1631, 1631, 1631, 1631, 1631, 1631, 1632, 1632, + 1632, 1632, 1632, 1632, 1632, 1632, 1632, 1632, 1632, 1633, + 1633, 0, 1633, 1633, 1633, 1633, 1633, 1633, 1633, 1633, + + 1634, 1634, 0, 1634, 1634, 1634, 1634, 1634, 1634, 1634, + 1634, 1635, 1635, 0, 1635, 1635, 1635, 1635, 1635, 1635, + 1635, 1635, 1636, 1636, 0, 1636, 1636, 1636, 1636, 1636, + 1636, 1636, 1636, 1637, 1637, 0, 1637, 1637, 1637, 1637, + 1637, 1637, 1637, 1637, 1638, 1638, 0, 1638, 1638, 1638, + 1638, 1638, 1638, 1638, 1638, 1639, 1639, 0, 1639, 1639, + 1639, 1639, 1639, 1639, 1639, 1639, 1640, 1640, 0, 1640, + 1640, 1640, 1640, 1640, 1640, 1640, 1640, 1641, 1641, 0, + 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1641, 1642, 1642, + 0, 1642, 1642, 1642, 1642, 1642, 1642, 1642, 1642, 1643, + + 1643, 0, 1643, 1643, 1643, 1643, 1643, 1643, 1643, 1643, + 1644, 1644, 0, 1644, 1644, 1644, 1644, 1644, 1644, 1644, + 1644, 1645, 1645, 0, 1645, 1645, 1645, 1645, 1645, 1645, + 1645, 1645, 1646, 1646, 0, 1646, 1646, 1646, 1646, 1646, + 1646, 1646, 1646, 1647, 1647, 0, 1647, 1647, 1647, 1647, + 1647, 1647, 1647, 1647, 1648, 1648, 1648, 1648, 1648, 1648, + 1648, 1648, 1648, 1648, 1648, 1650, 1650, 1651, 1651, 1651, + 1651, 1651, 1651, 1651, 1651, 1651, 1651, 1651, 1652, 1652, + 1652, 1652, 1652, 1652, 1652, 1652, 1652, 1652, 1652, 1653, + 1653, 0, 1653, 1653, 1653, 1653, 1653, 1653, 1653, 1653, + + 1654, 1654, 0, 1654, 1654, 1654, 1654, 1654, 1654, 1654, + 1654, 1655, 1655, 0, 1655, 1655, 1655, 1655, 1655, 1655, + 1655, 1655, 1656, 1656, 0, 1656, 1656, 1656, 1656, 1656, + 1656, 1656, 1656, 1657, 1657, 0, 1657, 1657, 1657, 1657, + 1657, 1657, 1657, 1657, 1658, 1658, 0, 1658, 1658, 1658, + 1658, 1658, 1658, 1658, 1658, 1659, 1659, 0, 1659, 1659, + 1659, 1659, 1659, 1659, 1659, 1659, 1660, 1660, 0, 1660, + 1660, 1660, 1660, 1660, 1660, 1660, 1660, 1661, 1661, 0, + 1661, 1661, 1661, 1661, 1661, 1661, 1661, 1661, 1662, 1662, + 0, 1662, 1662, 1662, 1662, 1662, 1662, 1662, 1662, 1663, + + 1663, 0, 1663, 1663, 1663, 1663, 1663, 1663, 1663, 1663, + 1664, 1664, 0, 1664, 1664, 1664, 1664, 1664, 1664, 1664, + 1664, 1665, 1665, 0, 1665, 1665, 1665, 1665, 1665, 1665, + 1665, 1665, 1666, 1666, 0, 1666, 1666, 1666, 1666, 1666, + 1666, 1666, 1666, 1667, 1667, 0, 1667, 1667, 1667, 1667, + 1667, 1667, 1667, 1667, 1668, 1668, 0, 1668, 1668, 1668, + 1668, 1668, 1668, 1668, 1668, 1669, 1669, 0, 1669, 1669, + 1669, 1669, 1669, 1669, 1669, 1669, 1670, 1670, 0, 1670, + 1670, 1670, 1670, 1670, 1670, 1670, 1670, 1671, 1671, 0, + 1671, 1671, 1671, 1671, 1671, 1671, 1671, 1671, 1672, 1672, + + 0, 1672, 1672, 1672, 1672, 1672, 1672, 1672, 1672, 1673, + 1673, 0, 1673, 1673, 1673, 1673, 1673, 1673, 1673, 1673, + 1674, 1674, 1674, 1674, 1674, 1674, 1674, 1674, 1674, 1674, + 1674, 1675, 1675, 1675, 1675, 1675, 1675, 1675, 1675, 1675, + 1675, 1675, 1676, 1676, 1676, 1676, 1676, 1676, 1676, 1676, + 1676, 1676, 1676, 1677, 1677, 0, 1677, 1677, 1677, 1677, + 1677, 1677, 1677, 1677, 1678, 1678, 0, 1678, 1678, 1678, + 1678, 1678, 1678, 1678, 1678, 1679, 1679, 0, 1679, 1679, + 1679, 1679, 1679, 1679, 1679, 1679, 1680, 1680, 0, 1680, + 1680, 1680, 1680, 1680, 1680, 1680, 1680, 1681, 1681, 0, + + 1681, 1681, 1681, 1681, 1681, 1681, 1681, 1681, 1682, 1682, + 0, 1682, 1682, 1682, 1682, 1682, 1682, 1682, 1682, 1683, + 1683, 0, 1683, 1683, 1683, 1683, 1683, 1683, 1683, 1683, + 1684, 1684, 0, 1684, 1684, 1684, 1684, 1684, 1684, 1684, + 1684, 1685, 1685, 0, 1685, 1685, 1685, 1685, 1685, 1685, + 1685, 1685, 1686, 0, 1686, 1686, 1686, 1686, 1686, 1686, + 1686, 1686, 1686, 1687, 1687, 0, 1687, 1687, 1687, 1687, + 1687, 1687, 1687, 1687, 1688, 1688, 1688, 1688, 1688, 1688, + 1688, 1688, 1688, 1688, 1688, 1689, 1689, 0, 1689, 1689, + 1689, 1689, 1689, 1689, 1689, 1689, 1690, 1690, 0, 1690, + + 1690, 1690, 1690, 1690, 1690, 1690, 1690, 1691, 1691, 0, + 1691, 1691, 1691, 1691, 1691, 1691, 1691, 1691, 1692, 1692, + 0, 1692, 1692, 1692, 1692, 1692, 1692, 1692, 1692, 1693, + 1693, 0, 1693, 1693, 1693, 1693, 1693, 1693, 1693, 1693, + 1694, 1694, 0, 1694, 1694, 1694, 1694, 1694, 1694, 1694, + 1694, 1695, 1695, 0, 1695, 1695, 1695, 1695, 1695, 1695, + 1695, 1695, 1696, 1696, 0, 1696, 1696, 1696, 1696, 1696, + 1696, 1696, 1696, 1697, 1697, 0, 1697, 1697, 1697, 1697, + 1697, 1697, 1697, 1697, 1698, 1698, 0, 1698, 1698, 1698, + 1698, 1698, 1698, 1698, 1698, 1699, 1699, 0, 1699, 1699, + + 1699, 1699, 1699, 1699, 1699, 1699, 1700, 1700, 0, 1700, + 1700, 1700, 1700, 1700, 1700, 1700, 1700, 1701, 1701, 0, + 1701, 1701, 1701, 1701, 1701, 1701, 1701, 1701, 1702, 1702, + 0, 1702, 1702, 1702, 1702, 1702, 1702, 1702, 1702, 1703, + 1703, 0, 1703, 1703, 1703, 1703, 1703, 1703, 1703, 1703, + 1704, 1704, 0, 1704, 1704, 1704, 1704, 1704, 1704, 1704, + 1704, 1705, 1705, 0, 1705, 1705, 1705, 1705, 1705, 1705, + 1705, 1705, 1706, 1706, 0, 1706, 1706, 1706, 1706, 1706, + 1706, 1706, 1706, 1707, 1707, 0, 1707, 1707, 1707, 1707, + 1707, 1707, 1707, 1707, 1708, 1708, 0, 1708, 1708, 1708, + + 1708, 1708, 1708, 1708, 1708, 1709, 1709, 0, 1709, 1709, + 1709, 1709, 1709, 1709, 1709, 1709, 1710, 1710, 0, 1710, + 1710, 1710, 1710, 1710, 1710, 1710, 1710, 1711, 1711, 0, + 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1711, 1712, 1712, + 1712, 1712, 1712, 1712, 1712, 1712, 1712, 1712, 1712, 1713, + 1713, 1713, 1713, 1713, 1713, 1713, 1713, 1713, 1713, 1713, + 1714, 1714, 1714, 1714, 1714, 1714, 1714, 1714, 1714, 1714, 1714, 1715, 1715, 0, 1715, 1715, 1715, 1715, 1715, 1715, 1715, 1715, 1716, 1716, 0, 1716, 1716, 1716, 1716, 1716, 1716, 1716, 1716, 1717, 1717, 0, 1717, 1717, 1717, 1717, + 1717, 1717, 1717, 1717, 1718, 1718, 0, 1718, 1718, 1718, 1718, 1718, 1718, 1718, 1718, 1719, 1719, 0, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1719, 1720, 1720, 0, 1720, - - 1720, 1720, 1720, 1720, 1720, 1720, 1720, 1721, 1721, 1721, - 1721, 1721, 1721, 1721, 1721, 1721, 1721, 1721, 1722, 1722, - 0, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1723, + 1720, 1720, 1720, 1720, 1720, 1720, 1720, 1721, 1721, 0, + 1721, 1721, 1721, 1721, 1721, 1721, 1721, 1721, 1722, 0, + 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1722, 1723, 1723, 0, 1723, 1723, 1723, 1723, 1723, 1723, 1723, 1723, 1724, 1724, 0, 1724, 1724, 1724, 1724, 1724, 1724, 1724, - 1724, 1726, 1726, 0, 1726, 1726, 1726, 1726, 1726, 1726, - 1726, 1726, 1727, 1727, 0, 1727, 1727, 1727, 1727, 1727, - 1727, 1727, 1727, 1728, 1728, 1728, 1728, 1728, 1728, 1728, - 1728, 1728, 1728, 1728, 1729, 1729, 1729, 1729, 1729, 1729, - 1729, 1729, 1729, 1729, 1729, 1730, 1730, 1730, 1730, 1730, - - 1730, 1730, 1730, 1730, 1730, 1730, 1731, 1731, 0, 1731, - 1731, 1731, 1731, 1731, 1731, 1731, 1731, 1732, 0, 1732, - 0, 1732, 1732, 1733, 1733, 0, 1733, 1733, 1733, 1733, - 1733, 1733, 1733, 1733, 1734, 0, 1734, 1734, 1735, 0, - 1735, 1735, 1738, 1738, 0, 1738, 1738, 1738, 1738, 1738, - 1738, 1738, 1738, 1739, 1739, 0, 1739, 1739, 1739, 1739, - 1739, 1739, 1739, 1739, 1740, 1740, 0, 1740, 1740, 1740, - 1740, 1740, 1740, 1740, 1740, 1741, 0, 1741, 1741, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - - 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, 1558, - 1558, 1558, 1558, 1558 + 1724, 1725, 1725, 0, 1725, 1725, 1725, 1725, 1725, 1725, + 1725, 1725, 1726, 0, 1726, 1726, 1727, 1727, 0, 1727, + + 1727, 1727, 1727, 1727, 1727, 1727, 1727, 1728, 1728, 0, + 1728, 1728, 1728, 1728, 1728, 1728, 1728, 1728, 1729, 1729, + 0, 1729, 1729, 1729, 1729, 1729, 1729, 1729, 1729, 1730, + 1730, 0, 1730, 1730, 1730, 1730, 1730, 1730, 1730, 1730, + 1731, 1731, 0, 1731, 1731, 1731, 1731, 1731, 1731, 1731, + 1731, 1732, 1732, 0, 1732, 1732, 1732, 1732, 1732, 1732, + 1732, 1732, 1733, 1733, 0, 1733, 1733, 1733, 1733, 1733, + 1733, 1733, 1733, 1734, 1734, 0, 1734, 1734, 1734, 1734, + 1734, 1734, 1734, 1734, 1735, 1735, 1735, 1735, 1735, 1735, + 1735, 1735, 1735, 1735, 1735, 1736, 1736, 0, 1736, 1736, + + 1736, 1736, 1736, 1736, 1736, 1736, 1737, 1737, 0, 1737, + 1737, 1737, 1737, 1737, 1737, 1737, 1737, 1738, 1738, 0, + 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1738, 1740, 1740, + 0, 1740, 1740, 1740, 1740, 1740, 1740, 1740, 1740, 1741, + 1741, 0, 1741, 1741, 1741, 1741, 1741, 1741, 1741, 1741, + 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, 1742, + 1742, 1743, 1743, 1743, 1743, 1743, 1743, 1743, 1743, 1743, + 1743, 1743, 1744, 1744, 1744, 1744, 1744, 1744, 1744, 1744, + 1744, 1744, 1744, 1745, 1745, 0, 1745, 1745, 1745, 1745, + 1745, 1745, 1745, 1745, 1746, 0, 1746, 0, 1746, 1746, + + 1747, 0, 1747, 0, 1747, 1747, 1748, 1748, 0, 1748, + 1748, 1748, 1748, 1748, 1748, 1748, 1748, 1750, 0, 1750, + 1750, 1752, 1752, 0, 1752, 1752, 1752, 1752, 1752, 1752, + 1752, 1752, 1753, 1753, 0, 1753, 1753, 1753, 1753, 1753, + 1753, 1753, 1753, 1754, 1754, 0, 1754, 1754, 1754, 1754, + 1754, 1754, 1754, 1754, 1755, 0, 1755, 1755, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, + 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572, 1572 + } ; static yy_state_type yy_last_accepting_state; @@ -2706,6 +2751,7 @@ char *yytext; #include <sys/stat.h> #include <errno.h> +#include <stdbool.h> #include <string.h> #include <stdlib.h> #include <unistd.h> @@ -2901,8 +2947,8 @@ static char *p_name; static const char *fname; static char filters[MAX_FILTERS]; -static int fill_mode; -static int waiting_for_quote; +static bool fill_mode; +static bool waiting_for_quote; static decompress *decomp; @@ -2917,9 +2963,9 @@ static decompress *decomp; result = YY_NULL; \ } #define YY_NO_INPUT -#line 2921 "lexgrog.c" +#line 2967 "lexgrog.c" -#line 308 "lexgrog.l" +#line 309 "lexgrog.l" /* Please add to this list if you know how. */ /* Note that, since flex only supports UTF-8 by accident, character classes * including non-ASCII characters must be written out as (a|b|c|d) rather @@ -2928,7 +2974,7 @@ static decompress *decomp; /* ИМЕ also works for mk */ /* NOME also works for gl, pt */ /* eptgrv : eqn, pic, tbl, grap, refer, vgrind */ -#line 2932 "lexgrog.c" +#line 2978 "lexgrog.c" #define INITIAL 0 #define MAN_PRENAME 1 @@ -3160,11 +3206,11 @@ YY_DECL } { -#line 359 "lexgrog.l" +#line 360 "lexgrog.l" /* begin NAME section processing */ -#line 3168 "lexgrog.c" +#line 3214 "lexgrog.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -3191,13 +3237,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1559 ) + if ( yy_current_state >= 1573 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; ++yy_cp; } - while ( yy_current_state != 1558 ); + while ( yy_current_state != 1572 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -3220,42 +3266,42 @@ do_action: /* This label is used only to access EOF actions. */ case 1: /* rule 1 can match eol */ YY_RULE_SETUP -#line 362 "lexgrog.l" +#line 363 "lexgrog.l" BEGIN (MAN_PRENAME); YY_BREAK case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 363 "lexgrog.l" +#line 364 "lexgrog.l" BEGIN (CAT_NAME); YY_BREAK /* general text matching */ case 3: -#line 368 "lexgrog.l" -case 4: #line 369 "lexgrog.l" -case 5: +case 4: #line 370 "lexgrog.l" +case 5: +#line 371 "lexgrog.l" case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 370 "lexgrog.l" +#line 371 "lexgrog.l" YY_BREAK case 7: -#line 375 "lexgrog.l" -case 8: #line 376 "lexgrog.l" +case 8: +#line 377 "lexgrog.l" case 9: /* rule 9 can match eol */ -#line 377 "lexgrog.l" +#line 378 "lexgrog.l" case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 377 "lexgrog.l" +#line 378 "lexgrog.l" YY_BREAK @@ -3263,45 +3309,45 @@ YY_RULE_SETUP case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 381 "lexgrog.l" +#line 382 "lexgrog.l" filters[TBL_FILTER] = 't'; YY_BREAK case 12: /* rule 12 can match eol */ YY_RULE_SETUP -#line 382 "lexgrog.l" +#line 383 "lexgrog.l" filters[EQN_FILTER] = 'e'; YY_BREAK case 13: /* rule 13 can match eol */ YY_RULE_SETUP -#line 383 "lexgrog.l" +#line 384 "lexgrog.l" filters[PIC_FILTER] = 'p'; YY_BREAK case 14: /* rule 14 can match eol */ YY_RULE_SETUP -#line 384 "lexgrog.l" +#line 385 "lexgrog.l" filters[GRAP_FILTER] = 'g'; YY_BREAK case 15: /* rule 15 can match eol */ -#line 386 "lexgrog.l" +#line 387 "lexgrog.l" case 16: /* rule 16 can match eol */ YY_RULE_SETUP -#line 386 "lexgrog.l" +#line 387 "lexgrog.l" filters[REF_FILTER] = 'r'; YY_BREAK case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 387 "lexgrog.l" +#line 388 "lexgrog.l" filters[VGRIND_FILTER] = 'v'; YY_BREAK case YY_STATE_EOF(MAN_REST): -#line 389 "lexgrog.l" +#line 390 "lexgrog.l" { /* exit */ *p_name = '\0'; /* terminate the string */ yyterminate (); @@ -3310,14 +3356,14 @@ case YY_STATE_EOF(MAN_REST): case 18: /* rule 18 can match eol */ YY_RULE_SETUP -#line 393 "lexgrog.l" +#line 394 "lexgrog.l" YY_BREAK /* rules to end NAME section processing */ case 19: /* rule 19 can match eol */ YY_RULE_SETUP -#line 396 "lexgrog.l" +#line 397 "lexgrog.l" { /* forced exit */ *p_name = '\0'; /* terminate the string */ yyterminate (); @@ -3325,10 +3371,10 @@ YY_RULE_SETUP YY_BREAK case 20: /* rule 20 can match eol */ -#line 402 "lexgrog.l" +#line 403 "lexgrog.l" YY_RULE_SETUP case YY_STATE_EOF(MAN_PRENAME): -#line 402 "lexgrog.l" +#line 403 "lexgrog.l" { /* no NAME at all */ *p_name = '\0'; BEGIN (MAN_REST); @@ -3339,23 +3385,23 @@ case YY_STATE_EOF(MAN_PRENAME): case 21: /* rule 21 can match eol */ -#line 411 "lexgrog.l" +#line 412 "lexgrog.l" case 22: /* rule 22 can match eol */ -#line 412 "lexgrog.l" +#line 413 "lexgrog.l" case 23: /* rule 23 can match eol */ -#line 413 "lexgrog.l" +#line 414 "lexgrog.l" case 24: /* rule 24 can match eol */ -#line 414 "lexgrog.l" +#line 415 "lexgrog.l" case 25: /* rule 25 can match eol */ -#line 415 "lexgrog.l" +#line 416 "lexgrog.l" case 26: /* rule 26 can match eol */ YY_RULE_SETUP -#line 415 "lexgrog.l" +#line 416 "lexgrog.l" { yyless (0); BEGIN (MAN_NAME); @@ -3367,19 +3413,19 @@ YY_RULE_SETUP case 27: /* rule 27 can match eol */ YY_RULE_SETUP -#line 423 "lexgrog.l" +#line 424 "lexgrog.l" YY_BREAK case 28: /* rule 28 can match eol */ YY_RULE_SETUP -#line 425 "lexgrog.l" +#line 426 "lexgrog.l" yyless (1); YY_BREAK case 29: /* rule 29 can match eol */ YY_RULE_SETUP -#line 427 "lexgrog.l" +#line 428 "lexgrog.l" { yyless (0); BEGIN (MAN_NAME); @@ -3388,30 +3434,30 @@ YY_RULE_SETUP case 30: /* rule 30 can match eol */ -#line 434 "lexgrog.l" +#line 435 "lexgrog.l" case 31: /* rule 31 can match eol */ -#line 435 "lexgrog.l" +#line 436 "lexgrog.l" case 32: /* rule 32 can match eol */ -#line 436 "lexgrog.l" +#line 437 "lexgrog.l" case 33: /* rule 33 can match eol */ -#line 437 "lexgrog.l" +#line 438 "lexgrog.l" case 34: /* rule 34 can match eol */ -#line 438 "lexgrog.l" +#line 439 "lexgrog.l" case 35: /* rule 35 can match eol */ -#line 439 "lexgrog.l" +#line 440 "lexgrog.l" case 36: /* rule 36 can match eol */ -#line 440 "lexgrog.l" +#line 441 "lexgrog.l" YY_RULE_SETUP case YY_STATE_EOF(MAN_NAME): YY_RULE_SETUP case YY_STATE_EOF(MAN_DESC): -#line 440 "lexgrog.l" +#line 441 "lexgrog.l" { /* terminate the string */ *p_name = '\0'; BEGIN (MAN_REST); @@ -3421,14 +3467,14 @@ case YY_STATE_EOF(MAN_DESC): case 37: /* rule 37 can match eol */ -#line 448 "lexgrog.l" +#line 449 "lexgrog.l" case 38: /* rule 38 can match eol */ -#line 449 "lexgrog.l" +#line 450 "lexgrog.l" case 39: /* rule 39 can match eol */ YY_RULE_SETUP -#line 449 "lexgrog.l" +#line 450 "lexgrog.l" { /* terminate the string */ *p_name = '\0'; BEGIN (CAT_REST); @@ -3442,40 +3488,40 @@ YY_RULE_SETUP case 40: /* rule 40 can match eol */ YY_RULE_SETUP -#line 459 "lexgrog.l" +#line 460 "lexgrog.l" { newline_found (); - waiting_for_quote = 1; + waiting_for_quote = true; } YY_BREAK case 41: /* rule 41 can match eol */ -#line 465 "lexgrog.l" +#line 466 "lexgrog.l" case 42: /* rule 42 can match eol */ -#line 466 "lexgrog.l" +#line 467 "lexgrog.l" case 43: /* rule 43 can match eol */ -#line 467 "lexgrog.l" +#line 468 "lexgrog.l" case 44: /* rule 44 can match eol */ -#line 468 "lexgrog.l" +#line 469 "lexgrog.l" case 45: /* rule 45 can match eol */ -#line 469 "lexgrog.l" +#line 470 "lexgrog.l" case 46: /* rule 46 can match eol */ -#line 470 "lexgrog.l" +#line 471 "lexgrog.l" case 47: /* rule 47 can match eol */ -#line 471 "lexgrog.l" +#line 472 "lexgrog.l" case 48: /* rule 48 can match eol */ -#line 472 "lexgrog.l" +#line 473 "lexgrog.l" case 49: /* rule 49 can match eol */ YY_RULE_SETUP -#line 472 "lexgrog.l" +#line 473 "lexgrog.l" { /* per line comments */ newline_found (); } @@ -3490,7 +3536,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 479 "lexgrog.l" +#line 480 "lexgrog.l" newline_found (); YY_BREAK case 51: @@ -3500,7 +3546,7 @@ YY_LINENO_REWIND_TO(yy_cp - 1); (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up yytext again */ YY_RULE_SETUP -#line 480 "lexgrog.l" +#line 481 "lexgrog.l" newline_found (); YY_BREAK @@ -3509,40 +3555,40 @@ newline_found (); case 52: /* rule 52 can match eol */ YY_RULE_SETUP -#line 485 "lexgrog.l" -fill_mode = 0; +#line 486 "lexgrog.l" +fill_mode = false; YY_BREAK case 53: /* rule 53 can match eol */ YY_RULE_SETUP -#line 486 "lexgrog.l" -fill_mode = 1; +#line 487 "lexgrog.l" +fill_mode = true; YY_BREAK case 54: /* rule 54 can match eol */ YY_RULE_SETUP -#line 489 "lexgrog.l" +#line 490 "lexgrog.l" /* strip continuations */ YY_BREAK /* convert to DASH */ case 55: /* rule 55 can match eol */ -#line 494 "lexgrog.l" +#line 495 "lexgrog.l" case 56: /* rule 56 can match eol */ -#line 495 "lexgrog.l" +#line 496 "lexgrog.l" case 57: /* rule 57 can match eol */ -#line 496 "lexgrog.l" +#line 497 "lexgrog.l" case 58: /* rule 58 can match eol */ -#line 497 "lexgrog.l" +#line 498 "lexgrog.l" case 59: /* rule 59 can match eol */ YY_RULE_SETUP -#line 497 "lexgrog.l" +#line 498 "lexgrog.l" { add_separator_to_whatis (); BEGIN (MAN_DESC); @@ -3552,7 +3598,7 @@ YY_RULE_SETUP case 60: /* rule 60 can match eol */ YY_RULE_SETUP -#line 502 "lexgrog.l" +#line 503 "lexgrog.l" add_separator_to_whatis (); YY_BREAK /* escape sequences and special characters */ @@ -3560,147 +3606,147 @@ add_separator_to_whatis (); case 61: /* rule 61 can match eol */ YY_RULE_SETUP -#line 506 "lexgrog.l" +#line 507 "lexgrog.l" add_char_to_whatis ('\\'); YY_BREAK case 62: /* rule 62 can match eol */ YY_RULE_SETUP -#line 507 "lexgrog.l" +#line 508 "lexgrog.l" add_char_to_whatis ('\''); YY_BREAK case 63: /* rule 63 can match eol */ YY_RULE_SETUP -#line 508 "lexgrog.l" +#line 509 "lexgrog.l" add_char_to_whatis ('`'); YY_BREAK case 64: /* rule 64 can match eol */ YY_RULE_SETUP -#line 509 "lexgrog.l" +#line 510 "lexgrog.l" add_char_to_whatis ('-'); YY_BREAK case 65: /* rule 65 can match eol */ YY_RULE_SETUP -#line 510 "lexgrog.l" +#line 511 "lexgrog.l" add_char_to_whatis ('-'); YY_BREAK case 66: /* rule 66 can match eol */ YY_RULE_SETUP -#line 511 "lexgrog.l" +#line 512 "lexgrog.l" add_char_to_whatis ('.'); YY_BREAK case 67: /* rule 67 can match eol */ YY_RULE_SETUP -#line 512 "lexgrog.l" +#line 513 "lexgrog.l" add_char_to_whatis (' '); YY_BREAK case 68: /* rule 68 can match eol */ YY_RULE_SETUP -#line 513 "lexgrog.l" +#line 514 "lexgrog.l" add_char_to_whatis ('_'); YY_BREAK case 69: /* rule 69 can match eol */ YY_RULE_SETUP -#line 514 "lexgrog.l" +#line 515 "lexgrog.l" add_char_to_whatis ('\t'); YY_BREAK case 70: /* rule 70 can match eol */ YY_RULE_SETUP -#line 516 "lexgrog.l" +#line 517 "lexgrog.l" /* various useless control chars */ YY_BREAK case 71: /* rule 71 can match eol */ YY_RULE_SETUP -#line 517 "lexgrog.l" +#line 518 "lexgrog.l" /* various inline functions */ YY_BREAK case 72: /* rule 72 can match eol */ YY_RULE_SETUP -#line 519 "lexgrog.l" +#line 520 "lexgrog.l" /* interpolate arg */ YY_BREAK /* roff named glyphs */ case 73: /* rule 73 can match eol */ YY_RULE_SETUP -#line 522 "lexgrog.l" +#line 523 "lexgrog.l" add_glyph_to_whatis (yytext + 2, 2); YY_BREAK /* perldoc strings */ case 74: /* rule 74 can match eol */ YY_RULE_SETUP -#line 524 "lexgrog.l" +#line 525 "lexgrog.l" add_perldoc_to_whatis (yytext + 3, 2); YY_BREAK case 75: /* rule 75 can match eol */ YY_RULE_SETUP -#line 525 "lexgrog.l" +#line 526 "lexgrog.l" add_perldoc_to_whatis (yytext + 2, 1); YY_BREAK case 76: /* rule 76 can match eol */ YY_RULE_SETUP -#line 527 "lexgrog.l" +#line 528 "lexgrog.l" /* comment */ YY_BREAK case 77: /* rule 77 can match eol */ YY_RULE_SETUP -#line 529 "lexgrog.l" +#line 530 "lexgrog.l" /* font changes */ YY_BREAK case 78: /* rule 78 can match eol */ YY_RULE_SETUP -#line 530 "lexgrog.l" +#line 531 "lexgrog.l" /* mark input place in register */ YY_BREAK case 79: /* rule 79 can match eol */ YY_RULE_SETUP -#line 532 "lexgrog.l" +#line 533 "lexgrog.l" /* interpolate number register */ YY_BREAK case 80: /* rule 80 can match eol */ YY_RULE_SETUP -#line 533 "lexgrog.l" +#line 534 "lexgrog.l" /* overstrike chars */ YY_BREAK case 81: /* rule 81 can match eol */ YY_RULE_SETUP -#line 535 "lexgrog.l" +#line 536 "lexgrog.l" /* size changes */ YY_BREAK case 82: /* rule 82 can match eol */ YY_RULE_SETUP -#line 536 "lexgrog.l" +#line 537 "lexgrog.l" /* width of string */ YY_BREAK case 83: /* rule 83 can match eol */ YY_RULE_SETUP -#line 538 "lexgrog.l" +#line 539 "lexgrog.l" /* catch all */ YY_BREAK case 84: /* rule 84 can match eol */ YY_RULE_SETUP -#line 540 "lexgrog.l" +#line 541 "lexgrog.l" /* function() in hpux */ YY_BREAK @@ -3711,49 +3757,49 @@ YY_RULE_SETUP case 85: /* rule 85 can match eol */ YY_RULE_SETUP -#line 547 "lexgrog.l" +#line 548 "lexgrog.l" BEGIN (MAN_DESC_AT); YY_BREAK case 86: /* rule 86 can match eol */ YY_RULE_SETUP -#line 548 "lexgrog.l" +#line 549 "lexgrog.l" BEGIN (MAN_DESC_BSX); YY_BREAK case 87: /* rule 87 can match eol */ YY_RULE_SETUP -#line 549 "lexgrog.l" +#line 550 "lexgrog.l" BEGIN (MAN_DESC_BX); YY_BREAK case 88: /* rule 88 can match eol */ YY_RULE_SETUP -#line 550 "lexgrog.l" +#line 551 "lexgrog.l" BEGIN (MAN_DESC_FX); YY_BREAK case 89: /* rule 89 can match eol */ YY_RULE_SETUP -#line 551 "lexgrog.l" +#line 552 "lexgrog.l" BEGIN (MAN_DESC_NX); YY_BREAK case 90: /* rule 90 can match eol */ YY_RULE_SETUP -#line 552 "lexgrog.l" +#line 553 "lexgrog.l" BEGIN (MAN_DESC_OX); YY_BREAK case 91: /* rule 91 can match eol */ YY_RULE_SETUP -#line 553 "lexgrog.l" +#line 554 "lexgrog.l" add_word_to_whatis ("UNIX"); YY_BREAK case 92: /* rule 92 can match eol */ YY_RULE_SETUP -#line 555 "lexgrog.l" +#line 556 "lexgrog.l" { add_word_to_whatis ("\""); BEGIN (MAN_DESC_DQ); @@ -3763,73 +3809,73 @@ YY_RULE_SETUP case 93: YY_RULE_SETUP -#line 562 "lexgrog.l" +#line 563 "lexgrog.l" mdoc_text ("Version 32V AT&T UNIX"); YY_BREAK case 94: YY_RULE_SETUP -#line 563 "lexgrog.l" +#line 564 "lexgrog.l" mdoc_text ("Version 1 AT&T UNIX"); YY_BREAK case 95: YY_RULE_SETUP -#line 564 "lexgrog.l" +#line 565 "lexgrog.l" mdoc_text ("Version 2 AT&T UNIX"); YY_BREAK case 96: YY_RULE_SETUP -#line 565 "lexgrog.l" +#line 566 "lexgrog.l" mdoc_text ("Version 3 AT&T UNIX"); YY_BREAK case 97: YY_RULE_SETUP -#line 566 "lexgrog.l" +#line 567 "lexgrog.l" mdoc_text ("Version 4 AT&T UNIX"); YY_BREAK case 98: YY_RULE_SETUP -#line 567 "lexgrog.l" +#line 568 "lexgrog.l" mdoc_text ("Version 5 AT&T UNIX"); YY_BREAK case 99: YY_RULE_SETUP -#line 568 "lexgrog.l" +#line 569 "lexgrog.l" mdoc_text ("Version 6 AT&T UNIX"); YY_BREAK case 100: YY_RULE_SETUP -#line 569 "lexgrog.l" +#line 570 "lexgrog.l" mdoc_text ("Version 7 AT&T UNIX"); YY_BREAK case 101: YY_RULE_SETUP -#line 570 "lexgrog.l" +#line 571 "lexgrog.l" mdoc_text ("AT&T System V UNIX"); YY_BREAK case 102: YY_RULE_SETUP -#line 571 "lexgrog.l" +#line 572 "lexgrog.l" mdoc_text ("AT&T System V.1 UNIX"); YY_BREAK case 103: YY_RULE_SETUP -#line 572 "lexgrog.l" +#line 573 "lexgrog.l" mdoc_text ("AT&T System V.2 UNIX"); YY_BREAK case 104: YY_RULE_SETUP -#line 573 "lexgrog.l" +#line 574 "lexgrog.l" mdoc_text ("AT&T System V.3 UNIX"); YY_BREAK case 105: YY_RULE_SETUP -#line 574 "lexgrog.l" +#line 575 "lexgrog.l" mdoc_text ("AT&T System V.4 UNIX"); YY_BREAK case 106: /* rule 106 can match eol */ YY_RULE_SETUP -#line 575 "lexgrog.l" +#line 576 "lexgrog.l" { yyless (0); mdoc_text ("AT&T UNIX"); @@ -3839,7 +3885,7 @@ YY_RULE_SETUP case 107: YY_RULE_SETUP -#line 582 "lexgrog.l" +#line 583 "lexgrog.l" { add_word_to_whatis ("BSD/OS"); add_wordn_to_whatis (yytext, yyleng); @@ -3849,7 +3895,7 @@ YY_RULE_SETUP case 108: /* rule 108 can match eol */ YY_RULE_SETUP -#line 587 "lexgrog.l" +#line 588 "lexgrog.l" { yyless (0); mdoc_text ("BSD/OS"); @@ -3859,22 +3905,22 @@ YY_RULE_SETUP case 109: YY_RULE_SETUP -#line 594 "lexgrog.l" +#line 595 "lexgrog.l" mdoc_text ("BSD (currently in alpha test)"); YY_BREAK case 110: YY_RULE_SETUP -#line 595 "lexgrog.l" +#line 596 "lexgrog.l" mdoc_text ("BSD (currently in beta test)"); YY_BREAK case 111: YY_RULE_SETUP -#line 596 "lexgrog.l" +#line 597 "lexgrog.l" mdoc_text ("BSD (currently under development"); YY_BREAK case 112: YY_RULE_SETUP -#line 597 "lexgrog.l" +#line 598 "lexgrog.l" { add_wordn_to_whatis (yytext, yyleng); add_str_to_whatis ("BSD", 3); @@ -3884,7 +3930,7 @@ YY_RULE_SETUP case 113: /* rule 113 can match eol */ YY_RULE_SETUP -#line 602 "lexgrog.l" +#line 603 "lexgrog.l" { yyless (0); mdoc_text ("BSD"); @@ -3894,7 +3940,7 @@ YY_RULE_SETUP case 114: YY_RULE_SETUP -#line 609 "lexgrog.l" +#line 610 "lexgrog.l" { add_str_to_whatis ("-Reno", 5); BEGIN (MAN_DESC); @@ -3902,7 +3948,7 @@ YY_RULE_SETUP YY_BREAK case 115: YY_RULE_SETUP -#line 613 "lexgrog.l" +#line 614 "lexgrog.l" { add_str_to_whatis ("-Tahoe", 6); BEGIN (MAN_DESC); @@ -3910,7 +3956,7 @@ YY_RULE_SETUP YY_BREAK case 116: YY_RULE_SETUP -#line 617 "lexgrog.l" +#line 618 "lexgrog.l" { add_str_to_whatis ("-Lite", 5); BEGIN (MAN_DESC); @@ -3918,7 +3964,7 @@ YY_RULE_SETUP YY_BREAK case 117: YY_RULE_SETUP -#line 621 "lexgrog.l" +#line 622 "lexgrog.l" { add_str_to_whatis ("-Lite2", 6); BEGIN (MAN_DESC); @@ -3927,7 +3973,7 @@ YY_RULE_SETUP case 118: /* rule 118 can match eol */ YY_RULE_SETUP -#line 625 "lexgrog.l" +#line 626 "lexgrog.l" { yyless (0); BEGIN (MAN_DESC); @@ -3936,7 +3982,7 @@ YY_RULE_SETUP case 119: YY_RULE_SETUP -#line 631 "lexgrog.l" +#line 632 "lexgrog.l" { add_str_to_whatis (yytext, yyleng); add_char_to_whatis ('"'); @@ -3946,7 +3992,7 @@ YY_RULE_SETUP case 120: YY_RULE_SETUP -#line 638 "lexgrog.l" +#line 639 "lexgrog.l" { add_word_to_whatis ("FreeBSD"); add_wordn_to_whatis (yytext, yyleng); @@ -3956,7 +4002,7 @@ YY_RULE_SETUP case 121: /* rule 121 can match eol */ YY_RULE_SETUP -#line 643 "lexgrog.l" +#line 644 "lexgrog.l" { yyless (0); mdoc_text ("FreeBSD"); @@ -3966,7 +4012,7 @@ YY_RULE_SETUP case 122: YY_RULE_SETUP -#line 650 "lexgrog.l" +#line 651 "lexgrog.l" { add_word_to_whatis ("NetBSD"); add_wordn_to_whatis (yytext, yyleng); @@ -3976,7 +4022,7 @@ YY_RULE_SETUP case 123: /* rule 123 can match eol */ YY_RULE_SETUP -#line 655 "lexgrog.l" +#line 656 "lexgrog.l" { yyless (0); mdoc_text ("NetBSD"); @@ -3986,7 +4032,7 @@ YY_RULE_SETUP case 124: YY_RULE_SETUP -#line 662 "lexgrog.l" +#line 663 "lexgrog.l" { add_word_to_whatis ("OpenBSD"); add_wordn_to_whatis (yytext, yyleng); @@ -3996,7 +4042,7 @@ YY_RULE_SETUP case 125: /* rule 125 can match eol */ YY_RULE_SETUP -#line 667 "lexgrog.l" +#line 668 "lexgrog.l" { yyless (0); mdoc_text ("OpenBSD"); @@ -4007,7 +4053,7 @@ YY_RULE_SETUP case 126: /* rule 126 can match eol */ YY_RULE_SETUP -#line 674 "lexgrog.l" +#line 675 "lexgrog.l" add_char_to_whatis (' '); YY_BREAK /* a ROFF break request, a paragraph request, or an indentation change @@ -4016,29 +4062,29 @@ add_char_to_whatis (' '); case 127: /* rule 127 can match eol */ -#line 681 "lexgrog.l" +#line 682 "lexgrog.l" case 128: /* rule 128 can match eol */ -#line 682 "lexgrog.l" +#line 683 "lexgrog.l" case 129: /* rule 129 can match eol */ -#line 683 "lexgrog.l" +#line 684 "lexgrog.l" case 130: /* rule 130 can match eol */ -#line 684 "lexgrog.l" +#line 685 "lexgrog.l" case 131: /* rule 131 can match eol */ -#line 685 "lexgrog.l" +#line 686 "lexgrog.l" case 132: /* rule 132 can match eol */ -#line 686 "lexgrog.l" +#line 687 "lexgrog.l" case 133: /* rule 133 can match eol */ -#line 687 "lexgrog.l" +#line 688 "lexgrog.l" case 134: /* rule 134 can match eol */ YY_RULE_SETUP -#line 687 "lexgrog.l" +#line 688 "lexgrog.l" { add_char_to_whatis ((char) 0x11); BEGIN (MAN_NAME); @@ -4049,7 +4095,7 @@ YY_RULE_SETUP case 135: /* rule 135 can match eol */ YY_RULE_SETUP -#line 694 "lexgrog.l" +#line 695 "lexgrog.l" { *p_name = '\0'; BEGIN (MAN_REST); @@ -4058,23 +4104,23 @@ YY_RULE_SETUP /* pass words as a chunk. speed optimization */ case 136: YY_RULE_SETUP -#line 700 "lexgrog.l" +#line 701 "lexgrog.l" add_str_to_whatis (yytext, yyleng); YY_BREAK /* normalise the comma (,) separators */ case 137: /* rule 137 can match eol */ -#line 704 "lexgrog.l" +#line 705 "lexgrog.l" case 138: /* rule 138 can match eol */ YY_RULE_SETUP -#line 704 "lexgrog.l" +#line 705 "lexgrog.l" add_str_to_whatis (", ", 2); YY_BREAK case 139: /* rule 139 can match eol */ YY_RULE_SETUP -#line 706 "lexgrog.l" +#line 707 "lexgrog.l" { newline_found (); add_char_to_whatis (yytext[yyleng - 1]); @@ -4082,7 +4128,7 @@ YY_RULE_SETUP YY_BREAK case 140: YY_RULE_SETUP -#line 711 "lexgrog.l" +#line 712 "lexgrog.l" add_char_to_whatis (*yytext); YY_BREAK /* default EOF rule */ @@ -4100,15 +4146,15 @@ case YY_STATE_EOF(CAT_FILE): case YY_STATE_EOF(MAN_FILE): case YY_STATE_EOF(CAT_REST): case YY_STATE_EOF(FORCE_EXIT): -#line 714 "lexgrog.l" +#line 715 "lexgrog.l" return 1; YY_BREAK case 141: YY_RULE_SETUP -#line 716 "lexgrog.l" +#line 717 "lexgrog.l" ECHO; YY_BREAK -#line 4112 "lexgrog.c" +#line 4158 "lexgrog.c" case YY_END_OF_BUFFER: { @@ -4404,7 +4450,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1559 ) + if ( yy_current_state >= 1573 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; @@ -4432,11 +4478,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 1559 ) + if ( yy_current_state >= 1573 ) yy_c = yy_meta[yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c]; - yy_is_jam = (yy_current_state == 1558); + yy_is_jam = (yy_current_state == 1572); return yy_is_jam ? 0 : yy_current_state; } @@ -5075,7 +5121,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 716 "lexgrog.l" +#line 717 "lexgrog.l" /* print warning and force scanner to terminate */ @@ -5112,7 +5158,7 @@ static void add_char_to_whatis (unsigned char c) if (p_name - newname + 1 >= MAX_NAME) too_big (); else if (waiting_for_quote && c == '"') - waiting_for_quote = 0; + waiting_for_quote = false; else *p_name++ = c; } @@ -5210,7 +5256,7 @@ static void newline_found (void) BEGIN (MAN_NAME); } } - waiting_for_quote = 0; + waiting_for_quote = false; } int find_name (const char *file, const char *filename, lexgrog *p_lg, @@ -5300,8 +5346,8 @@ int find_name_decompressed (decompress *d, const char *filename, lexgrog *p_lg) *(p_name = newname) = '\0'; memset (filters, '_', sizeof (filters)); - fill_mode = 1; - waiting_for_quote = 0; + fill_mode = true; + waiting_for_quote = false; if (p_lg->type == CATPAGE) BEGIN (CAT_FILE); diff --git a/src/lexgrog.l b/src/lexgrog.l index 7f78df9c..3c297172 100644 --- a/src/lexgrog.l +++ b/src/lexgrog.l @@ -48,6 +48,7 @@ #include <sys/stat.h> #include <errno.h> +#include <stdbool.h> #include <string.h> #include <stdlib.h> #include <unistd.h> @@ -243,8 +244,8 @@ static char *p_name; static const char *fname; static char filters[MAX_FILTERS]; -static int fill_mode; -static int waiting_for_quote; +static bool fill_mode; +static bool waiting_for_quote; static decompress *decomp; @@ -311,7 +312,7 @@ comment ['.]\\{dbl_quote} */ ar_name (اﻹسم|الإسم) /* ИМЕ also works for mk */ -bg_name ИМЕ +bg_name И(Ðœ|м)(Е|е) cs_name (J[Mm](É|é|\\\('[Ee]|E|e)[Nn][Oo]|N(Ã|á)[Zz][Ee][Vv]) da_name N[Aa][Vv][Nn] de_name B[Ee][Zz][Ee][Ii][Cc][Hh][Nn][Uu][Nn][Gg] @@ -328,19 +329,19 @@ it_name N[Oo][Mm][Ee] ja_name (å|̾)(å‰|称) ko_name (ì´ë¦„|명ì¹) latin_name N[Oo][Mm][Ee][Nn] -lt_name PAVADINIMAS +lt_name P[Aa][Vv][Aa][Dd][Ii][Nn][Ii][Mm][Aa][Ss] nl_name N[Aa][Aa][Mm] pl_name N[Aa][Zz][Ww][Aa] ro_name N[Uu][Mm][Ee] -ru_name (ИМЯ|ÐÐЗВÐÐИЕ|ÐÐИМЕÐОВÐÐИЕ) +ru_name (И(Ðœ|м)(Я|Ñ)|Ð(Ð|а)(З|з)(Ð’|в)(Ð|а)(Ð|н)(И|и)(Е|е)|Ð(Ð|а)(И|и)(Ðœ|м)(Е|е)(Ð|н)(О|о)(Ð’|в)(Ð|а)(Ð|н)(И|и)(Е|е)) sk_name M[Ee][Nn][Oo] -sr_name (ИМЕ|ÐÐЗИВ) -srlatin_name (IME|NAZIV) +sr_name (И(Ðœ|м)(Е|е)|Ð(Ð|а)(З|з)(И|и)(Ð’|в)) +srlatin_name (I[Mm][Ee]|N[Aa][Zz][Ii][Vv]) sv_name N[Aa][Mm][Nn] ta_name பெய -tr_name (Ä°|i)S(Ä°|i)M -uk_name ÐÐЗВР-vi_name TÊN +tr_name (A[Dd]|(Ä°|i)S(Ä°|i)M) +uk_name Ð(Ð|а)(З|з)(Ð’|в)(Ð|а) +vi_name T(Ê|ê)[Nn] zh_CN_name å{blank}?(称|å—){blank}?.* zh_TW_name (å{blank}?(稱|å—)|命令å){blank}?.* name ({ar_name}|{bg_name}|{cs_name}|{da_name}|{de_name}|{en_name}|{eo_name}|{es_name}|{fa_name}|{fi_name}|{fr_name}|{hu_name}|{id_name}|{it_name}|{ja_name}|{ko_name}|{latin_name}|{lt_name}|{nl_name}|{pl_name}|{ro_name}|{ru_name}|{sk_name}|{sr_name}|{srlatin_name}|{sv_name}|{ta_name}|{tr_name}|{uk_name}|{vi_name}|{zh_CN_name}|{zh_TW_name}) @@ -457,7 +458,7 @@ vgrind_request \.vS /* some include quoting; dealing with this is unpleasant */ {bol}{typeface}{blank}+\" { newline_found (); - waiting_for_quote = 1; + waiting_for_quote = true; } {bol}{typeface}{blank}+ | /* type face commands */ @@ -481,8 +482,8 @@ vgrind_request \.vS /* Toggle fill mode */ <MAN_NAME,MAN_DESC>{ - {bol}\.nf.* fill_mode = 0; - {bol}\.fi.* fill_mode = 1; + {bol}\.nf.* fill_mode = false; + {bol}\.fi.* fill_mode = true; } <CAT_NAME>-{eol}{blank_eol}* /* strip continuations */ @@ -748,7 +749,7 @@ static void add_char_to_whatis (unsigned char c) if (p_name - newname + 1 >= MAX_NAME) too_big (); else if (waiting_for_quote && c == '"') - waiting_for_quote = 0; + waiting_for_quote = false; else *p_name++ = c; } @@ -846,7 +847,7 @@ static void newline_found (void) BEGIN (MAN_NAME); } } - waiting_for_quote = 0; + waiting_for_quote = false; } int find_name (const char *file, const char *filename, lexgrog *p_lg, @@ -936,8 +937,8 @@ int find_name_decompressed (decompress *d, const char *filename, lexgrog *p_lg) *(p_name = newname) = '\0'; memset (filters, '_', sizeof (filters)); - fill_mode = 1; - waiting_for_quote = 0; + fill_mode = true; + waiting_for_quote = false; if (p_lg->type == CATPAGE) BEGIN (CAT_FILE); diff --git a/src/lexgrog_test.c b/src/lexgrog_test.c index 08c69c84..f5278f3b 100644 --- a/src/lexgrog_test.c +++ b/src/lexgrog_test.c @@ -76,13 +76,15 @@ static const char args_doc[] = N_("FILE..."); static const char doc[] = "\v" N_("The defaults are --man and --whatis."); static struct argp_option options[] = { - { "debug", 'd', 0, 0, N_("emit debugging messages") }, - { "man", 'm', 0, 0, N_("parse as man page"), 1 }, - { "cat", 'c', 0, 0, N_("parse as cat page") }, - { "whatis", 'w', 0, 0, N_("show whatis information"), 2 }, - { "filters", 'f', 0, 0, N_("show guessed series of preprocessing filters") }, - { "encoding", 'E', N_("ENCODING"), 0, N_("use selected output encoding"), 3 }, - { 0, 'h', 0, OPTION_HIDDEN, 0 }, /* compatibility for --help */ + OPT ("debug", 'd', 0, N_("emit debugging messages")), + OPT ("man", 'm', 0, N_("parse as man page"), 1), + OPT ("cat", 'c', 0, N_("parse as cat page")), + OPT ("whatis", 'w', 0, N_("show whatis information"), 2), + OPT ("filters", 'f', 0, + N_("show guessed series of preprocessing filters")), + OPT ("encoding", 'E', N_("ENCODING"), + N_("use selected output encoding"), 3), + OPT_HELP_COMPAT, { 0 } }; @@ -181,7 +183,7 @@ int main (int argc, char **argv) for (i = 0; i < num_files; ++i) { lexgrog lg; - const char *file; + const char *file = NULL; bool found = false; lg.type = type; @@ -191,6 +193,7 @@ int main (int argc, char **argv) else { char *path, *pathend; struct stat statbuf; + const struct ult_value *ult; path = xstrdup (files[i]); pathend = strrchr (path, '/'); @@ -208,8 +211,10 @@ int main (int argc, char **argv) path = NULL; } - file = ult_src (files[i], path ? path : ".", - &statbuf, SO_LINK, NULL); + ult = ult_src (files[i], path ? path : ".", + &statbuf, SO_LINK); + if (ult) + file = ult->path; free (path); } diff --git a/src/man-recode.c b/src/man-recode.c index 9d59bfa1..e198d175 100644 --- a/src/man-recode.c +++ b/src/man-recode.c @@ -52,6 +52,7 @@ #include "pipeline.h" #include "cleanup.h" +#include "compression.h" #include "debug.h" #include "encodings.h" #include "fatal.h" @@ -59,7 +60,6 @@ #include "sandbox.h" #include "util.h" -#include "compression.h" #include "decompress.h" #include "manconv.h" #include "manconv_client.h" @@ -110,14 +110,14 @@ static const char args_doc[] = N_("-t CODE {--suffix SUFFIX | --in-place} FILENAME..."); static struct argp_option options[] = { - { "to-code", 't', N_("CODE"), 0, N_("encoding for output") }, - { "suffix", OPT_SUFFIX, - N_("SUFFIX"), 0, N_("suffix to append to output file name") }, - { "in-place", OPT_IN_PLACE, - 0, 0, N_("overwrite input files in place") }, - { "debug", 'd', 0, 0, N_("emit debugging messages") }, - { "quiet", 'q', 0, 0, N_("produce fewer warnings") }, - { 0, 'h', 0, OPTION_HIDDEN, 0 }, /* compatibility for --help */ + OPT ("to-code", 't', N_("CODE"), N_("encoding for output")), + OPT ("suffix", OPT_SUFFIX, N_("SUFFIX"), + N_("suffix to append to output file name")), + OPT ("in-place", OPT_IN_PLACE, 0, + N_("overwrite input files in place")), + OPT ("debug", 'd', 0, N_("emit debugging messages")), + OPT ("quiet", 'q', 0, N_("produce fewer warnings")), + OPT_HELP_COMPAT, { 0 } }; @@ -185,7 +185,7 @@ static void recode (const char *filename) dirname = dir_name (filename); basename = base_name (filename); - comp = comp_info (basename, 1); + comp = comp_info (basename, true); if (comp) stem = comp->stem; /* steal memory */ else @@ -86,8 +86,10 @@ #include "appendstr.h" #include "cleanup.h" +#include "compression.h" #include "debug.h" #include "fatal.h" +#include "filenames.h" #include "glcontainers.h" #include "pipeline.h" #include "pathsearch.h" @@ -104,8 +106,6 @@ #include "mydbm.h" #include "db_storage.h" -#include "compression.h" -#include "filenames.h" #include "globbing.h" #include "ult_src.h" #include "manp.h" @@ -145,7 +145,7 @@ char *lang; #undef ALT_EXT_FORMAT /* allow external formatters located in cat hierarchy */ static bool global_manpath; /* global or user manual page hierarchy? */ -static int skip; /* page exists but has been skipped */ +static bool skip; /* page exists but has been skipped */ #if defined _AIX || defined __sgi char **global_argv; @@ -236,11 +236,9 @@ static bool save_cat; /* security breach? Can we save the cat? */ static int first_arg; -static int found_a_stray; /* found a straycat */ - #ifdef MAN_CATS static char *tmp_cat_file; /* for open_cat_stream(), close_cat_stream() */ -static int created_tmp_cat; /* dto. */ +static bool created_tmp_cat; /* dto. */ #endif static int tmp_cat_fd; static struct timespec man_modtime; /* modtime of man page, for @@ -273,72 +271,95 @@ static const char args_doc[] = N_("[SECTION] PAGE..."); /* Please keep these options in the same order as in parse_opt below. */ static struct argp_option options[] = { - { "config-file", 'C', N_("FILE"), 0, N_("use this user configuration file") }, - { "debug", 'd', 0, 0, N_("emit debugging messages") }, - { "default", 'D', 0, 0, N_("reset all options to their default values") }, - { "warnings", OPT_WARNINGS, N_("WARNINGS"), ONLY_NROFF_WARNINGS | OPTION_ARG_OPTIONAL, - N_("enable warnings from groff") }, - - { 0, 0, 0, 0, N_("Main modes of operation:"), 10 }, - { "whatis", 'f', 0, 0, N_("equivalent to whatis") }, - { "apropos", 'k', 0, 0, N_("equivalent to apropos") }, - { "global-apropos", 'K', 0, 0, N_("search for text in all pages") }, - { "where", 'w', 0, 0, N_("print physical location of man page(s)") }, - { "path", 0, 0, OPTION_ALIAS }, - { "location", 0, 0, OPTION_ALIAS }, - { "where-cat", 'W', 0, 0, N_("print physical location of cat file(s)") }, - { "location-cat", 0, 0, OPTION_ALIAS }, - { "local-file", 'l', 0, 0, N_("interpret PAGE argument(s) as local filename(s)") }, - { "catman", 'c', 0, 0, N_("used by catman to reformat out of date cat pages"), 11 }, - { "recode", 'R', N_("ENCODING"), 0, N_("output source page encoded in ENCODING") }, - - { 0, 0, 0, 0, N_("Finding manual pages:"), 20 }, - { "locale", 'L', N_("LOCALE"), 0, N_("define the locale for this particular man search") }, - { "systems", 'm', N_("SYSTEM"), 0, N_("use manual pages from other systems") }, - { "manpath", 'M', N_("PATH"), 0, N_("set search path for manual pages to PATH") }, - { "sections", 'S', N_("LIST"), 0, N_("use colon separated section list"), 21 }, - { 0, 's', 0, OPTION_ALIAS }, - { "extension", 'e', N_("EXTENSION"), - 0, N_("limit search to extension type EXTENSION"), 22 }, - { "ignore-case", 'i', 0, 0, N_("look for pages case-insensitively (default)"), 23 }, - { "match-case", 'I', 0, 0, N_("look for pages case-sensitively") }, - { "regex", OPT_REGEX, 0, 0, N_("show all pages matching regex"), 24 }, - { "wildcard", OPT_WILDCARD, 0, 0, N_("show all pages matching wildcard") }, - { "names-only", OPT_NAMES, 0, 0, N_("make --regex and --wildcard match page names only, not " - "descriptions"), 25 }, - { "all", 'a', 0, 0, N_("find all matching manual pages"), 26 }, - { "update", 'u', 0, 0, N_("force a cache consistency check") }, - { "no-subpages", - OPT_NO_SUBPAGES, 0, 0, N_("don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"), 27 }, - - { 0, 0, 0, 0, N_("Controlling formatted output:"), 30 }, - { "pager", 'P', N_("PAGER"), 0, N_("use program PAGER to display output") }, - { "prompt", 'r', N_("STRING"), 0, N_("provide the `less' pager with a prompt") }, - { "ascii", '7', 0, 0, N_("display ASCII translation of certain latin1 chars"), 31 }, - { "encoding", 'E', N_("ENCODING"), 0, N_("use selected output encoding") }, - { "no-hyphenation", - OPT_NO_HYPHENATION, 0, 0, N_("turn off hyphenation") }, - { "nh", 0, 0, OPTION_ALIAS }, - { "no-justification", - OPT_NO_JUSTIFICATION, 0, 0, N_("turn off justification") }, - { "nj", 0, 0, OPTION_ALIAS }, - { "preprocessor", 'p', N_("STRING"), 0, N_("STRING indicates which preprocessors to run:\n" - "e - [n]eqn, p - pic, t - tbl,\n" - "g - grap, r - refer, v - vgrind") }, + OPT ("config-file", 'C', N_("FILE"), + N_("use this user configuration file")), + OPT ("debug", 'd', 0, N_("emit debugging messages")), + OPT ("default", 'D', 0, + N_("reset all options to their default values")), + OPT_FULL ("warnings", OPT_WARNINGS, N_("WARNINGS"), + ONLY_NROFF_WARNINGS | OPTION_ARG_OPTIONAL, + N_("enable warnings from groff")), + + OPT_GROUP_HEADER (N_("Main modes of operation:"), 10), + OPT ("whatis", 'f', 0, N_("equivalent to whatis")), + OPT ("apropos", 'k', 0, N_("equivalent to apropos")), + OPT ("global-apropos", 'K', 0, N_("search for text in all pages")), + OPT ("where", 'w', 0, N_("print physical location of man page(s)")), + OPT_ALIAS ("path", 0), + OPT_ALIAS ("location", 0), + OPT ("where-cat", 'W', 0, + N_("print physical location of cat file(s)")), + OPT_ALIAS ("location-cat", 0), + OPT ("local-file", 'l', 0, + N_("interpret PAGE argument(s) as local filename(s)")), + OPT ("catman", 'c', 0, + N_("used by catman to reformat out of date cat pages"), 11), + OPT ("recode", 'R', N_("ENCODING"), + N_("output source page encoded in ENCODING")), + + OPT_GROUP_HEADER (N_("Finding manual pages:"), 20), + OPT ("locale", 'L', N_("LOCALE"), + N_("define the locale for this particular man search")), + OPT ("systems", 'm', N_("SYSTEM"), + N_("use manual pages from other systems")), + OPT ("manpath", 'M', N_("PATH"), + N_("set search path for manual pages to PATH")), + OPT ("sections", 'S', N_("LIST"), + N_("use colon separated section list"), 21), + OPT_ALIAS (0, 's'), + OPT ("extension", 'e', N_("EXTENSION"), + N_("limit search to extension type EXTENSION"), 22), + OPT ("ignore-case", 'i', 0, + N_("look for pages case-insensitively (default)"), 23), + OPT ("match-case", 'I', 0, N_("look for pages case-sensitively")), + OPT ("regex", OPT_REGEX, 0, N_("show all pages matching regex"), 24), + OPT ("wildcard", OPT_WILDCARD, 0, + N_("show all pages matching wildcard")), + OPT ("names-only", OPT_NAMES, 0, + N_("make --regex and --wildcard match page names only, not " + "descriptions"), + 25), + OPT ("all", 'a', 0, N_("find all matching manual pages"), 26), + OPT ("update", 'u', 0, N_("force a cache consistency check")), + OPT ("no-subpages", OPT_NO_SUBPAGES, 0, + N_("don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"), + 27), + + OPT_GROUP_HEADER (N_("Controlling formatted output:"), 30), + OPT ("pager", 'P', N_("PAGER"), + N_("use program PAGER to display output")), + OPT ("prompt", 'r', N_("STRING"), + N_("provide the `less' pager with a prompt")), + OPT ("ascii", '7', 0, + N_("display ASCII translation of certain latin1 chars"), 31), + OPT ("encoding", 'E', N_("ENCODING"), + N_("use selected output encoding")), + OPT ("no-hyphenation", OPT_NO_HYPHENATION, 0, + N_("turn off hyphenation")), + OPT_ALIAS ("nh", 0), + OPT ("no-justification", OPT_NO_JUSTIFICATION, 0, + N_("turn off justification")), + OPT_ALIAS ("nj", 0), + OPT ("preprocessor", 'p', N_("STRING"), + N_("STRING indicates which preprocessors to run:\n" + "e - [n]eqn, p - pic, t - tbl,\n" + "g - grap, r - refer, v - vgrind")), #ifdef HAS_TROFF - { "troff", 't', 0, 0, N_("use %s to format pages"), 32 }, - { "troff-device", 'T', N_("DEVICE"), OPTION_ARG_OPTIONAL, - N_("use %s with selected device") }, - { "html", 'H', N_("BROWSER"), ONLY_TROFF_IS_GROFF | OPTION_ARG_OPTIONAL, - N_("use %s or BROWSER to display HTML output"), 33 }, - { "gxditview", 'X', N_("RESOLUTION"), - ONLY_TROFF_IS_GROFF | OPTION_ARG_OPTIONAL, - N_("use groff and display through gxditview (X11):\n" - "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12") }, - { "ditroff", 'Z', 0, ONLY_TROFF_IS_GROFF, N_("use groff and force it to produce ditroff") }, + OPT ("troff", 't', 0, N_("use %s to format pages"), 32), + OPT_FULL ("troff-device", 'T', N_("DEVICE"), OPTION_ARG_OPTIONAL, + N_("use %s with selected device")), + OPT_FULL ("html", 'H', N_("BROWSER"), + ONLY_TROFF_IS_GROFF | OPTION_ARG_OPTIONAL, + N_("use %s or BROWSER to display HTML output"), 33), + OPT_FULL ("gxditview", 'X', N_("RESOLUTION"), + ONLY_TROFF_IS_GROFF | OPTION_ARG_OPTIONAL, + N_("use groff and display through gxditview (X11):\n" + "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12")), + OPT_FULL ("ditroff", 'Z', 0, ONLY_TROFF_IS_GROFF, + N_("use groff and force it to produce ditroff")), #endif /* HAS_TROFF */ - { 0, 'h', 0, OPTION_HIDDEN, 0 }, /* compatibility for --help */ + OPT_HELP_COMPAT, { 0 } }; @@ -617,6 +638,7 @@ static void gripe_no_name (const char *sect) exit (FAIL); } +#ifdef HAVE_TERMIOS_H static struct termios tms; static int tms_set = 0; static pid_t tms_pid = 0; @@ -646,6 +668,11 @@ static void get_term (void) } } } +#else /* !HAVE_TERMIOS_H */ +static void get_term (void) +{ +} +#endif /* HAVE_TERMIOS_H */ #if defined(TROFF_IS_GROFF) || defined(HEIRLOOM_NROFF) static int get_roff_line_length (void) @@ -678,7 +705,9 @@ static pipecmd *add_roff_line_length (pipecmd *cmd, bool *save_cat_p) int length; pipecmd *ret = NULL; - if (!catman) { + if (!catman && cat_width) + debug ("Cat pages forced to terminal width %d\n", cat_width); + else if (!catman) { int line_length = get_line_length (); debug ("Terminal width %d\n", line_length); if (line_length >= min_cat_width && @@ -864,7 +893,7 @@ static const char *escape_less (const char *string) * * If filename is non-NULL, uses mandb's -f option to update a single file. */ -static int run_mandb (int create, const char *manpath, const char *filename) +static int run_mandb (bool create, const char *manpath, const char *filename) { pipeline *mandb_pl = pipeline_new (); pipecmd *mandb_cmd = pipecmd_new ("mandb"); @@ -931,7 +960,7 @@ static char *locale_manpath (const char *manpath) * The list of sections in config.h simply allows us to specify oddly * named directories like .../man3f. Yuk. */ -static const char *is_section (const char *name) +static const char * ATTRIBUTE_PURE is_section (const char *name) { const char *vs; @@ -1079,6 +1108,44 @@ static void add_col (pipeline *p, const char *locale_charset, ...) pipeline_command (p, cmd); } +static void add_filter (pipeline *p, pipecmd *cmd, + bool wants_dev, bool wants_post) +{ + if (wants_dev) { + if (roff_device) + pipecmd_argf (cmd, "-T%s", roff_device); +#ifdef TROFF_IS_GROFF + else if (gxditview) { + pipecmd_argf (cmd, "-TX%s", gxditview); + if (strstr (gxditview, "-12")) + pipecmd_argf (cmd, "-rS12"); + } +#endif /* TROFF_IS_GROFF */ + } + + if (wants_post) { +#ifdef TROFF_IS_GROFF + if (gxditview) + /* -X arranges for the correct options to be passed + * to troff. Normally it would run gxditview as + * well, but we suppress that with -Z so that we can + * do it ourselves; this lets us set a better window + * title, and means that we don't have to worry + * about sandboxing text processing and an X program + * in the same way. + */ + pipecmd_args (cmd, "-X", "-Z", (void *) 0); +#endif /* TROFF_IS_GROFF */ + + if (roff_device && STREQ (roff_device, "ps")) + /* Tell grops to guess the page size. */ + pipecmd_arg (cmd, "-P-g"); + } + + pipecmd_pre_exec (cmd, sandbox_load_permissive, sandbox_free, sandbox); + pipeline_command (p, cmd); +} + /* Return pipeline to format file to stdout. */ static pipeline *make_roff_command (const char *dir, const char *file, decompress *decomp, const char *pp_string, @@ -1261,151 +1328,99 @@ static pipeline *make_roff_command (const char *dir, const char *file, if (recode) ; else if (!fmt_prog) { + char *pp_string_initial; + const char *pp; #ifndef GNU_NROFF - int using_tbl = 0; + bool using_tbl = false; #endif /* GNU_NROFF */ - - do { #ifdef NROFF_WARNINGS - const char *warning; + const char *warning; #endif /* NROFF_WARNINGS */ - int wants_dev = 0; /* filter wants a dev argument */ - int wants_post = 0; /* postprocessor arguments */ - - cmd = NULL; - /* set cmd according to *pp_string, on - errors leave cmd as NULL */ - switch (*pp_string) { - case 'e': - if (troff) - cmd = pipecmd_new_argstr - (get_def ("eqn", PROG_EQN)); - else - cmd = pipecmd_new_argstr - (get_def ("neqn", PROG_NEQN)); - wants_dev = 1; - break; - case 'g': - cmd = pipecmd_new_argstr - (get_def ("grap", PROG_GRAP)); - break; - case 'p': - cmd = pipecmd_new_argstr - (get_def ("pic", PROG_PIC)); - break; - case 't': - cmd = pipecmd_new_argstr - (get_def ("tbl", PROG_TBL)); + + /* Add preprocessors. Per groff(1), grap, chem, and ideal must + * come before pic, and tbl must come before eqn. + */ + pp_string_initial = xstrndup (pp_string, + strcspn (pp_string, " -")); + if (strchr (pp_string_initial, 'r')) { + cmd = pipecmd_new_argstr + (get_def ("refer", PROG_REFER)); + add_filter (p, cmd, false, false); + } + if (strchr (pp_string_initial, 'g')) { + cmd = pipecmd_new_argstr (get_def ("grap", PROG_GRAP)); + add_filter (p, cmd, false, false); + } + if (strchr (pp_string_initial, 'p')) { + cmd = pipecmd_new_argstr (get_def ("pic", PROG_PIC)); + add_filter (p, cmd, false, false); + } + if (strchr (pp_string_initial, 't')) { + cmd = pipecmd_new_argstr (get_def ("tbl", PROG_TBL)); + add_filter (p, cmd, false, false); #ifndef GNU_NROFF - using_tbl = 1; + using_tbl = true; #endif /* GNU_NROFF */ - break; - case 'v': - cmd = pipecmd_new_argstr - (get_def ("vgrind", PROG_VGRIND)); - break; - case 'r': - cmd = pipecmd_new_argstr - (get_def ("refer", PROG_REFER)); - break; - case ' ': - case '-': - case 0: - /* done with preprocessors, now add roff */ - if (troff) { - cmd = pipecmd_new_argstr - (get_def ("troff", - PROG_TROFF)); - save_cat = false; - } else - cmd = pipecmd_new_argstr - (get_def ("nroff", - PROG_NROFF)); + } + if (strchr (pp_string_initial, 'e')) { + const char *eqn; + if (troff) + eqn = get_def ("eqn", PROG_EQN); + else + eqn = get_def ("neqn", PROG_NEQN); + cmd = pipecmd_new_argstr (eqn); + /* eqn wants device options. */ + add_filter (p, cmd, true, false); + } + if (strchr (pp_string_initial, 'v')) { + cmd = pipecmd_new_argstr + (get_def ("vgrind", PROG_VGRIND)); + add_filter (p, cmd, false, false); + } + for (pp = pp_string_initial; *pp; ++pp) { + if (!strchr ("rgptev", *pp)) + error (0, 0, + _("ignoring unknown preprocessor `%c'"), + *pp); + } + free (pp_string_initial); + + /* Add *roff itself. */ + if (troff) { + cmd = pipecmd_new_argstr + (get_def ("troff", PROG_TROFF)); + save_cat = false; + } else + cmd = pipecmd_new_argstr + (get_def ("nroff", PROG_NROFF)); #ifdef TROFF_IS_GROFF - if (troff && ditroff) - pipecmd_arg (cmd, "-Z"); + if (troff && ditroff) + pipecmd_arg (cmd, "-Z"); #endif /* TROFF_IS_GROFF */ #if defined(TROFF_IS_GROFF) || defined(HEIRLOOM_NROFF) - { - pipecmd *seq = add_roff_line_length - (cmd, &save_cat); - if (seq) - pipeline_command (p, seq); - } + { + pipecmd *seq = add_roff_line_length (cmd, &save_cat); + if (seq) + pipeline_command (p, seq); + } #endif /* TROFF_IS_GROFF || HEIRLOOM_NROFF */ #ifdef NROFF_WARNINGS - GL_LIST_FOREACH (roff_warnings, warning) - pipecmd_argf (cmd, "-w%s", warning); + GL_LIST_FOREACH (roff_warnings, warning) + pipecmd_argf (cmd, "-w%s", warning); #endif /* NROFF_WARNINGS */ #ifdef HEIRLOOM_NROFF - if (running_setuid ()) - pipecmd_unsetenv (cmd, "TROFFMACS"); + if (running_setuid ()) + pipecmd_unsetenv (cmd, "TROFFMACS"); #endif /* HEIRLOOM_NROFF */ - pipecmd_argstr (cmd, roff_opt); - - wants_dev = 1; - wants_post = 1; - break; - } - - if (!cmd) { - assert (*pp_string); /* didn't fail on roff */ - error (0, 0, - _("ignoring unknown preprocessor `%c'"), - *pp_string); - continue; - } - - if (wants_dev) { - if (roff_device) - pipecmd_argf (cmd, - "-T%s", roff_device); -#ifdef TROFF_IS_GROFF - else if (gxditview) { - pipecmd_argf (cmd, "-TX%s", gxditview); - if (strstr (gxditview, "-12")) - pipecmd_argf (cmd, "-rS12"); - } -#endif /* TROFF_IS_GROFF */ - } - - if (wants_post) { -#ifdef TROFF_IS_GROFF - if (gxditview) - /* -X arranges for the correct - * options to be passed to troff. - * Normally it would run gxditview - * as well, but we suppress that - * with -Z so that we can do it - * ourselves; this lets us set a - * better window title, and means - * that we don't have to worry about - * sandboxing text processing and an - * X program in the same way. - */ - pipecmd_args (cmd, "-X", "-Z", - (void *) 0); -#endif /* TROFF_IS_GROFF */ - - if (roff_device && STREQ (roff_device, "ps")) - /* Tell grops to guess the page - * size. - */ - pipecmd_arg (cmd, "-P-g"); - } + pipecmd_argstr (cmd, roff_opt); - pipecmd_pre_exec (cmd, sandbox_load_permissive, - sandbox_free, sandbox); - pipeline_command (p, cmd); - - if (*pp_string == ' ' || *pp_string == '-') - break; - } while (*pp_string++); + /* *roff wants both device and postprocessor arguments. */ + add_filter (p, cmd, true, true); if (!troff && *PROG_COL != '\0') { const char *man_keep_formatting = @@ -1562,20 +1577,20 @@ static void squeeze_blank_lines (void *data MAYBE_UNUSED) size_t len = 0; while (getline (&line, &len, stdin) != -1) { - int in_blank_line = 1; - int got_blank_line = 0; + bool in_blank_line = true; + bool got_blank_line = false; while (in_blank_line) { char *p; for (p = line; *p; ++p) { if (!CTYPE (isspace, *p)) { - in_blank_line = 0; + in_blank_line = false; break; } } if (in_blank_line) { - got_blank_line = 1; + got_blank_line = true; free (line); line = NULL; len = 0; @@ -1822,13 +1837,13 @@ static pipeline *open_cat_stream (const char *cat_file, const char *encoding) pipecmd *comp_cmd; # endif - created_tmp_cat = 0; + created_tmp_cat = false; debug ("creating temporary cat for %s\n", cat_file); tmp_cat_file = tmp_cat_filename (cat_file); if (tmp_cat_file) - created_tmp_cat = 1; + created_tmp_cat = true; else { if (!debug_level && (errno == EACCES || errno == EROFS)) { /* No permission to write to the cat file. Oh well, @@ -1990,7 +2005,7 @@ static void format_display (decompress *d, char *browser_list, *candidate; if (format_status) { - if (remove_directory (htmldir, 0) == -1) + if (remove_directory (htmldir, false) == -1) error (0, errno, _("can't remove directory %s"), htmldir); @@ -2022,7 +2037,7 @@ static void format_display (decompress *d, sleep (5); /* firefox runs into background too fast */ free (browser_list); - if (remove_directory (htmldir, 0) == -1) + if (remove_directory (htmldir, false) == -1) error (0, errno, _("can't remove directory %s"), htmldir); free (htmlfile); @@ -2146,7 +2161,7 @@ static int do_prompt (const char *name) int ch; FILE *tty = NULL; - skip = 0; + skip = false; if (!isatty (STDOUT_FILENO) || !isatty (STDIN_FILENO)) return 0; /* noninteractive */ tty = fopen ("/dev/tty", "r+"); @@ -2166,7 +2181,7 @@ static int do_prompt (const char *name) fclose (tty); return 0; case EOF: - skip = 1; + skip = true; fclose (tty); return 1; default: @@ -2338,7 +2353,7 @@ static int display (const char *dir, const char *man_file, gripe_system (format_cmd, status); } } else { - int format = 1; + bool format = true; int status; /* The caller should already have checked for any @@ -2368,11 +2383,11 @@ static int display (const char *dir, const char *man_file, if (!man_file) { /* Stray cat. */ assert (cat_file); - format = 0; + format = false; } else if (!cat_file) { assert (man_file); save_cat = false; - format = 1; + format = true; } else if (format && save_cat) { char *cat_dir; char *tmp; @@ -2408,14 +2423,14 @@ static int display (const char *dir, const char *man_file, * expect input via stdin. So we special-case this to avoid * the bogus access() check. */ - if (format == 1 && *man_file == '\0') + if (format && *man_file == '\0') found = 1; else found = CAN_ACCESS (format ? man_file : cat_file, R_OK); debug ("format: %d, save_cat: %d, found: %d\n", - format, (int) save_cat, found); + (int) format, (int) save_cat, found); if (!found) { pipeline_free (format_cmd); @@ -2424,16 +2439,16 @@ static int display (const char *dir, const char *man_file, } if (print_where || print_where_cat) { - int printed = 0; + bool printed = false; if (print_where && man_file) { printf ("%s", man_file); - printed = 1; + printed = true; } if (print_where_cat && cat_file && !format) { if (printed) putchar (' '); printf ("%s", cat_file); - printed = 1; + printed = true; } if (printed) putchar ('\n'); @@ -2534,14 +2549,14 @@ static _Noreturn void gripe_converting_name (const char *name) * named with 'man -l'. Otherwise, a symlink to "/home/manuel/foo.1.gz" * would be converted to "/home/catuel/foo.1.gz", which would be bad. */ -static char *convert_name (const char *name, int fsstnd) +static char *convert_name (const char *name, bool fsstnd) { char *to_name, *t1 = NULL; char *t2 = NULL; struct compression *comp; char *namestem; - comp = comp_info (name, 1); + comp = comp_info (name, true); if (comp) namestem = comp->stem; else @@ -2601,7 +2616,7 @@ static char *find_cat_file (const char *path, const char *original, * means we'll hardly ever use them at all except for user * hierarchies; but compatibility, eh?) */ - cat_file = convert_name (original, 1); + cat_file = convert_name (original, true); if (cat_file) { status = is_changed (original, cat_file); if (status != -2 && (!(status & 1)) == 1) { @@ -2622,11 +2637,11 @@ static char *find_cat_file (const char *path, const char *original, (man_file, global_manpath ? SYSTEM_CAT : USER_CAT); if (cat_path) { - cat_file = convert_name (cat_path, 0); + cat_file = convert_name (cat_path, false); free (cat_path); } else if (STRNEQ (man_file, path, path_len) && man_file[path_len] == '/') - cat_file = convert_name (man_file, 1); + cat_file = convert_name (man_file, true); else cat_file = NULL; @@ -2651,10 +2666,10 @@ static char *find_cat_file (const char *path, const char *original, (original, global_manpath ? SYSTEM_CAT : USER_CAT); if (cat_path) { - cat_file = convert_name (cat_path, 0); + cat_file = convert_name (cat_path, false); free (cat_path); } else - cat_file = convert_name (original, 1); + cat_file = convert_name (original, true); if (cat_file) debug ("will try cat file %s\n", cat_file); @@ -2839,7 +2854,7 @@ static int compare_candidates (const struct candidate *left, } /* ULT_MAN comes first, etc. Consider SO_MAN equivalent to ULT_MAN. */ - cmp = compare_ids (lsource->id, rsource->id, 1); + cmp = compare_ids (lsource->id, rsource->id, true); if (cmp) return cmp; @@ -2975,6 +2990,7 @@ static int add_candidate (struct candidate **head, char from_db, char cat, if (!ult) { const char *name; char *filename; + const struct ult_value *ult_value; if (*source->pointer != '-') name = source->pointer; @@ -2986,8 +3002,10 @@ static int add_candidate (struct candidate **head, char from_db, char cat, filename = make_filename (path, name, source, cat ? "cat" : "man"); if (!filename) return 0; - ult = ult_src (filename, path, NULL, - get_ult_flags (from_db, source->id), NULL); + ult_value = ult_src (filename, path, NULL, + get_ult_flags (from_db, source->id)); + if (ult_value) + ult = ult_value->path; free (filename); } @@ -3026,14 +3044,15 @@ static int add_candidate (struct candidate **head, char from_db, char cat, * then be quickly checked by brute force. */ while (search) { - int dupcand = duplicate_candidates (candp, search); + bool dupcand = duplicate_candidates (candp, search); debug ("search: %d %d %s %s %s %c %s %s %s " "(dup: %d)\n", search->from_db, search->cat, search->req_name, search->path, search->ult, search->source->id, search->source->name ? search->source->name : "-", - search->source->sec, search->source->ext, dupcand); + search->source->sec, search->source->ext, + (int) dupcand); /* Check for duplicates. */ if (dupcand) { @@ -3135,7 +3154,7 @@ static int try_section (const char *path, const char *sec, const char *name, * Look for man page source files. */ - names = look_for_file (path, sec, name, 0, lff_opts); + names = look_for_file (path, sec, name, false, lff_opts); if (!gl_list_size (names)) /* * No files match. @@ -3149,7 +3168,8 @@ static int try_section (const char *path, const char *sec, const char *name, if (!troff && !want_encoding && !recode) { gl_list_free (names); - names = look_for_file (path, sec, name, 1, lff_opts); + names = look_for_file (path, sec, name, true, + lff_opts); cat = 1; } } @@ -3157,47 +3177,36 @@ static int try_section (const char *path, const char *sec, const char *name, order_files (path, &names); GL_LIST_FOREACH (names, found_name) { - struct mandata *info = infoalloc (); - char *info_buffer = filename_info (found_name, info, name); - const char *ult; + struct mandata *info = filename_info (found_name, quiet < 2); + const struct ult_value *ult; int f; - if (!info_buffer) { - free_mandata_struct (info); + if (!info) continue; - } - info->addr = info_buffer; /* What kind of page is this? Since it's a real file, it * must be either ULT_MAN or SO_MAN. ult_src() can tell us * which. */ - ult = ult_src (found_name, path, NULL, ult_flags, NULL); + ult = ult_src (found_name, path, NULL, ult_flags); if (!ult) { /* already warned */ debug ("try_section(): bad link %s\n", found_name); - free (info_buffer); - info->addr = NULL; free_mandata_struct (info); continue; } - if (STREQ (ult, found_name)) + if (STREQ (ult->path, found_name)) info->id = ULT_MAN; else info->id = SO_MAN; f = add_candidate (cand_head, CANDIDATE_FILESYSTEM, - cat, name, path, ult, info); + cat, name, path, ult->path, info); found += f; - /* Free info and info_buffer if they weren't added to the - * candidates. - */ - if (f == 0) { - free (info_buffer); - info->addr = NULL; + /* Free info if it wasn't added to the candidates. */ + if (f == 0) free_mandata_struct (info); - } - /* Don't free info and info_buffer here. */ + /* Don't free info here. */ } gl_list_free (names); @@ -3221,19 +3230,20 @@ static int display_filesystem (struct candidate *candp) goto out; found = display (candp->path, NULL, filename, title, NULL); } else { - const char *man_file; + const struct ult_value *man_ult; char *cat_file; - man_file = ult_src (filename, candp->path, NULL, ult_flags, - NULL); - if (man_file == NULL) + man_ult = ult_src (filename, candp->path, NULL, ult_flags); + if (!man_ult) goto out; - debug ("found ultimate source file %s\n", man_file); - lang = lang_dir (man_file); + debug ("found ultimate source file %s\n", man_ult->path); + lang = lang_dir (man_ult->path); - cat_file = find_cat_file (candp->path, filename, man_file); - found = display (candp->path, man_file, cat_file, title, NULL); + cat_file = find_cat_file (candp->path, filename, + man_ult->path); + found = display (candp->path, man_ult->path, cat_file, title, + NULL); free (cat_file); free (lang); lang = NULL; @@ -3306,21 +3316,23 @@ static int display_database (struct candidate *candp) if (in->id < STRAY_CAT) { /* There should be a src page */ file = make_filename (candp->path, name, in, "man"); if (file) { - const char *man_file; + const struct ult_value *man_ult; char *cat_file; - man_file = ult_src (file, candp->path, NULL, - get_ult_flags (1, in->id), NULL); - if (man_file == NULL) { + man_ult = ult_src (file, candp->path, NULL, + get_ult_flags (1, in->id)); + if (!man_ult) { free (title); return found; /* zero */ } - debug ("found ultimate source file %s\n", man_file); - lang = lang_dir (man_file); + debug ("found ultimate source file %s\n", + man_ult->path); + lang = lang_dir (man_ult->path); - cat_file = find_cat_file (candp->path, file, man_file); - found += display (candp->path, man_file, cat_file, + cat_file = find_cat_file (candp->path, file, + man_ult->path); + found += display (candp->path, man_ult->path, cat_file, title, in->filter); free (cat_file); free (lang); @@ -3339,10 +3351,6 @@ static int display_database (struct candidate *candp) return ++found; } - /* show this page but force an update later to make sure - we haven't just added the new page */ - found_a_stray = 1; - /* If explicitly asked for troff or a different encoding, * don't show a stray cat. */ @@ -3434,7 +3442,7 @@ static int maybe_update_file (const char *manpath, const char *name, file, (long) info->mtime.tv_sec, (long) info->mtime.tv_nsec, (long) file_mtime.tv_sec, (long) file_mtime.tv_nsec); - status = run_mandb (0, manpath, file); + status = run_mandb (false, manpath, file); if (status) error (0, 0, _("mandb command failed with exit status %d"), status); @@ -3507,7 +3515,7 @@ static int try_db (const char *manpath, const char *sec, const char *name, } else if (!global_manpath) { /* create one */ debug ("Failed to open %s O_RDONLY\n", database); - if (run_mandb (1, manpath, NULL)) { + if (run_mandb (true, manpath, NULL)) { gl_map_put (db_map, xstrdup (manpath), NULL); found = TRY_DATABASE_OPEN_FAILED; goto out; @@ -3714,7 +3722,7 @@ static int do_global_apropos_section (const char *path, const char *sec, debug ("searching in %s, section %s\n", path, sec); - names = look_for_file (path, sec, "*", 0, LFF_WILDCARD); + names = look_for_file (path, sec, "*", false, LFF_WILDCARD); if (regex_opt) xregcomp (&search, name, @@ -3727,28 +3735,24 @@ static int do_global_apropos_section (const char *path, const char *sec, GL_LIST_FOREACH (names, found_name) { struct mandata *info; - char *info_buffer; char *title = NULL; - const char *man_file; + const struct ult_value *man_ult; char *cat_file = NULL; if (!grep (found_name, name, &search)) continue; - info = infoalloc (); - info_buffer = filename_info (found_name, info, NULL); - if (!info_buffer) + info = filename_info (found_name, quiet < 2); + if (!info) goto next; - info->addr = info_buffer; - title = xasprintf ("%s(%s)", strchr (info_buffer, '\0') + 1, - info->ext); - man_file = ult_src (found_name, path, NULL, ult_flags, NULL); - if (!man_file) + title = xasprintf ("%s(%s)", info->name, info->ext); + man_ult = ult_src (found_name, path, NULL, ult_flags); + if (!man_ult) goto next; - lang = lang_dir (man_file); - cat_file = find_cat_file (path, found_name, man_file); - if (display (path, man_file, cat_file, title, NULL)) + lang = lang_dir (man_ult->path); + cat_file = find_cat_file (path, found_name, man_ult->path); + if (display (path, man_ult->path, cat_file, title, NULL)) found = 1; free (lang); lang = NULL; @@ -3844,7 +3848,8 @@ static int local_man_loop (const char *argv) debug ("recalculating manpath for executable " "in %s\n", argv_dir); - new_manp = get_manpath_from_path (argv_dir, 0); + new_manp = get_manpath_from_path (argv_dir, + false); if (!new_manp || !*new_manp) { debug ("no useful manpath for " "executable\n"); @@ -4291,7 +4296,7 @@ int main (int argc, char *argv[]) #ifdef MAN_DB_UPDATES /* If `-u', do it now. */ if (update) { - int status = run_mandb (0, NULL, NULL); + int status = run_mandb (false, NULL, NULL); if (status) error (0, 0, _("mandb command failed with exit status %d"), @@ -4302,7 +4307,7 @@ int main (int argc, char *argv[]) while (first_arg < argc) { int status = OK; int found = 0; - static int maybe_section = 0; + static bool maybe_section = false; const char *nextarg = argv[first_arg++]; /* @@ -4314,7 +4319,7 @@ int main (int argc, char *argv[]) if (tmp) { section = tmp; debug ("\nsection: %s\n", section); - maybe_section = 1; + maybe_section = true; } } @@ -4331,7 +4336,7 @@ int main (int argc, char *argv[]) } /* this is where we actually start looking for the man page */ - skip = 0; + skip = false; if (global_apropos) status = do_global_apropos (nextarg, &found); else { @@ -4434,7 +4439,7 @@ int main (int argc, char *argv[]) } } - maybe_section = 0; + maybe_section = false; } if (db_map) { gl_map_free (db_map); diff --git a/src/manconv_main.c b/src/manconv_main.c index 0bf09ede..e0d9972d 100644 --- a/src/manconv_main.c +++ b/src/manconv_main.c @@ -94,12 +94,12 @@ error_t argp_err_exit_status = FAIL; static const char args_doc[] = N_("[-f CODE[:...]] -t CODE [FILENAME]"); static struct argp_option options[] = { - { "from-code", 'f', N_("CODE[:...]"), - 0, N_("possible encodings of original text") }, - { "to-code", 't', N_("CODE"), 0, N_("encoding for output") }, - { "debug", 'd', 0, 0, N_("emit debugging messages") }, - { "quiet", 'q', 0, 0, N_("produce fewer warnings") }, - { 0, 'h', 0, OPTION_HIDDEN, 0 }, /* compatibility for --help */ + OPT ("from-code", 'f', N_("CODE[:...]"), + N_("possible encodings of original text")), + OPT ("to-code", 't', N_("CODE"), N_("encoding for output")), + OPT ("debug", 'd', 0, N_("emit debugging messages")), + OPT ("quiet", 'q', 0, N_("produce fewer warnings")), + OPT_HELP_COMPAT, { 0 } }; diff --git a/src/mandb.c b/src/mandb.c index f29b3c84..751f942e 100644 --- a/src/mandb.c +++ b/src/mandb.c @@ -69,16 +69,17 @@ #include "cleanup.h" #include "debug.h" +#include "filenames.h" #include "glcontainers.h" #include "pipeline.h" #include "sandbox.h" #include "security.h" #include "util.h" +#include "db_storage.h" #include "mydbm.h" #include "check_mandirs.h" -#include "filenames.h" #include "manp.h" #include "straycats.h" @@ -115,16 +116,21 @@ error_t argp_err_exit_status = FAIL; static const char args_doc[] = N_("[MANPATH]"); static struct argp_option options[] = { - { "debug", 'd', 0, 0, N_("emit debugging messages") }, - { "quiet", 'q', 0, 0, N_("work quietly, except for 'bogus' warning") }, - { "no-straycats", 's', 0, 0, N_("don't look for or add stray cats to the dbs") }, - { "no-purge", 'p', 0, 0, N_("don't purge obsolete entries from the dbs") }, - { "user-db", 'u', 0, 0, N_("produce user databases only") }, - { "create", 'c', 0, 0, N_("create dbs from scratch, rather than updating") }, - { "test", 't', 0, 0, N_("check manual pages for correctness") }, - { "filename", 'f', N_("FILENAME"), 0, N_("update just the entry for this filename") }, - { "config-file", 'C', N_("FILE"), 0, N_("use this user configuration file") }, - { 0, 'h', 0, OPTION_HIDDEN, 0 }, /* compatibility for --help */ + OPT ("debug", 'd', 0, N_("emit debugging messages")), + OPT ("quiet", 'q', 0, N_("work quietly, except for 'bogus' warning")), + OPT ("no-straycats", 's', 0, + N_("don't look for or add stray cats to the dbs")), + OPT ("no-purge", 'p', 0, + N_("don't purge obsolete entries from the dbs")), + OPT ("user-db", 'u', 0, N_("produce user databases only")), + OPT ("create", 'c', 0, + N_("create dbs from scratch, rather than updating")), + OPT ("test", 't', 0, N_("check manual pages for correctness")), + OPT ("filename", 'f', N_("FILENAME"), + N_("update just the entry for this filename")), + OPT ("config-file", 'C', N_("FILE"), + N_("use this user configuration file")), + OPT_HELP_COMPAT, { 0 } }; @@ -305,8 +311,56 @@ static int xcopy (const char *from, const char *to) return ret; } -/* rename and chmod the database */ -static void finish_up (struct dbpaths *dbpaths) +static void dbpaths_init (struct dbpaths *dbpaths, + const char *base, const char *tmpbase) +{ +#ifdef NDBM +# ifdef BERKELEY_DB + dbpaths->dbfile = xasprintf ("%s.db", base); + dbpaths->tmpdbfile = xasprintf ("%s.db", tmpbase); +# else /* !BERKELEY_DB NDBM */ + dbpaths->dirfile = xasprintf ("%s.dir", base); + dbpaths->pagfile = xasprintf ("%s.pag", base); + dbpaths->tmpdirfile = xasprintf ("%s.dir", tmpbase); + dbpaths->tmppagfile = xasprintf ("%s.pag", tmpbase); +# endif /* BERKELEY_DB NDBM */ +#else /* !NDBM */ + dbpaths->xfile = xstrdup (base); + dbpaths->xtmpfile = xstrdup (tmpbase); +#endif /* NDBM */ +} + +static int dbpaths_copy_to_tmp (struct dbpaths *dbpaths) +{ +#ifdef NDBM +# ifdef BERKELEY_DB + return xcopy (dbpaths->dbfile, dbpaths->tmpdbfile); +# else /* !BERKELEY_DB NDBM */ + int ret = xcopy (dbpaths->dirfile, dbpaths->tmpdirfile); + if (ret < 0) + return ret; + return xcopy (dbpaths->pagfile, dbpaths->tmppagfile); +# endif /* BERKELEY_DB NDBM */ +#else /* !NDBM */ + return xcopy (dbpaths->xfile, dbpaths->xtmpfile); +#endif /* NDBM */ +} + +static void dbpaths_remove_tmp (struct dbpaths *dbpaths) +{ +#ifdef NDBM +# ifdef BERKELEY_DB + check_remove (dbpaths->tmpdbfile); +# else /* !BERKELEY_DB NDBM */ + check_remove (dbpaths->tmpdirfile); + check_remove (dbpaths->tmppagfile); +# endif /* BERKELEY_DB NDBM */ +#else /* !NDBM */ + check_remove (dbpaths->xtmpfile); +#endif /* NDBM */ +} + +static void dbpaths_rename_from_tmp (struct dbpaths *dbpaths) { #ifdef NDBM # ifdef BERKELEY_DB @@ -332,8 +386,8 @@ static void finish_up (struct dbpaths *dbpaths) } #ifdef MAN_OWNER -/* change the owner of global man databases */ -static void do_chown (struct dbpaths *dbpaths) +/* Change the owner of global man databases. */ +static void dbpaths_chown_if_possible (struct dbpaths *dbpaths) { # ifdef NDBM # ifdef BERKELEY_DB @@ -348,50 +402,9 @@ static void do_chown (struct dbpaths *dbpaths) } #endif /* MAN_OWNER */ -/* Update a single file in an existing database. */ -static int update_one_file (MYDBM_FILE dbf, - const char *manpath, const char *filename) -{ - if (dbf->file || MYDBM_RWOPEN (dbf)) { - struct mandata info; - char *manpage; - - memset (&info, 0, sizeof (struct mandata)); - manpage = filename_info (filename, &info, ""); - if (info.name) { - dbdelete (dbf, info.name, &info); - purge_pointers (dbf, info.name); - free (info.name); - } - free (manpage); - - test_manfile (dbf, filename, manpath); - } - - return 1; -} - -/* dont actually create any dbs, just do an update */ -static int update_db_wrapper (MYDBM_FILE dbf, - const char *manpath, const char *catpath) +/* Remove incomplete databases. This is async-signal-safe. */ +static void dbpaths_unlink_tmp (struct dbpaths *dbpaths) { - int amount; - - if (single_filename) - return update_one_file (dbf, manpath, single_filename); - - amount = update_db (dbf, manpath, catpath); - if (amount >= 0) - return amount; - - return create_db (dbf, manpath, catpath); -} - -/* remove incomplete databases */ -static void cleanup_sigsafe (void *arg) -{ - struct dbpaths *dbpaths = arg; - #ifdef NDBM # ifdef BERKELEY_DB if (dbpaths->tmpdbfile) @@ -408,11 +421,8 @@ static void cleanup_sigsafe (void *arg) #endif /* NDBM */ } -/* free database names */ -static void cleanup (void *arg) +static void dbpaths_free_elements (struct dbpaths *dbpaths) { - struct dbpaths *dbpaths = arg; - #ifdef NDBM # ifdef BERKELEY_DB free (dbpaths->dbfile); @@ -431,7 +441,104 @@ static void cleanup (void *arg) free (dbpaths->xtmpfile); dbpaths->xfile = dbpaths->xtmpfile = NULL; #endif /* NDBM */ +} + +/* Reorganize a database by reading in all the items (assuming that the + * database layer provides them in sorted order) and writing them back out. + * This has the effect of giving the underlying database the best chance to + * produce deterministic output files based only on the set of items and not + * on their insertion order, although we may not be able to guarantee that + * for all database types. + */ +static void reorganize (const char *catpath, bool global_manpath MAYBE_UNUSED) +{ + char *dbname, *tmpdbname; + struct dbpaths *dbpaths; + MYDBM_FILE dbf, tmpdbf; + datum key; + + dbname = mkdbname (catpath); + tmpdbname = xasprintf ("%s/%d", catpath, getpid ()); + dbpaths = XZALLOC (struct dbpaths); + dbpaths_init (dbpaths, dbname, tmpdbname); + dbf = MYDBM_NEW (dbname); + tmpdbf = MYDBM_NEW (tmpdbname); + if (!MYDBM_RDOPEN (dbf) || dbver_rd (dbf)) { + debug ("Failed to open %s read-only\n", dbname); + goto out; + } + if (!MYDBM_CTRWOPEN (tmpdbf)) { + debug ("Failed to create %s\n", tmpdbname); + goto out; + } + + key = MYDBM_FIRSTKEY (dbf); + while (MYDBM_DPTR (key)) { + datum content, nextkey; + int insert_status; + + content = MYDBM_FETCH (dbf, key); + insert_status = MYDBM_INSERT (tmpdbf, key, content); + MYDBM_FREE_DPTR (content); + if (insert_status != 0) { + MYDBM_FREE_DPTR (key); + goto out; + } + nextkey = MYDBM_NEXTKEY (dbf, key); + MYDBM_FREE_DPTR (key); + key = nextkey; + } + + dbpaths_rename_from_tmp (dbpaths); +#ifdef MAN_OWNER + if (global_manpath) + dbpaths_chown_if_possible (dbpaths); +#endif /* MAN_OWNER */ + +out: + MYDBM_FREE (tmpdbf); + MYDBM_FREE (dbf); + dbpaths_unlink_tmp (dbpaths); + dbpaths_free_elements (dbpaths); free (dbpaths); + free (tmpdbname); + free (dbname); +} + +/* Update a single file in an existing database. */ +static int update_one_file (MYDBM_FILE dbf, + const char *manpath, const char *filename) +{ + if (dbf->file || MYDBM_RWOPEN (dbf)) { + struct mandata *info; + + info = filename_info (filename, quiet < 2); + if (info) { + dbdelete (dbf, info->name, info); + purge_pointers (dbf, info->name); + } + free_mandata_struct (info); + + test_manfile (dbf, filename, manpath); + } + + return 1; +} + +/* dont actually create any dbs, just do an update */ +static int update_db_wrapper (MYDBM_FILE dbf, + const char *manpath, const char *catpath) +{ + int amount; + + if (single_filename) + return update_one_file (dbf, manpath, single_filename); + + amount = update_db (dbf, manpath, catpath); + if (amount >= 0) + return amount; + + return create_db (dbf, manpath, catpath); } #define CACHEDIR_TAG \ @@ -450,7 +557,6 @@ static int mandb (struct dbpaths *dbpaths, char *dbname; MYDBM_FILE dbf; bool should_create; - int purged_here = 0; dbname = mkdbname (catpath); database = xasprintf ("%s/%d", catpath, getpid ()); @@ -489,48 +595,16 @@ static int mandb (struct dbpaths *dbpaths, should_create = (create || opt_test); -#ifdef NDBM -# ifdef BERKELEY_DB - dbpaths->dbfile = xasprintf ("%s.db", dbname); - dbpaths->tmpdbfile = xasprintf ("%s.db", database); - if (!should_create) { - if (xcopy (dbpaths->dbfile, dbpaths->tmpdbfile) < 0) - should_create = true; - } - if (should_create) - check_remove (dbpaths->tmpdbfile); -# else /* !BERKELEY_DB NDBM */ - dbpaths->dirfile = xasprintf ("%s.dir", dbname); - dbpaths->pagfile = xasprintf ("%s.pag", dbname); - dbpaths->tmpdirfile = xasprintf ("%s.dir", database); - dbpaths->tmppagfile = xasprintf ("%s.pag", database); - if (!should_create) { - if (xcopy (dbpaths->dirfile, dbpaths->tmpdirfile) < 0 || - xcopy (dbpaths->pagfile, dbpaths->tmppagfile) < 0) - should_create = true; - } - if (should_create) { - check_remove (dbpaths->tmpdirfile); - check_remove (dbpaths->tmppagfile); - } -# endif /* BERKELEY_DB NDBM */ -#else /* !NDBM */ - dbpaths->xfile = xstrdup (dbname); - dbpaths->xtmpfile = xstrdup (database); - if (!should_create) { - if (xcopy (dbpaths->xfile, dbpaths->xtmpfile) < 0) - should_create = true; - } + dbpaths_init (dbpaths, dbname, database); + if (!should_create && dbpaths_copy_to_tmp (dbpaths) < 0) + should_create = true; if (should_create) - check_remove (dbpaths->xtmpfile); -#endif /* NDBM */ + dbpaths_remove_tmp (dbpaths); if (!should_create) { force_rescan = false; - if (purge) { - purged_here = purge_missing (dbf, manpath, catpath); - purged += purged_here; - } + if (purge) + purged += purge_missing (dbf, manpath, catpath); if (force_rescan) { /* We have an existing database and hadn't been @@ -541,16 +615,7 @@ static int mandb (struct dbpaths *dbpaths, * start from scratch. */ MYDBM_FREE (dbf); -#ifdef NDBM -# ifdef BERKELEY_DB - check_remove (dbpaths->tmpdbfile); -# else /* !BERKELEY_DB NDBM */ - check_remove (dbpaths->tmpdirfile); - check_remove (dbpaths->tmppagfile); -# endif /* BERKELEY_DB NDBM */ -#else /* !NDBM */ - check_remove (dbpaths->xtmpfile); -#endif /* NDBM */ + dbpaths_remove_tmp (dbpaths); dbf = MYDBM_NEW (database); should_create = true; } @@ -567,9 +632,6 @@ static int mandb (struct dbpaths *dbpaths, if (check_for_strays && amount > 0) strays += straycats (dbf, manpath); - if (purged_here) - MYDBM_REORG (dbf); - MYDBM_FREE (dbf); free (database); free (dbname); @@ -618,8 +680,8 @@ static int process_manpath (const char *manpath, bool global_manpath, run_mandb = true; dbpaths = XZALLOC (struct dbpaths); - push_cleanup (cleanup, dbpaths, 0); - push_cleanup (cleanup_sigsafe, dbpaths, 1); + push_cleanup ((cleanup_fun) dbpaths_free_elements, dbpaths, 0); + push_cleanup ((cleanup_fun) dbpaths_unlink_tmp, dbpaths, 1); if (run_mandb) { int purged_before = purged; int strays_before = strays; @@ -631,21 +693,24 @@ static int process_manpath (const char *manpath, bool global_manpath, amount += ret; new_purged = purged != purged_before; new_strays = strays != strays_before; - } - if (!opt_test && (amount || new_purged || new_strays)) - finish_up (dbpaths); + if (!opt_test && (amount || new_purged || new_strays)) { + dbpaths_rename_from_tmp (dbpaths); #ifdef MAN_OWNER - if (global_manpath) - do_chown (dbpaths); + if (global_manpath) + dbpaths_chown_if_possible (dbpaths); #endif /* MAN_OWNER */ + reorganize (catpath, global_manpath); + } + } out: if (dbpaths) { - cleanup_sigsafe (dbpaths); - pop_cleanup (cleanup_sigsafe, dbpaths); - cleanup (dbpaths); - pop_cleanup (cleanup, dbpaths); + dbpaths_unlink_tmp (dbpaths); + pop_cleanup ((cleanup_fun) dbpaths_unlink_tmp, dbpaths); + dbpaths_free_elements (dbpaths); + pop_cleanup ((cleanup_fun) dbpaths_free_elements, dbpaths); + free (dbpaths); } free (catpath); @@ -679,7 +744,7 @@ static void purge_catdir (gl_map_t tried_catdirs, const char *path) if (!quiet) printf (_("Removing obsolete cat directory %s...\n"), path); - remove_directory (path, 1); + remove_directory (path, true); } } @@ -707,7 +772,7 @@ static void purge_catsubdirs (const char *manpath, const char *catpath) if (!quiet) printf (_("Removing obsolete cat directory " "%s...\n"), catdir); - remove_directory (catdir, 1); + remove_directory (catdir, true); } free (catdir); @@ -791,9 +856,7 @@ int main (int argc, char *argv[]) int amount = 0; char *mp; gl_map_t tried_catdirs; -#ifdef SIGPIPE struct sigaction sa; -#endif /* SIGPIPE */ #ifdef __profile__ char *cwd; @@ -806,7 +869,6 @@ int main (int argc, char *argv[]) sandbox = sandbox_init (); init_locale (); -#ifdef SIGPIPE /* Reset SIGPIPE to its default disposition. Too many broken pieces * of software (Python << 3.2, gnome-session, etc.) spawn child * processes with SIGPIPE ignored, and this produces noise in cron @@ -817,7 +879,6 @@ int main (int argc, char *argv[]) sigemptyset (&sa.sa_mask); sa.sa_flags = 0; sigaction (SIGPIPE, &sa, NULL); -#endif /* SIGPIPE */ if (argp_parse (&argp, argc, argv, 0, 0, 0)) exit (FAIL); @@ -904,6 +965,7 @@ int main (int argc, char *argv[]) subdirpath = xasprintf ("%s/%s", mp, subdirent->d_name); + assert (subdirpath); ret = process_manpath (subdirpath, global_manpath, tried_catdirs); if (ret < 0) @@ -138,7 +138,8 @@ static void add_config (const char *key, const char *cont, gl_list_add_last (config, item); } -static const char *get_config (const char *key, enum config_flag flag) +static const char * ATTRIBUTE_PURE get_config (const char *key, + enum config_flag flag) { const struct config_item *item; char *cont = NULL; @@ -157,7 +158,7 @@ static const char *get_config (const char *key, enum config_flag flag) * * If not setuid, this is identical to get_def_user. */ -const char *get_def (const char *thing, const char *def) +const char * ATTRIBUTE_PURE get_def (const char *thing, const char *def) { const char *config_def; @@ -168,7 +169,7 @@ const char *get_def (const char *thing, const char *def) return config_def ? config_def : def; } -const char *get_def_user (const char *thing, const char *def) +const char * ATTRIBUTE_PURE get_def_user (const char *thing, const char *def) { const char *config_def = get_config (thing, DEFINE_USER); if (!config_def) @@ -176,7 +177,7 @@ const char *get_def_user (const char *thing, const char *def) return config_def ? config_def : def; } -static void add_sections (char *sections, int user) +static void add_sections (char *sections, bool user) { char *section_list = xstrdup (sections); char *sect; @@ -219,7 +220,7 @@ gl_list_t get_sections (void) return sections; } -static void add_def (const char *thing, const char *config_def, int user) +static void add_def (const char *thing, const char *config_def, bool user) { add_config (thing, config_def, user ? DEFINE_USER : DEFINE); @@ -236,7 +237,7 @@ static void add_manpath_map (const char *path, const char *mandir) debug (" Path `%s' mapped to mandir `%s'.\n", path, mandir); } -static void add_mandb_map (const char *mandir, const char *catdir, int user) +static void add_mandb_map (const char *mandir, const char *catdir, bool user) { char *tmpcatdir; @@ -681,7 +682,7 @@ static char *guess_manpath (const char *systems) def_path (MANDATORY)); } - manpathlist = get_manpath_from_path (path, 1); + manpathlist = get_manpath_from_path (path, true); } manpath = add_system_manpath (systems, manpathlist); free (manpathlist); @@ -752,7 +753,7 @@ char *get_manpath (const char *systems) } /* Parse the manpath.config file, extracting appropriate information. */ -static void add_to_dirlist (FILE *config_file, int user) +static void add_to_dirlist (FILE *config_file, bool user) { char *bp; char *buf = NULL; @@ -821,7 +822,7 @@ static void free_config_file (void *unused MAYBE_UNUSED) void read_config_file (bool optional) { - static int done = 0; + static bool done = false; char *dotmanpath = NULL; FILE *config_file; @@ -843,7 +844,7 @@ void read_config_file (bool optional) config_file = fopen (dotmanpath, "r"); if (config_file != NULL) { debug ("From the config file %s:\n", dotmanpath); - add_to_dirlist (config_file, 1); + add_to_dirlist (config_file, true); fclose (config_file); } free (dotmanpath); @@ -863,12 +864,12 @@ void read_config_file (bool optional) } else { debug ("From the config file %s:\n", CONFIG_FILE); - add_to_dirlist (config_file, 0); + add_to_dirlist (config_file, false); fclose (config_file); } } - done = 1; + done = true; } @@ -922,7 +923,7 @@ static char *def_path (enum config_flag flag) * $HOME/man exists -- the directory $HOME/man will be added * to the manpath. */ -char *get_manpath_from_path (const char *path, int mandatory) +char *get_manpath_from_path (const char *path, bool mandatory) { gl_list_t tmplist; const struct config_item *config_item; @@ -1313,7 +1314,7 @@ char *get_catpath (const char *name, int cattype) /* Check to see if the supplied man directory is a system-wide mandir. * Obviously, user directories must not be included here. */ -bool is_global_mandir (const char *dir) +bool ATTRIBUTE_PURE is_global_mandir (const char *dir) { const struct config_item *item; bool ret = false; @@ -39,7 +39,7 @@ extern void unpack_locale_bits (const char *locale, struct locale_bits *bits); extern void free_locale_bits (struct locale_bits *bits); extern char *add_nls_manpaths (const char *manpathlist, const char *locales); extern char *get_manpath (const char *systems); -extern char *get_manpath_from_path (const char *path, int mandatory); +extern char *get_manpath_from_path (const char *path, bool mandatory); extern gl_list_t create_pathlist (const char *manp); extern void free_pathlist (gl_list_t list); extern char *get_mandb_manpath (void); diff --git a/src/manpath.c b/src/manpath.c index 99a176e2..35ba5f79 100644 --- a/src/manpath.c +++ b/src/manpath.c @@ -62,13 +62,15 @@ const char *argp_program_bug_address = PACKAGE_BUGREPORT; error_t argp_err_exit_status = FAIL; static struct argp_option options[] = { - { "catpath", 'c', 0, 0, N_("show relative catpaths") }, - { "global", 'g', 0, 0, N_("show the entire global manpath") }, - { "debug", 'd', 0, 0, N_("emit debugging messages") }, - { "quiet", 'q', 0, 0, N_("produce fewer warnings") }, - { "config-file", 'C', N_("FILE"), 0, N_("use this user configuration file") }, - { "systems", 'm', N_("SYSTEM"), 0, N_("use manual pages from other systems") }, - { 0, 'h', 0, OPTION_HIDDEN, 0 }, /* compatibility for --help */ + OPT ("catpath", 'c', 0, N_("show relative catpaths")), + OPT ("global", 'g', 0, N_("show the entire global manpath")), + OPT ("debug", 'd', 0, N_("emit debugging messages")), + OPT ("quiet", 'q', 0, N_("produce fewer warnings")), + OPT ("config-file", 'C', N_("FILE"), + N_("use this user configuration file")), + OPT ("systems", 'm', N_("SYSTEM"), + N_("use manual pages from other systems")), + OPT_HELP_COMPAT, { 0 } }; diff --git a/src/straycats.c b/src/straycats.c index 1315345b..95e8750a 100644 --- a/src/straycats.c +++ b/src/straycats.c @@ -53,7 +53,9 @@ #include "manconfig.h" #include "appendstr.h" +#include "compression.h" #include "debug.h" +#include "filenames.h" #include "glcontainers.h" #include "pipeline.h" #include "decompress.h" @@ -66,7 +68,6 @@ #include "mydbm.h" #include "db_storage.h" -#include "compression.h" #include "descriptions.h" #include "lexgrog.h" #include "manp.h" @@ -111,13 +112,13 @@ static int check_for_stray (MYDBM_FILE dbf) lencat = strlen (catdir); GL_LIST_FOREACH (names, name) { - struct mandata info; - char *ext, *section; + struct mandata *info; + char *ext, *section = NULL; short found; struct stat buf; struct compression *comp; - memset (&info, 0, sizeof (struct mandata)); + info = XZALLOC (struct mandata); *(mandir + lenman) = *(catdir + lencat) = '\0'; mandir = appendstr (mandir, name, (void *) 0); @@ -130,12 +131,11 @@ static int check_for_stray (MYDBM_FILE dbf) _("warning: %s: " "ignoring bogus filename"), catdir); - continue; - } else if (comp_info (ext, 0)) { + goto next; + } else if (comp_info (ext, false)) { *ext = '\0'; - info.comp = ext + 1; - } else - info.comp = NULL; + info->comp = xstrdup (ext + 1); + } ext = strrchr (mandir, '.'); *(mandir + lenman - 1) = '\0'; @@ -150,7 +150,7 @@ static int check_for_stray (MYDBM_FILE dbf) _("warning: %s: " "ignoring bogus filename"), catdir); - goto next_section; + goto next; } /* @@ -183,27 +183,25 @@ static int check_for_stray (MYDBM_FILE dbf) lg.whatis = 0; *(ext++) = '\0'; - info.ext = ext; + info->ext = xstrdup (ext); /* see if we already have it, before going any further */ mandir_base = base_name (mandir); - exists = dblookup_exact (dbf, mandir_base, info.ext, + exists = dblookup_exact (dbf, mandir_base, info->ext, true); if (exists && - compare_ids (STRAY_CAT, exists->id, 0) >= 0) + compare_ids (STRAY_CAT, exists->id, false) >= 0) goto next_exists; debug ("%s(%s) is not in the db.\n", - mandir_base, info.ext); + mandir_base, info->ext); /* fill in the missing parts of the structure */ - info.name = NULL; - info.sec = section; - info.id = STRAY_CAT; - info.pointer = NULL; - info.filter = "-"; - info.mtime.tv_sec = 0; - info.mtime.tv_nsec = 0; + info->sec = xstrdup (section); + info->id = STRAY_CAT; + info->filter = xstrdup ("-"); + info->mtime.tv_sec = 0; + info->mtime.tv_nsec = 0; drop_effective_privs (); decomp = decompress_open (catdir, 0); @@ -236,16 +234,9 @@ static int check_for_stray (MYDBM_FILE dbf) col_cmd); fullpath = canonicalize_file_name (catdir); - if (!fullpath) { - if (quiet < 2) { - if (errno == ENOENT) - error (0, 0, _("warning: %s is a dangling symlink"), fullpath); - else - error (0, errno, - _("can't resolve %s"), - catdir); - } - } else { + if (!fullpath) + gripe_canonicalize_failed (catdir); + else { char *catdir_base; free (fullpath); @@ -264,13 +255,13 @@ static int check_for_stray (MYDBM_FILE dbf) strays++; descs = parse_descriptions (mandir_base, lg.whatis); - store_descriptions (dbf, descs, &info, + store_descriptions (dbf, descs, info, NULL, mandir_base, NULL); gl_list_free (descs); } else if (quiet < 2) error (0, 0, _("warning: %s: whatis parse for %s(%s) failed"), - catdir, mandir_base, info.sec); + catdir, mandir_base, info->sec); free (catdir_base); } @@ -280,8 +271,9 @@ next_exists: free_mandata_struct (exists); free (mandir_base); } -next_section: +next: free (section); + free_mandata_struct (info); } gl_list_free (names); return strays; diff --git a/src/tests/Makefile.in b/src/tests/Makefile.in index cf8e575b..4c1b780d 100644 --- a/src/tests/Makefile.in +++ b/src/tests/Makefile.in @@ -212,6 +212,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -223,8 +224,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -232,7 +233,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -251,6 +252,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -608,6 +610,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -628,6 +631,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -919,6 +923,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -1047,6 +1052,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -1224,6 +1230,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1379,6 +1386,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1414,6 +1422,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1450,6 +1459,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ diff --git a/src/ult_src.c b/src/ult_src.c index 69afb712..08413d20 100644 --- a/src/ult_src.c +++ b/src/ult_src.c @@ -33,6 +33,7 @@ #endif /* HAVE_CONFIG_H */ #include <string.h> +#include <stdbool.h> #include <stdlib.h> #include <stdio.h> #include <ctype.h> @@ -46,7 +47,10 @@ #include "canonicalize.h" #include "dirname.h" #include "error.h" +#include "gl_array_list.h" +#include "gl_hash_map.h" #include "gl_xlist.h" +#include "gl_xmap.h" #include "xalloc.h" #include "xstrndup.h" #include "xvasprintf.h" @@ -56,13 +60,24 @@ #include "manconfig.h" +#include "compression.h" #include "debug.h" +#include "glcontainers.h" -#include "compression.h" #include "decompress.h" -#include "globbing.h" #include "ult_src.h" +void gripe_canonicalize_failed (const char *path) +{ + if (quiet < 2) { + if (errno == ENOENT) + error (0, 0, _("warning: %s is a dangling symlink"), + path); + else + error (0, errno, _("can't resolve %s"), path); + } +} + /* Find minimum value hard link filename for given file and inode. * Returns a newly allocated string. */ @@ -122,15 +137,7 @@ static char *ult_softlink (const char *fullpath) resolved_path = canonicalize_file_name (fullpath); if (!resolved_path) { /* discard the unresolved path */ - if (quiet < 2) { - if (errno == ENOENT) - error (0, 0, - _("warning: %s is a dangling symlink"), - fullpath); - else - error (0, errno, _("can't resolve %s"), - fullpath); - } + gripe_canonicalize_failed (fullpath); return NULL; } @@ -139,6 +146,33 @@ static char *ult_softlink (const char *fullpath) return resolved_path; } +static char *find_include_directive (char *path) +{ + decompress *decomp; + const char *buffer; + char *directive; + + decomp = decompress_open (path, DECOMPRESS_ALLOW_INPROCESS); + if (!decomp) { + if (quiet < 2) + error (0, errno, _("can't open %s"), path); + return NULL; + } + decompress_start (decomp); + + /* make sure that we skip over any comments */ + do { + buffer = decompress_readline (decomp); + } while (buffer && STRNEQ (buffer, ".\\\"", 3)); + + directive = xstrdup (buffer ? buffer : ""); + + decompress_wait (decomp); + decompress_free (decomp); + + return directive; +} + /* Test 'buffer' to see if it contains a .so include. If so and it's not an * absolute filename, return newly allocated string whose contents are the * include. @@ -183,203 +217,236 @@ static char *test_for_include (const char *buffer) static char *find_include (const char *name, const char *path, const char *include) { - char *ret; - char *dirname; - char *temp_file; + char *target; + struct compression *comp; /* Restore the original path from before ult_softlink() etc., in * case it went outside the mantree. */ - ret = xasprintf ("%s/%s", path, include); - assert (ret); + target = xasprintf ("%s/%s", path, include); + assert (target); /* If the original path from above doesn't exist, try to create new * path as if the "include" was relative to the current man page. */ - if (CAN_ACCESS (ret, F_OK)) - return ret; - - dirname = dir_name (name); - temp_file = xasprintf ("%s/%s", dirname, include); - assert (temp_file); - free (dirname); - - if (CAN_ACCESS (temp_file, F_OK)) { - /* Just plain include. */ - free (ret); - ret = canonicalize_file_name (temp_file); - } else { - /* Try globbing - the file suffix might be missing. */ - char *temp_file_asterisk = xasprintf ("%s*", temp_file); - gl_list_t candidate_files = expand_path (temp_file_asterisk); - - free (temp_file_asterisk); - if (gl_list_size (candidate_files)) { - const char *candidate_file = gl_list_get_at - (candidate_files, 0); - if (CAN_ACCESS (candidate_file, F_OK)) { - free (ret); - ret = canonicalize_file_name (candidate_file); + if (!CAN_ACCESS (target, F_OK)) { + comp = comp_file (target); + free (target); + if (comp) { + target = comp->stem; + comp->stem = NULL; /* steal memory */ + } else + target = NULL; + } + + if (!target) { + char *dirname = dir_name (name); + char *temp_file = xasprintf ("%s/%s", dirname, include); + assert (temp_file); + free (dirname); + + if (CAN_ACCESS (temp_file, F_OK)) + /* Just plain include. */ + target = xstrdup (temp_file); + else { + comp = comp_file (temp_file); + if (comp) { + target = comp->stem; + comp->stem = NULL; /* steal memory */ } } - gl_list_free (candidate_files); + free (temp_file); } - free (temp_file); - return ret; + if (target) { + char *canonicalized = canonicalize_file_name (target); + if (canonicalized) + return canonicalized; + else { + gripe_canonicalize_failed (target); + free (target); + return NULL; + } + } else { + if (quiet < 2) + error (0, 0, _("can't resolve %s"), include); + return NULL; + } } +struct ult_key { + char *name; + int flags; +}; + +static struct ult_key *ult_key_new (const char *name, int flags) +{ + struct ult_key *ukey = XMALLOC (struct ult_key); + ukey->name = xstrdup (name); + ukey->flags = flags; + return ukey; +} + +static bool ATTRIBUTE_PURE ult_key_equals (const void *key1, const void *key2) +{ + struct ult_key *ukey1 = (struct ult_key *) key1; + struct ult_key *ukey2 = (struct ult_key *) key2; + return ukey1->flags == ukey2->flags && + STREQ (ukey1->name, ukey2->name); +} + +static size_t ATTRIBUTE_PURE ult_key_hash (const void *key) +{ + struct ult_key *ukey = (struct ult_key *) key; + return string_hash (ukey->name) ^ (size_t) ukey->flags; +} + +static void ult_key_free (const void *key) +{ + struct ult_key *ukey = (struct ult_key *) key; + free (ukey->name); + free (ukey); +} + +static struct ult_value *ult_value_new (void) +{ + struct ult_value *uvalue = XMALLOC (struct ult_value); + uvalue->path = NULL; + uvalue->trace = new_string_list (GL_ARRAY_LIST, true); + return uvalue; +} + +static void ult_value_free (const void *value) +{ + struct ult_value *uvalue = (struct ult_value *) value; + if (uvalue) { + free (uvalue->path); + gl_list_free (uvalue->trace); + free (uvalue); + } +} + +gl_map_t ult_cache = NULL; + /* - * recursive function which finds the ultimate source file by following - * any ".so filename" directives in the first line of the man pages. - * Also (optionally) traces symlinks and hard links(!). + * Find the ultimate source file by following any ".so filename" directives + * in the first line of the man pages. Also (optionally) trace symlinks and + * hard links(!). * * name is full pathname, path is the MANPATH directory (/usr/man) * flags is a combination of SO_LINK | SOFT_LINK | HARD_LINK */ -const char *ult_src (const char *name, const char *path, - struct stat *buf, int flags, gl_list_t trace) +const struct ult_value *ult_src (const char *name, const char *path, + struct stat *buf, int flags) { - static char *base; /* must be static */ - static short recurse; /* must be static */ + char *base = xstrdup (name); + struct ult_key *key; + const struct ult_value *existing; + struct ult_value *value; + struct stat new_buf; + + if (!ult_cache) + ult_cache = gl_map_create_empty (GL_HASH_MAP, + ult_key_equals, ult_key_hash, + ult_key_free, ult_value_free); + key = ult_key_new (name, flags); + if (gl_map_search (ult_cache, key, (const void **) &existing)) { + ult_key_free (key); + return existing; + } + value = ult_value_new (); - /* initialise the function */ + debug ("ult_src: File %s in mantree %s\n", name, path); - if (trace) - gl_list_add_last (trace, xstrdup (name)); + gl_list_add_last (value->trace, xstrdup (name)); /* as ult_softlink() & ult_hardlink() do all of their respective * resolving in one call, only need to sort them out once */ - if (recurse == 0) { - struct stat new_buf; - free (base); - base = xstrdup (name); - - debug ("\nult_src: File %s in mantree %s\n", name, path); - - /* If we don't have a buf, allocate and assign one */ - if (!buf && ((flags & SOFT_LINK) || (flags & HARD_LINK))) { - buf = &new_buf; - if (lstat (base, buf) == -1) { - if (quiet < 2) - error (0, errno, _("can't resolve %s"), - base); - return NULL; - } - } - - /* Permit semi local (inter-tree) soft links */ - if (flags & SOFT_LINK) { - assert (buf); /* initialised above */ - if (S_ISLNK (buf->st_mode)) { - /* Is a symlink, resolve it. */ - char *softlink = ult_softlink (base); - if (softlink) { - free (base); - base = softlink; - } else - return NULL; - } - } - - /* Only deal with local (inter-dir) HARD links */ - if (flags & HARD_LINK) { - assert (buf); /* initialised above */ - if (buf->st_nlink > 1) { - /* Has HARD links, find least value */ - char *hardlink = ult_hardlink (base, - buf->st_ino); - if (hardlink) { - free (base); - base = hardlink; - } - } + /* If we don't have a buf, allocate and assign one */ + if (!buf && ((flags & SOFT_LINK) || (flags & HARD_LINK))) { + buf = &new_buf; + if (lstat (base, buf) == -1) { + if (quiet < 2) + error (0, errno, _("can't resolve %s"), base); + goto err; } } - /* keep a check on recursion level */ - else if (recurse == 10) { - if (quiet < 2) - error (0, 0, _("%s is self referencing"), name); - return NULL; + /* Permit semi local (inter-tree) soft links */ + if (flags & SOFT_LINK) { + assert (buf); /* initialised above */ + if (S_ISLNK (buf->st_mode)) { + /* Is a symlink, resolve it. */ + char *softlink = ult_softlink (base); + if (softlink) { + free (base); + base = softlink; + } else + goto err; + } } - if (flags & SO_LINK) { - const char *buffer; - char *decomp_base; - decompress *decomp; - char *include; - struct stat st; - - if (stat (base, &st) < 0) { - struct compression *comp = comp_file (base); - - if (comp) { + /* Only deal with local (inter-dir) HARD links */ + if (flags & HARD_LINK) { + assert (buf); /* initialised above */ + if (buf->st_nlink > 1) { + /* Has HARD links, find least value */ + char *hardlink = ult_hardlink (base, + buf->st_ino); + if (hardlink) { free (base); - base = comp->stem; - comp->stem = NULL; /* steal memory */ - } else { - if (quiet < 2) - error (0, errno, _("can't open %s"), - base); - return NULL; + base = hardlink; } } + } - /* base may change for recursive calls to ult_src, but - * decompress_open doesn't keep its own copy. - */ - decomp_base = xstrdup (base); - decomp = decompress_open (decomp_base, - DECOMPRESS_ALLOW_INPROCESS); - if (!decomp) { - if (quiet < 2) - error (0, errno, _("can't open %s"), base); - free (decomp_base); - return NULL; - } - decompress_start (decomp); + if (flags & SO_LINK) { + int i; + for (i = 0; i < 10; ++i) { + char *directive, *include; - /* make sure that we skip over any comments */ - do { - buffer = decompress_readline (decomp); - } while (buffer && STRNEQ (buffer, ".\\\"", 3)); + directive = find_include_directive (base); + if (!directive) + goto err; - include = test_for_include (buffer); - if (include) { - char *new_name; - const char *ult; + include = test_for_include (directive); + free (directive); + if (!include) + break; free (base); base = find_include (name, path, include); free (include); + if (!base) + goto err; debug ("ult_src: points to %s\n", base); - recurse++; - /* Take a copy; it's unwise to pass base directly to - * a recursive call, as it may be freed. - */ - new_name = xstrdup (base); - ult = ult_src (new_name, path, NULL, flags, trace); - free (new_name); - recurse--; - - decompress_wait (decomp); - decompress_free (decomp); - free (decomp_base); - return ult; + gl_list_add_last (value->trace, xstrdup (base)); + } + if (i == 10) { + if (quiet < 2) + error (0, 0, _("%s is self referencing"), + name); + goto err; } - - decompress_wait (decomp); - decompress_free (decomp); - free (decomp_base); } /* We have the ultimate source */ - if (trace) - gl_list_add_last (trace, xstrdup (base)); - return base; + value->path = xstrdup (base); + gl_list_add_last (value->trace, xstrdup (base)); + gl_map_put (ult_cache, key, value); + free (base); + return value; + +err: + /* The cache is short-lived and only within a single process, so + * negative caching is fine. + */ + ult_value_free (value); + gl_map_put (ult_cache, key, NULL); + free (base); + return NULL; } diff --git a/src/ult_src.h b/src/ult_src.h index 857700d4..833d6008 100644 --- a/src/ult_src.h +++ b/src/ult_src.h @@ -30,10 +30,16 @@ struct stat; -/* If ult_trace is non-NULL, it should be a gl_list_t of const char * which - * ult_src populates with the trace of the link chain from a given file. - * Any names listed here should not have WHATIS_MAN entries created for - * them. - */ -extern const char *ult_src (const char *name, const char *path, - struct stat *buf, int flags, gl_list_t trace); +struct ult_value { + /* Path to the ultimate source file. */ + char *path; + /* A list of `const char *`, containing a trace of the link chain + * from a given file. Any names listed here should not have + * `WHATIS_MAN` entries created for them. + */ + gl_list_t trace; +}; + +extern void gripe_canonicalize_failed (const char *path); +extern const struct ult_value *ult_src (const char *name, const char *path, + struct stat *buf, int flags); diff --git a/src/whatis.c b/src/whatis.c index 05074aad..7306ad71 100644 --- a/src/whatis.c +++ b/src/whatis.c @@ -70,6 +70,7 @@ #include "cleanup.h" #include "debug.h" #include "fatal.h" +#include "filenames.h" #include "glcontainers.h" #include "pipeline.h" #include "pathsearch.h" @@ -123,22 +124,29 @@ static const char args_doc[] = N_("KEYWORD..."); static const char apropos_doc[] = "\v" N_("The --regex option is enabled by default."); static struct argp_option options[] = { - { "debug", 'd', 0, 0, N_("emit debugging messages") }, - { "verbose", 'v', 0, 0, N_("print verbose warning messages") }, - { "regex", 'r', 0, 0, N_("interpret each keyword as a regex"), 10 }, - { "exact", 'e', 0, 0, N_("search each keyword for exact match") }, /* apropos only */ - { "wildcard", 'w', 0, 0, N_("the keyword(s) contain wildcards") }, - { "and", 'a', 0, 0, N_("require all keywords to match"), 20 }, /* apropos only */ - { "long", 'l', 0, 0, N_("do not trim output to terminal width"), 30 }, - { "sections", 's', N_("LIST"), 0, N_("search only these sections (colon-separated)"), 40 }, - { "section", 0, 0, OPTION_ALIAS }, - { "systems", 'm', N_("SYSTEM"), 0, N_("use manual pages from other systems") }, - { "manpath", 'M', N_("PATH"), 0, N_("set search path for manual pages to PATH") }, - { "locale", 'L', N_("LOCALE"), 0, N_("define the locale for this search") }, - { "config-file", 'C', N_("FILE"), 0, N_("use this user configuration file") }, - { "whatis", 'f', 0, OPTION_HIDDEN, 0 }, - { "apropos", 'k', 0, OPTION_HIDDEN, 0 }, - { 0, 'h', 0, OPTION_HIDDEN, 0 }, /* compatibility for --help */ + OPT ("debug", 'd', 0, N_("emit debugging messages")), + OPT ("verbose", 'v', 0, N_("print verbose warning messages")), + OPT ("regex", 'r', 0, N_("interpret each keyword as a regex"), 10), + /* apropos only */ + OPT ("exact", 'e', 0, N_("search each keyword for exact match")), + OPT ("wildcard", 'w', 0, N_("the keyword(s) contain wildcards")), + /* apropos only */ + OPT ("and", 'a', 0, N_("require all keywords to match"), 20), + OPT ("long", 'l', 0, N_("do not trim output to terminal width"), 30), + OPT ("sections", 's', N_("LIST"), + N_("search only these sections (colon-separated)"), 40), + OPT_ALIAS ("section", 0), + OPT ("systems", 'm', N_("SYSTEM"), + N_("use manual pages from other systems")), + OPT ("manpath", 'M', N_("PATH"), + N_("set search path for manual pages to PATH")), + OPT ("locale", 'L', N_("LOCALE"), + N_("define the locale for this search")), + OPT ("config-file", 'C', N_("FILE"), + N_("use this user configuration file")), + OPT_HIDDEN ("whatis", 'f'), + OPT_HIDDEN ("apropos", 'k'), + OPT_HELP_COMPAT, { 0 } }; @@ -487,7 +495,7 @@ static bool suitable_manpath (const char *manpath, const char *page_dir) gl_list_t page_manpathlist; bool ret; - page_manp = get_manpath_from_path (page_dir, 0); + page_manp = get_manpath_from_path (page_dir, false); if (!page_manp || !*page_manp) { free (page_manp); return false; @@ -689,9 +697,7 @@ static void do_apropos (MYDBM_FILE dbf, while (!end) { #endif /* !BTREE */ char *tab; - struct mandata info; - - memset (&info, 0, sizeof (info)); + struct mandata *info = NULL; /* bug#4372, NULL pointer dereference in MYDBM_DPTR (cont), * fix by dassen@wi.leidenuniv.nl (J.H.M.Dassen), thanx Ray. @@ -720,19 +726,19 @@ static void do_apropos (MYDBM_FILE dbf, /* a real page */ - split_content (dbf, MYDBM_DPTR (cont), &info); + info = split_content (dbf, MYDBM_DPTR (cont)); /* If there are sections given, does any of them match * either the section or extension of this page? */ if (sections) { char * const *section; - int matched = 0; + bool matched = false; for (section = sections; *section; ++section) { - if (STREQ (*section, info.sec) || - STREQ (*section, info.ext)) { - matched = 1; + if (STREQ (*section, info->sec) || + STREQ (*section, info->ext)) { + matched = true; break; } } @@ -751,14 +757,14 @@ static void do_apropos (MYDBM_FILE dbf, if (am_apropos) { char *whatis; - whatis = info.whatis ? xstrdup (info.whatis) : NULL; + whatis = info->whatis ? xstrdup (info->whatis) : NULL; if (!combine (num_pages, found_here) && whatis) parse_whatis (pages, num_pages, whatis, found, found_here); free (whatis); } if (combine (num_pages, found_here)) - display (dbf, &info, MYDBM_DPTR (key)); + display (dbf, info, MYDBM_DPTR (key)); if (tab) *tab = '\t'; @@ -778,8 +784,7 @@ nextpage: end = man_btree_nextkeydata (dbf, &key, &cont); #endif /* !BTREE */ #pragma GCC diagnostic pop - info.addr = NULL; /* == MYDBM_DPTR (cont), freed above */ - free_mandata_elements (&info); + free_mandata_struct (info); } free (found_here); diff --git a/src/zsoelim.c b/src/zsoelim.c index 33fc6f1a..6a282964 100644 --- a/src/zsoelim.c +++ b/src/zsoelim.c @@ -815,6 +815,7 @@ char *yytext; #undef ACCEPT_QUOTES /* accept quoted roff requests */ #include <assert.h> +#include <stdbool.h> #include <string.h> #include <stdlib.h> #include <unistd.h> @@ -840,10 +841,12 @@ char *yytext; #define _(String) gettext (String) #include "appendstr.h" +#include "compression.h" #include "debug.h" -#include "decompress.h" #include "fatal.h" #include "glcontainers.h" + +#include "decompress.h" #include "globbing.h" #include "zsoelim.h" @@ -859,7 +862,7 @@ static char *so_name[MAX_SO_DEPTH]; static int so_line[MAX_SO_DEPTH]; static decompress *so_pipe[MAX_SO_DEPTH]; static int so_stack_ptr; -static int no_newline; +static bool no_newline; static gl_list_t so_manpathlist; static const char *so_parent_path; @@ -883,9 +886,9 @@ struct zsoelim_stdin_data { result = YY_NULL; \ } #define YY_NO_INPUT -#line 887 "zsoelim.c" +#line 890 "zsoelim.c" -#line 889 "zsoelim.c" +#line 892 "zsoelim.c" #define INITIAL 0 #define so 1 @@ -1108,10 +1111,10 @@ YY_DECL } { -#line 143 "zsoelim.l" +#line 146 "zsoelim.l" -#line 1115 "zsoelim.c" +#line 1118 "zsoelim.c" while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */ { @@ -1159,69 +1162,69 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 145 "zsoelim.l" +#line 148 "zsoelim.l" { - no_newline = 1; + no_newline = true; ECHO; BEGIN (de); /* Now we're inside of a macro definition: ends with a comment */ } YY_BREAK case 2: YY_RULE_SETUP -#line 151 "zsoelim.l" +#line 154 "zsoelim.l" { - no_newline = 1; + no_newline = true; BEGIN (so); /* Now we're in the .so environment */ } YY_BREAK case 3: YY_RULE_SETUP -#line 156 "zsoelim.l" +#line 159 "zsoelim.l" { - no_newline = 1; + no_newline = true; ECHO; /* Now we're in the .lf environment */ BEGIN (lfnumber); } YY_BREAK case 4: -#line 163 "zsoelim.l" +#line 166 "zsoelim.l" case 5: /* rule 5 can match eol */ -#line 164 "zsoelim.l" +#line 167 "zsoelim.l" case 6: /* rule 6 can match eol */ -#line 165 "zsoelim.l" +#line 168 "zsoelim.l" case 7: /* rule 7 can match eol */ -#line 166 "zsoelim.l" +#line 169 "zsoelim.l" case 8: /* rule 8 can match eol */ -#line 167 "zsoelim.l" +#line 170 "zsoelim.l" case 9: /* rule 9 can match eol */ -#line 168 "zsoelim.l" +#line 171 "zsoelim.l" case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 168 "zsoelim.l" +#line 171 "zsoelim.l" { - no_newline = 1; + no_newline = true; ECHO; } YY_BREAK case 11: /* rule 11 can match eol */ YY_RULE_SETUP -#line 173 "zsoelim.l" +#line 176 "zsoelim.l" { - no_newline = 0; + no_newline = false; putchar ('\n'); LINE++; } YY_BREAK case 12: YY_RULE_SETUP -#line 180 "zsoelim.l" +#line 183 "zsoelim.l" { /* file names including whitespace ? */ if (so_stack_ptr == MAX_SO_DEPTH - 1) fatal (0, @@ -1233,7 +1236,7 @@ YY_RULE_SETUP so_stack[so_stack_ptr++] = YY_CURRENT_BUFFER; LINE = 1; - no_newline = 0; + no_newline = false; if (zsoelim_open_file (yytext, so_manpathlist, so_parent_path)) { @@ -1257,18 +1260,18 @@ YY_RULE_SETUP case 13: /* rule 13 can match eol */ YY_RULE_SETUP -#line 212 "zsoelim.l" +#line 215 "zsoelim.l" { - no_newline = 0; + no_newline = false; BEGIN (INITIAL); } YY_BREAK case 14: /* rule 14 can match eol */ YY_RULE_SETUP -#line 217 "zsoelim.l" +#line 220 "zsoelim.l" { - no_newline = 0; + no_newline = false; error (OK, 0, _("%s:%d: warning: newline in .so request, " "ignoring"), @@ -1280,36 +1283,36 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 228 "zsoelim.l" +#line 231 "zsoelim.l" { - no_newline = 1; + no_newline = true; ECHO; BEGIN (INITIAL); } YY_BREAK case 16: YY_RULE_SETUP -#line 234 "zsoelim.l" +#line 237 "zsoelim.l" { - no_newline = 1; + no_newline = true; ECHO; } YY_BREAK case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 239 "zsoelim.l" +#line 242 "zsoelim.l" { - no_newline = 0; + no_newline = false; putchar ('\n'); LINE++; } YY_BREAK case 18: YY_RULE_SETUP -#line 246 "zsoelim.l" +#line 249 "zsoelim.l" { - no_newline = 1; + no_newline = true; ECHO; ZAP_QUOTES; LINE = atoi (yytext); @@ -1318,9 +1321,9 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 254 "zsoelim.l" +#line 257 "zsoelim.l" { /* file names including whitespace ?? */ - no_newline = 1; + no_newline = true; ECHO; putchar ('\n'); ZAP_QUOTES; @@ -1332,18 +1335,18 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 265 "zsoelim.l" +#line 268 "zsoelim.l" { - no_newline = 1; + no_newline = true; ECHO; } YY_BREAK case 21: /* rule 21 can match eol */ YY_RULE_SETUP -#line 270 "zsoelim.l" +#line 273 "zsoelim.l" { - no_newline = 0; + no_newline = false; putchar ('\n'); LINE++; BEGIN (INITIAL); @@ -1351,9 +1354,9 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 277 "zsoelim.l" +#line 280 "zsoelim.l" { - no_newline = 1; + no_newline = true; debug ( "%s:%d: warning: unhandled .lf request; " "line numbers may be wrong\n", @@ -1365,9 +1368,9 @@ YY_RULE_SETUP case 23: /* rule 23 can match eol */ YY_RULE_SETUP -#line 287 "zsoelim.l" +#line 290 "zsoelim.l" { - no_newline = 0; + no_newline = false; error (OK, 0, _("%s:%d: warning: newline in .lf request, " "ignoring"), @@ -1383,7 +1386,7 @@ case YY_STATE_EOF(de): case YY_STATE_EOF(end_request): case YY_STATE_EOF(lfnumber): case YY_STATE_EOF(lfname): -#line 298 "zsoelim.l" +#line 301 "zsoelim.l" { decompress_wait (PIPE); decompress_free (PIPE); @@ -1401,16 +1404,16 @@ case YY_STATE_EOF(lfname): yy_switch_to_buffer (so_stack[so_stack_ptr]); printf (".lf %d %s\n", LINE += 1, NAME); } - no_newline = 0; + no_newline = false; BEGIN (end_request); } YY_BREAK case 24: YY_RULE_SETUP -#line 318 "zsoelim.l" +#line 321 "zsoelim.l" ECHO; YY_BREAK -#line 1414 "zsoelim.c" +#line 1417 "zsoelim.c" case YY_END_OF_BUFFER: { @@ -2369,7 +2372,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 318 "zsoelim.l" +#line 321 "zsoelim.l" #ifdef ACCEPT_QUOTES @@ -2443,8 +2446,8 @@ static decompress *try_compressed (char **filename) /* This routine is used to open the specified file or uncompress a compressed version and open that instead */ -int zsoelim_open_file (const char *filename, gl_list_t manpathlist, - const char *parent_path) +bool zsoelim_open_file (const char *filename, gl_list_t manpathlist, + const char *parent_path) { decompress *decomp; @@ -2529,7 +2532,7 @@ int zsoelim_open_file (const char *filename, gl_list_t manpathlist, if (parent_path) { names = look_for_file (parent_path, sec, name, - 0, LFF_MATCHCASE); + false, LFF_MATCHCASE); GL_LIST_FOREACH (names, found_name) { decomp = decompress_open (found_name, @@ -2548,7 +2551,7 @@ int zsoelim_open_file (const char *filename, gl_list_t manpathlist, continue; names = look_for_file (mp, sec, name, - 0, LFF_MATCHCASE); + false, LFF_MATCHCASE); GL_LIST_FOREACH (names, found_name) { decomp = decompress_open (found_name, @@ -2582,7 +2585,7 @@ int zsoelim_open_file (const char *filename, gl_list_t manpathlist, out: if (!decomp) { error (0, errno, _("can't open %s"), filename); - return 1; + return true; } } @@ -2593,7 +2596,7 @@ out: /* only used by YY_INPUT, which casts it back to 'decompress *' */ yyin = (FILE *) decomp; - return 0; + return false; } void zsoelim_stdin (void *data) diff --git a/src/zsoelim.h b/src/zsoelim.h index d7481566..901732d3 100644 --- a/src/zsoelim.h +++ b/src/zsoelim.h @@ -20,10 +20,12 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <stdbool.h> + #include "gl_list.h" -int zsoelim_open_file (const char *filename, gl_list_t manpathlist, - const char *parent_path); +bool zsoelim_open_file (const char *filename, gl_list_t manpathlist, + const char *parent_path); void zsoelim_parse_file (gl_list_t manpathlist, const char *parent_path); struct zsoelim_stdin_data; diff --git a/src/zsoelim.l b/src/zsoelim.l index 845f6f44..b5579bf2 100644 --- a/src/zsoelim.l +++ b/src/zsoelim.l @@ -58,6 +58,7 @@ #undef ACCEPT_QUOTES /* accept quoted roff requests */ #include <assert.h> +#include <stdbool.h> #include <string.h> #include <stdlib.h> #include <unistd.h> @@ -83,10 +84,12 @@ #define _(String) gettext (String) #include "appendstr.h" +#include "compression.h" #include "debug.h" -#include "decompress.h" #include "fatal.h" #include "glcontainers.h" + +#include "decompress.h" #include "globbing.h" #include "zsoelim.h" @@ -102,7 +105,7 @@ static char *so_name[MAX_SO_DEPTH]; static int so_line[MAX_SO_DEPTH]; static decompress *so_pipe[MAX_SO_DEPTH]; static int so_stack_ptr; -static int no_newline; +static bool no_newline; static gl_list_t so_manpathlist; static const char *so_parent_path; @@ -143,18 +146,18 @@ W [ \t] %% ^\.de{W}*.+ { - no_newline = 1; + no_newline = true; ECHO; BEGIN (de); /* Now we're inside of a macro definition: ends with a comment */ } ^\.so{W}* { - no_newline = 1; + no_newline = true; BEGIN (so); /* Now we're in the .so environment */ } ^\.lf{W}* { - no_newline = 1; + no_newline = true; ECHO; /* Now we're in the .lf environment */ BEGIN (lfnumber); } @@ -166,12 +169,12 @@ W [ \t] ^\.s | ^\.l | . { - no_newline = 1; + no_newline = true; ECHO; } \n { - no_newline = 0; + no_newline = false; putchar ('\n'); LINE++; } @@ -188,7 +191,7 @@ W [ \t] so_stack[so_stack_ptr++] = YY_CURRENT_BUFFER; LINE = 1; - no_newline = 0; + no_newline = false; if (zsoelim_open_file (yytext, so_manpathlist, so_parent_path)) { @@ -210,12 +213,12 @@ W [ \t] } <end_request>{W}*\n { - no_newline = 0; + no_newline = false; BEGIN (INITIAL); } <so>\n { - no_newline = 0; + no_newline = false; error (OK, 0, _("%s:%d: warning: newline in .so request, " "ignoring"), @@ -226,25 +229,25 @@ W [ \t] } <de>^\.\..* { - no_newline = 1; + no_newline = true; ECHO; BEGIN (INITIAL); } <de>.* { - no_newline = 1; + no_newline = true; ECHO; } <de>\n { - no_newline = 0; + no_newline = false; putchar ('\n'); LINE++; } <lfnumber>\"?[0-9]+\"? { - no_newline = 1; + no_newline = true; ECHO; ZAP_QUOTES; LINE = atoi (yytext); @@ -252,7 +255,7 @@ W [ \t] } <lfname>\"?[^ \t\n\"]+\"? { /* file names including whitespace ?? */ - no_newline = 1; + no_newline = true; ECHO; putchar ('\n'); ZAP_QUOTES; @@ -263,19 +266,19 @@ W [ \t] } <lfname>{W}+ { - no_newline = 1; + no_newline = true; ECHO; } <lfname>\n { - no_newline = 0; + no_newline = false; putchar ('\n'); LINE++; BEGIN (INITIAL); } <lfnumber,lfname>. { - no_newline = 1; + no_newline = true; debug ( "%s:%d: warning: unhandled .lf request; " "line numbers may be wrong\n", @@ -285,7 +288,7 @@ W [ \t] } <lfnumber>\n { - no_newline = 0; + no_newline = false; error (OK, 0, _("%s:%d: warning: newline in .lf request, " "ignoring"), @@ -312,7 +315,7 @@ W [ \t] yy_switch_to_buffer (so_stack[so_stack_ptr]); printf (".lf %d %s\n", LINE += 1, NAME); } - no_newline = 0; + no_newline = false; BEGIN (end_request); } %% @@ -388,8 +391,8 @@ static decompress *try_compressed (char **filename) /* This routine is used to open the specified file or uncompress a compressed version and open that instead */ -int zsoelim_open_file (const char *filename, gl_list_t manpathlist, - const char *parent_path) +bool zsoelim_open_file (const char *filename, gl_list_t manpathlist, + const char *parent_path) { decompress *decomp; @@ -474,7 +477,7 @@ int zsoelim_open_file (const char *filename, gl_list_t manpathlist, if (parent_path) { names = look_for_file (parent_path, sec, name, - 0, LFF_MATCHCASE); + false, LFF_MATCHCASE); GL_LIST_FOREACH (names, found_name) { decomp = decompress_open (found_name, @@ -493,7 +496,7 @@ int zsoelim_open_file (const char *filename, gl_list_t manpathlist, continue; names = look_for_file (mp, sec, name, - 0, LFF_MATCHCASE); + false, LFF_MATCHCASE); GL_LIST_FOREACH (names, found_name) { decomp = decompress_open (found_name, @@ -527,7 +530,7 @@ int zsoelim_open_file (const char *filename, gl_list_t manpathlist, out: if (!decomp) { error (0, errno, _("can't open %s"), filename); - return 1; + return true; } } @@ -538,7 +541,7 @@ out: /* only used by YY_INPUT, which casts it back to 'decompress *' */ yyin = (FILE *) decomp; - return 0; + return false; } void zsoelim_stdin (void *data) diff --git a/src/zsoelim_main.c b/src/zsoelim_main.c index 6eba08ce..b4057b47 100644 --- a/src/zsoelim_main.c +++ b/src/zsoelim_main.c @@ -69,9 +69,9 @@ error_t argp_err_exit_status = FAIL; static const char args_doc[] = N_("FILE..."); static struct argp_option options[] = { - { "debug", 'd', 0, 0, N_("emit debugging messages") }, - { "compatible", 'C', 0, 0, N_("compatibility switch (ignored)"), 1 }, - { 0, 'h', 0, OPTION_HIDDEN, 0 }, /* compatibility for --help */ + OPT ("debug", 'd', 0, N_("emit debugging messages")), + OPT ("compatible", 'C', 0, N_("compatibility switch (ignored)"), 1), + OPT_HELP_COMPAT, { 0 } }; diff --git a/tools/Makefile.in b/tools/Makefile.in index afd8be30..10e86035 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -213,6 +213,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/pthread_sigmask.m4 \ $(top_srcdir)/gl/m4/raise.m4 $(top_srcdir)/gl/m4/rawmemchr.m4 \ $(top_srcdir)/gl/m4/readdir.m4 $(top_srcdir)/gl/m4/readlink.m4 \ + $(top_srcdir)/gl/m4/readlinkat.m4 \ $(top_srcdir)/gl/m4/realloc.m4 \ $(top_srcdir)/gl/m4/reallocarray.m4 \ $(top_srcdir)/gl/m4/regex.m4 $(top_srcdir)/gl/m4/rename.m4 \ @@ -224,8 +225,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sigaction.m4 \ $(top_srcdir)/gl/m4/signal_h.m4 \ $(top_srcdir)/gl/m4/signalblocking.m4 \ - $(top_srcdir)/gl/m4/size_max.m4 $(top_srcdir)/gl/m4/sleep.m4 \ - $(top_srcdir)/gl/m4/socketlib.m4 \ + $(top_srcdir)/gl/m4/sigpipe.m4 $(top_srcdir)/gl/m4/size_max.m4 \ + $(top_srcdir)/gl/m4/sleep.m4 $(top_srcdir)/gl/m4/socketlib.m4 \ $(top_srcdir)/gl/m4/sockets.m4 $(top_srcdir)/gl/m4/socklen.m4 \ $(top_srcdir)/gl/m4/ssize_t.m4 \ $(top_srcdir)/gl/m4/stat-time.m4 $(top_srcdir)/gl/m4/stat.m4 \ @@ -233,7 +234,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/stdbool.m4 $(top_srcdir)/gl/m4/stddef_h.m4 \ $(top_srcdir)/gl/m4/stdint.m4 $(top_srcdir)/gl/m4/stdint_h.m4 \ $(top_srcdir)/gl/m4/stdio_h.m4 $(top_srcdir)/gl/m4/stdlib_h.m4 \ - $(top_srcdir)/gl/m4/strcase.m4 \ + $(top_srcdir)/gl/m4/stpcpy.m4 $(top_srcdir)/gl/m4/strcase.m4 \ $(top_srcdir)/gl/m4/strcasestr.m4 \ $(top_srcdir)/gl/m4/strchrnul.m4 $(top_srcdir)/gl/m4/strdup.m4 \ $(top_srcdir)/gl/m4/strerror.m4 \ @@ -252,6 +253,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/man-arg-automatic-create.m4 \ $(top_srcdir)/gl/m4/sys_uio_h.m4 \ $(top_srcdir)/gl/m4/sysexits.m4 \ $(top_srcdir)/gl/m4/tempname.m4 \ + $(top_srcdir)/gl/m4/termios_h.m4 \ $(top_srcdir)/gl/m4/threadlib.m4 $(top_srcdir)/gl/m4/time_h.m4 \ $(top_srcdir)/gl/m4/timespec.m4 \ $(top_srcdir)/gl/m4/unistd-safer.m4 \ @@ -353,6 +355,7 @@ ERRNO_H = @ERRNO_H@ ETAGS = @ETAGS@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ +FILECMD = @FILECMD@ FLOAT_H = @FLOAT_H@ FNMATCH_H = @FNMATCH_H@ GETOPT_CDEFS_H = @GETOPT_CDEFS_H@ @@ -373,6 +376,7 @@ GL_GNULIB_CALLOC_GNU = @GL_GNULIB_CALLOC_GNU@ GL_GNULIB_CALLOC_POSIX = @GL_GNULIB_CALLOC_POSIX@ GL_GNULIB_CANONICALIZE_FILE_NAME = @GL_GNULIB_CANONICALIZE_FILE_NAME@ GL_GNULIB_CHDIR = @GL_GNULIB_CHDIR@ +GL_GNULIB_CHMOD = @GL_GNULIB_CHMOD@ GL_GNULIB_CHOWN = @GL_GNULIB_CHOWN@ GL_GNULIB_CLOSE = @GL_GNULIB_CLOSE@ GL_GNULIB_CLOSEDIR = @GL_GNULIB_CLOSEDIR@ @@ -664,6 +668,7 @@ GL_GNULIB_STRVERSCMP = @GL_GNULIB_STRVERSCMP@ GL_GNULIB_SYMLINK = @GL_GNULIB_SYMLINK@ GL_GNULIB_SYMLINKAT = @GL_GNULIB_SYMLINKAT@ GL_GNULIB_SYSTEM_POSIX = @GL_GNULIB_SYSTEM_POSIX@ +GL_GNULIB_TCGETSID = @GL_GNULIB_TCGETSID@ GL_GNULIB_TIMEGM = @GL_GNULIB_TIMEGM@ GL_GNULIB_TIMESPEC_GET = @GL_GNULIB_TIMESPEC_GET@ GL_GNULIB_TIMESPEC_GETRES = @GL_GNULIB_TIMESPEC_GETRES@ @@ -792,6 +797,7 @@ HAVE_DECL_STRSIGNAL = @HAVE_DECL_STRSIGNAL@ HAVE_DECL_STRTOIMAX = @HAVE_DECL_STRTOIMAX@ HAVE_DECL_STRTOK_R = @HAVE_DECL_STRTOK_R@ HAVE_DECL_STRTOUMAX = @HAVE_DECL_STRTOUMAX@ +HAVE_DECL_TCGETSID = @HAVE_DECL_TCGETSID@ HAVE_DECL_TRUNCATE = @HAVE_DECL_TRUNCATE@ HAVE_DECL_TTYNAME_R = @HAVE_DECL_TTYNAME_R@ HAVE_DECL_UNSETENV = @HAVE_DECL_UNSETENV@ @@ -969,6 +975,7 @@ HAVE_SYS_SOCKET_H = @HAVE_SYS_SOCKET_H@ HAVE_SYS_TIME_H = @HAVE_SYS_TIME_H@ HAVE_SYS_TYPES_H = @HAVE_SYS_TYPES_H@ HAVE_SYS_UIO_H = @HAVE_SYS_UIO_H@ +HAVE_TERMIOS_H = @HAVE_TERMIOS_H@ HAVE_TIMEGM = @HAVE_TIMEGM@ HAVE_TIMESPEC_GET = @HAVE_TIMESPEC_GET@ HAVE_TIMESPEC_GETRES = @HAVE_TIMESPEC_GETRES@ @@ -1124,6 +1131,7 @@ NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_STAT_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H@ NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H = @NEXT_AS_FIRST_DIRECTIVE_SYS_UIO_H@ +NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H = @NEXT_AS_FIRST_DIRECTIVE_TERMIOS_H@ NEXT_AS_FIRST_DIRECTIVE_TIME_H = @NEXT_AS_FIRST_DIRECTIVE_TIME_H@ NEXT_AS_FIRST_DIRECTIVE_UNISTD_H = @NEXT_AS_FIRST_DIRECTIVE_UNISTD_H@ NEXT_AS_FIRST_DIRECTIVE_UTIME_H = @NEXT_AS_FIRST_DIRECTIVE_UTIME_H@ @@ -1159,6 +1167,7 @@ NEXT_SYS_STAT_H = @NEXT_SYS_STAT_H@ NEXT_SYS_TIME_H = @NEXT_SYS_TIME_H@ NEXT_SYS_TYPES_H = @NEXT_SYS_TYPES_H@ NEXT_SYS_UIO_H = @NEXT_SYS_UIO_H@ +NEXT_TERMIOS_H = @NEXT_TERMIOS_H@ NEXT_TIME_H = @NEXT_TIME_H@ NEXT_UNISTD_H = @NEXT_UNISTD_H@ NEXT_UTIME_H = @NEXT_UTIME_H@ @@ -1195,6 +1204,7 @@ REPLACE_BTOWC = @REPLACE_BTOWC@ REPLACE_CALLOC_FOR_CALLOC_GNU = @REPLACE_CALLOC_FOR_CALLOC_GNU@ REPLACE_CALLOC_FOR_CALLOC_POSIX = @REPLACE_CALLOC_FOR_CALLOC_POSIX@ REPLACE_CANONICALIZE_FILE_NAME = @REPLACE_CANONICALIZE_FILE_NAME@ +REPLACE_CHMOD = @REPLACE_CHMOD@ REPLACE_CHOWN = @REPLACE_CHOWN@ REPLACE_CLOSE = @REPLACE_CLOSE@ REPLACE_CLOSEDIR = @REPLACE_CLOSEDIR@ |