diff options
36 files changed, 3059 insertions, 1375 deletions
@@ -1,622 +1,281 @@ GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + Version 2, June 1991 - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + 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 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 + 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 -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. +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 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. + 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 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. +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. - 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 + 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. - 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 + 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 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 +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 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. +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 @@ -628,15 +287,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 -state the exclusion of warranty; and each file should have at least +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 + 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 + 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, @@ -644,31 +303,37 @@ 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, see <http://www.gnu.org/licenses/>. + 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 does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + 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, 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 -<http://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 -<http://www.gnu.org/philosophy/why-not-lgpl.html>. +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. @@ -1,5 +1,176 @@ # Generated by Makefile. Do not edit. +commit 7c9386dbac2fee761a09044158c8cdccd742310a +Author: Guido Günther <agx@sigxcpu.org> +Date: Sun Sep 12 13:59:10 2010 +0200 + + Release 0.17 + + NEWS | 18 ++++++++++++++++-- + configure.ac | 2 +- + 2 files changed, 17 insertions(+), 3 deletions(-) + +commit 120f97bae3d0699507e4ed58dcfead5ae0f7a0f0 +Author: Bruno Brouard <annoa.b@gmail.com> +Date: Thu Aug 19 11:19:24 2010 +0200 + + Updated French translation + + po/fr.po | 71 +++++++++++++++++++++++++++++++++---------------------------- + 1 files changed, 38 insertions(+), 33 deletions(-) + +commit 6451f9f6918349c57286d403efaea64b3c393a65 +Author: Guido Günther <agx@sigxcpu.org> +Date: Thu Aug 12 17:40:56 2010 +0200 + + Add GPLv2 + + BZ: #626734 + + .gitignore | 1 - + COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 339 insertions(+), 1 deletions(-) + +commit 52e1e89bda7e75d1489bbc0e2759cca52ec467a9 +Author: Yinghua Wang <wantinghard@gmail.com> +Date: Wed Aug 11 19:33:28 2010 +0800 + + Add Simplified Chinese translation. + + po/LINGUAS | 1 + + po/zh_CN.po | 1719 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 1720 insertions(+), 0 deletions(-) + +commit 70dfcaaa9e32180afa13fded9768319766b76b18 +Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com> +Date: Thu Aug 5 14:59:39 2010 +0200 + + Updated Slovenian translation + + po/sl.po | 25 ++++++++++++------------- + 1 files changed, 12 insertions(+), 13 deletions(-) + +commit cadac4c29c956d59c8253fe0d9906979d0c3f69d +Author: Andrej Žnidaršič <andrej.znidarsic@gmail.com> +Date: Sat Jul 31 18:54:07 2010 +0200 + + Updated Slovenian translation + + po/sl.po | 112 ++++++++++++++----------------------------------------------- + 1 files changed, 26 insertions(+), 86 deletions(-) + +commit 85f1fa074112da0a48b1c610ce63d4d495000d73 +Author: Guido Günther <agx@sigxcpu.org> +Date: Thu Jul 29 12:24:44 2010 +0200 + + Add --with-gtk + + to select the GTK+ version used. Code taken from gtk-vnc. + + configure.ac | 37 +++++++++++++++++++++++++++++-------- + 1 files changed, 29 insertions(+), 8 deletions(-) + +commit 45f476929622b14a210dd8c6b493506a4f2889a9 +Author: Jorge González <jorgegonz@svn.gnome.org> +Date: Wed Jul 28 17:15:43 2010 +0200 + + Updated Spanish translation + + po/es.po | 74 +++++++++++++++++++++++++++++++++---------------------------- + 1 files changed, 40 insertions(+), 34 deletions(-) + +commit ecb0378e02aa2a83ea00568e1215d6c804b140f3 +Author: Mario Blättermann <mariobl@gnome.org> +Date: Tue Jul 27 00:23:46 2010 +0200 + + [i18n] Updated German translation + + po/de.po | 64 +++++++++++++++++++++++++++++++------------------------------- + 1 files changed, 32 insertions(+), 32 deletions(-) + +commit 27b83b9fc2608cb9083802255787bac1433e17e7 +Author: Guido Günther <agx@sigxcpu.org> +Date: Mon Jul 26 13:23:35 2010 +0200 + + Mark string for translation + + Thanks: Petter Reinholdtsen + + src/ka-applet.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit d6a8adf873c988c3e53fdeafc1b50a73bf17e3ec +Author: Petter Reinholdtsen <pere@hungry.com> +Date: Sun Jul 25 22:19:03 2010 +0200 + + Updated Norwegian bokmål translation. + + po/nb.po | 96 +++++++++++++++++++++++++++++-------------------------------- + 1 files changed, 46 insertions(+), 50 deletions(-) + +commit 9d7f07ffca8a046ec8f049b6c560febbd83509c2 +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Jul 7 17:31:57 2010 +0200 + + Add simple AFS plugin + + that calls aklog or afslog if available. + + plugins/Makefile.am | 17 +++++++ + plugins/ka-plugin-afs.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++ + plugins/ka-plugin-afs.h | 50 ++++++++++++++++++++ + 3 files changed, 181 insertions(+), 0 deletions(-) + +commit 6ec57fd83f9b5604dc377d319e847e02c3bb76a0 +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Jul 7 17:28:12 2010 +0200 + + Reindent plugins + + plugins/ka-plugin-dummy.c | 67 ++++++++++++++++------------------ + plugins/ka-plugin-dummy.h | 13 ++----- + plugins/ka-plugin-pam.c | 88 ++++++++++++++++++++++---------------------- + plugins/ka-plugin-pam.h | 15 ++------ + 4 files changed, 82 insertions(+), 101 deletions(-) + +commit e8232134f1ced866a56270ef4dc36fe29480c97d +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Jul 7 11:07:44 2010 +0200 + + Fail if we can't find krb5-config + + configure.ac | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +commit ddc529abe4b82c9b02731458aade48d67ac7f4d0 +Author: Claude Paroz <claude@2xlibre.net> +Date: Sun Jul 4 22:02:03 2010 +0200 + + Updated French translation + + po/fr.po | 99 +++++++++++++++++++++++++++++++++---------------------------- + 1 files changed, 54 insertions(+), 45 deletions(-) + +commit d7946754b453e4facaa03ddf3c6be41333f06244 +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Jun 30 21:46:31 2010 +0200 + + Use cairo_region_t instead of GdkRegion + + the later doesn't exist in GTK+3 + + gtksecentry/gtksecentry.c | 13 ++++++++++++- + 1 files changed, 12 insertions(+), 1 deletions(-) + +commit a21b7971a3988e2fd6d882eaa794db12dcdc5436 +Author: Guido Günther <agx@sigxcpu.org> +Date: Wed Jun 30 16:09:21 2010 +0200 + + Bump dependencies for GNOME 3.0 + + configure.ac | 16 +++++++--------- + 1 files changed, 7 insertions(+), 9 deletions(-) + commit 255e796fbd5704ce8bd9df09a08f33d7ff8417ab Author: Guido Günther <agx@sigxcpu.org> Date: Tue Jun 29 18:14:52 2010 +0200 diff --git a/Makefile.in b/Makefile.in index 4cbb8a9..d4511ad 100644 --- a/Makefile.in +++ b/Makefile.in @@ -152,8 +152,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ @@ -1,6 +1,20 @@ ============ -Vesion 0.16 -=========== +Version 0.17 +============ +* Add AFS plugin +* Add --with-gtk to select the GTK+ 2 or 3 +* UI translations: + Andrej Žnidaršič (sl) + Bruno Brouard (fr) + Claude Paroz (fr) + Jorge González (es) + Mario Blättermann (de) + Petter Reinholdtsen (nb) + Yinghua Wang (zh_CN) + +============ +Version 0.16 +============ * Add plugin system * Memory leaks plugged * Bug fixes @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, -[m4_warning([this file was generated for autoconf 2.65. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, +[m4_warning([this file was generated for autoconf 2.67. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -1,11 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for krb5-auth-dialog 0.16. +# Generated by GNU Autoconf 2.67 for krb5-auth-dialog 0.17. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -316,7 +316,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -356,19 +356,19 @@ else fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -679,7 +679,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -698,8 +698,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='krb5-auth-dialog' PACKAGE_TARNAME='krb5-auth-dialog' -PACKAGE_VERSION='0.16' -PACKAGE_STRING='krb5-auth-dialog 0.16' +PACKAGE_VERSION='0.17' +PACKAGE_STRING='krb5-auth-dialog 0.17' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -775,8 +775,6 @@ GMODULE_LIBS GMODULE_CFLAGS GIO_LIBS GIO_CFLAGS -GIO_UNIX_LIBS -GIO_UNIX_CFLAGS GCONF_LIBS GCONF_CFLAGS DBUS_LIBS @@ -973,6 +971,7 @@ with_help_dir with_omf_dir with_help_formats enable_scrollkeeper +with_gtk with_gconf_source with_gconf_schema_file_dir enable_schemas_install @@ -1004,8 +1003,6 @@ DBUS_CFLAGS DBUS_LIBS GCONF_CFLAGS GCONF_LIBS -GIO_UNIX_CFLAGS -GIO_UNIX_LIBS GIO_CFLAGS GIO_LIBS GMODULE_CFLAGS @@ -1076,8 +1073,9 @@ do fi case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *=) ac_optarg= ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. @@ -1122,7 +1120,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1148,7 +1146,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1352,7 +1350,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1368,7 +1366,7 @@ do ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1398,8 +1396,8 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1407,7 +1405,7 @@ Try \`$0 --help' for more information." # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1425,13 +1423,13 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1454,7 +1452,7 @@ do [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1468,8 +1466,8 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1484,9 +1482,9 @@ test "$silent" = yes && exec 6>/dev/null ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1525,11 +1523,11 @@ else fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1555,7 +1553,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 krb5-auth-dialog 0.16 to adapt to many kinds of systems. +\`configure' configures krb5-auth-dialog 0.17 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1569,7 +1567,7 @@ Configuration: --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -1626,7 +1624,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of krb5-auth-dialog 0.16:";; + short | recursive ) echo "Configuration of krb5-auth-dialog 0.17:";; esac cat <<\_ACEOF @@ -1668,6 +1666,7 @@ Optional Packages: --with-omf-dir=DIR path to OMF files --with-help-formats=FORMATS list of formats + --with-gtk=2.0|3.0 which gtk+ version to compile against (default: 2.0) --with-gconf-source=sourceaddress Config database for installing schema files. --with-gconf-schema-file-dir=dir @@ -1704,10 +1703,6 @@ Some influential environment variables: GCONF_CFLAGS C compiler flags for GCONF, overriding pkg-config GCONF_LIBS linker flags for GCONF, overriding pkg-config - GIO_UNIX_CFLAGS - C compiler flags for GIO_UNIX, overriding pkg-config - GIO_UNIX_LIBS - linker flags for GIO_UNIX, overriding pkg-config GIO_CFLAGS C compiler flags for GIO, overriding pkg-config GIO_LIBS linker flags for GIO, overriding pkg-config GMODULE_CFLAGS @@ -1789,10 +1784,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -krb5-auth-dialog configure 0.16 -generated by GNU Autoconf 2.65 +krb5-auth-dialog configure 0.17 +generated by GNU Autoconf 2.67 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1895,7 +1890,7 @@ ac_fn_c_check_func () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -1975,7 +1970,7 @@ $as_echo "$ac_try_echo"; } >&5 mv -f conftest.er1 conftest.err fi $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { + test $ac_status = 0; } > conftest.i && { test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || test ! -s conftest.err }; then : @@ -2041,10 +2036,10 @@ fi ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2080,7 +2075,7 @@ if ac_fn_c_try_cpp "$LINENO"; then : else ac_header_preproc=no fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 $as_echo "$ac_header_preproc" >&6; } @@ -2107,7 +2102,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2129,7 +2124,7 @@ ac_fn_c_check_header_compile () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2160,7 +2155,7 @@ ac_fn_c_check_member () as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 $as_echo_n "checking for $2.$3... " >&6; } -if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$4+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2211,8 +2206,8 @@ 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 krb5-auth-dialog $as_me 0.16, which was -generated by GNU Autoconf 2.65. Invocation command line was +It was created by krb5-auth-dialog $as_me 0.17, which was +generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2322,11 +2317,9 @@ trap 'exit_status=$? { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -2360,11 +2353,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -2377,11 +2368,9 @@ _ASBOX echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -2395,11 +2384,9 @@ _ASBOX fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -2454,7 +2441,12 @@ _ACEOF ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -2469,7 +2461,11 @@ do { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2545,7 +2541,7 @@ if $ac_cache_corrupted; then $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -2563,16 +2559,22 @@ am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -2688,11 +2690,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2714,7 +2716,7 @@ if ( # if, for instance, CONFIG_SHELL is bash and it inherits a # broken ls alias from the environment. This has actually # happened. Such a system could not be considered "sane". - as_fn_error "ls -t appears to fail. Make sure there is not a broken + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken alias in your environment" "$LINENO" 5 fi @@ -2724,7 +2726,7 @@ then # Ok. : else - as_fn_error "newly created file is older than distributed files! + as_fn_error $? "newly created file is older than distributed files! Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 @@ -2962,7 +2964,7 @@ done $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -2970,7 +2972,7 @@ SHELL = /bin/sh all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -3004,7 +3006,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then am__isrc=' -I$(srcdir)' # test to see if srcdir already configured if test -f $srcdir/config.status; then - as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 + as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5 fi fi @@ -3020,7 +3022,7 @@ fi # Define the identity of the package. PACKAGE='krb5-auth-dialog' - VERSION='0.16' + VERSION='0.17' cat >>confdefs.h <<_ACEOF @@ -3475,8 +3477,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3590,9 +3592,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3634,8 +3635,8 @@ done else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3692,9 +3693,9 @@ $as_echo "$ac_try_echo"; } >&5 else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3745,8 +3746,8 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4098,7 +4099,7 @@ fi case "$am__api_version" in 1.01234) - as_fn_error "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 ;; *) ;; @@ -4115,7 +4116,7 @@ $as_echo_n "checking for intltool >= 0.35.0... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 $as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - as_fn_error "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 fi # Extract the first word of "intltool-update", so it can be a program name with args. @@ -4239,7 +4240,7 @@ fi if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - as_fn_error "The intltool scripts were not found. Please install intltool." "$LINENO" 5 + as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 fi INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' @@ -4521,13 +4522,13 @@ fi if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5 + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 fi # Extract the first word of "perl", so it can be a program name with args. @@ -4571,13 +4572,13 @@ fi if test -z "$INTLTOOL_PERL"; then - as_fn_error "perl not found" "$LINENO" 5 + as_fn_error $? "perl not found" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 $as_echo_n "checking for perl >= 5.8.1... " >&6; } $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 if test $? -ne 0; then - as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5 + as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 else IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 @@ -4590,7 +4591,7 @@ $as_echo_n "checking for XML::Parser... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } else - as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5 + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 fi fi @@ -4689,7 +4690,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4705,11 +4706,11 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : break fi @@ -4748,7 +4749,7 @@ else # Broken: fails on valid input. continue fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext # OK, works on sane cases. Now check whether nonexistent headers # can be detected and how. @@ -4764,18 +4765,18 @@ else ac_preproc_ok=: break fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.err conftest.i conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext +rm -f conftest.i conftest.err conftest.$ac_ext if $ac_preproc_ok; then : else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -4836,7 +4837,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -4902,7 +4903,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -5034,8 +5035,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -6050,8 +6050,8 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -6612,7 +6612,7 @@ ltmain="$ac_aux_dir/ltmain.sh" # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -6623,16 +6623,16 @@ else test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -6657,7 +6657,7 @@ else ac_cv_host=$ac_cv_build else ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 fi fi @@ -6665,7 +6665,7 @@ fi $as_echo "$ac_cv_host" >&6; } case $ac_cv_host in *-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;; esac host=$ac_cv_host ac_save_IFS=$IFS; IFS='-' @@ -6738,7 +6738,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_SED"; then - as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5 + as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5 fi else ac_cv_path_SED=$SED @@ -6817,7 +6817,7 @@ esac done IFS=$as_save_IFS if test -z "$ac_cv_path_FGREP"; then - as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_FGREP=$FGREP @@ -6933,7 +6933,7 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5 +test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; } if test "${lt_cv_prog_gnu_ld+set}" = set; then : @@ -12895,7 +12895,7 @@ if test -f lex.yy.c; then elif test -f lexyy.c; then ac_cv_prog_lex_root=lexyy else - as_fn_error "cannot find output from $LEX; giving up" "$LINENO" 5 + as_fn_error $? "cannot find output from $LEX; giving up" "$LINENO" 5 fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_lex_root" >&5 @@ -13020,7 +13020,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; } fi set dummy $CC; ac_cc=`$as_echo "$2" | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -13172,7 +13172,7 @@ fi fi ;; *) - as_fn_error "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 + as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5 ;; esac @@ -13425,7 +13425,7 @@ fi if test "$gdu_cv_have_gdu" = "yes"; then : else - as_fn_error "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 + as_fn_error $? "gnome-doc-utils >= $gdu_cv_version_required not found" "$LINENO" 5 fi @@ -13492,13 +13492,38 @@ fi -GTK_REQUIRED="2.16.0" -DBUS_REQUIRED="0.60" -GCONF_REQUIRED="2.8" -LIBNOTIFY_REQUIRED="0.4" -GIO_UNIX_REQUIRED="0.0" -GIO_REQUIRED="0.0" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which gtk+ version to compile against" >&5 +$as_echo_n "checking which gtk+ version to compile against... " >&6; } +# Check whether --with-gtk was given. +if test "${with_gtk+set}" = set; then : + withval=$with_gtk; case "$with_gtk" in + 2.0|3.0) ;; + *) as_fn_error $? "invalid gtk version specified" "$LINENO" 5 ;; + esac +else + with_gtk=2.0 +fi + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gtk" >&5 +$as_echo "$with_gtk" >&6; } + +case "$with_gtk" in + 2.0) GTK_API_VERSION=2.0 + GTK_REQUIRED=2.16.0 + GLIB_REQUIRED=2.16.0 + DBUS_REQUIRED=0.60 + GCONF_REQUIRED=2.8 + LIBNOTIFY_REQUIRED=0.4 + ;; + 3.0) GTK_API_VERSION=3.0 + GTK_REQUIRED=2.90.4 + GLIB_REQUIRED="2.25.10" + DBUS_REQUIRED="0.82" + GCONF_REQUIRED="2.31" + LIBNOTIFY_REQUIRED="0.5.1" + ;; +esac pkg_failed=no @@ -13509,12 +13534,12 @@ if test -n "$GTK_CFLAGS"; then pkg_cv_GTK_CFLAGS="$GTK_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED, glib-2.0 >= \$GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null` + pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -13525,12 +13550,12 @@ if test -n "$GTK_LIBS"; then pkg_cv_GTK_LIBS="$GTK_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED, glib-2.0 >= \$GLIB_REQUIRED\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED" 2>/dev/null` + pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>/dev/null` else pkg_failed=yes fi @@ -13550,14 +13575,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0 >= $GTK_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>&1` else - GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0 >= $GTK_REQUIRED" 2>&1` + GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GTK_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gtk+-2.0 >= $GTK_REQUIRED) were not met: + as_fn_error $? "Package requirements (gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED) were not met: $GTK_PKG_ERRORS @@ -13572,7 +13597,7 @@ elif test $pkg_failed = untried; then $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -13581,7 +13606,7 @@ and GTK_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GTK_CFLAGS=$pkg_cv_GTK_CFLAGS GTK_LIBS=$pkg_cv_GTK_LIBS @@ -13646,7 +13671,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$DBUS_PKG_ERRORS" >&5 - as_fn_error "Package requirements (dbus-glib-1 >= $DBUS_REQUIRED) were not met: + as_fn_error $? "Package requirements (dbus-glib-1 >= $DBUS_REQUIRED) were not met: $DBUS_PKG_ERRORS @@ -13661,7 +13686,7 @@ elif test $pkg_failed = untried; then $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -13670,7 +13695,7 @@ and DBUS_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else DBUS_CFLAGS=$pkg_cv_DBUS_CFLAGS DBUS_LIBS=$pkg_cv_DBUS_LIBS @@ -13735,7 +13760,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$GCONF_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gconf-2.0 >= $GCONF_REQUIRED) were not met: + as_fn_error $? "Package requirements (gconf-2.0 >= $GCONF_REQUIRED) were not met: $GCONF_PKG_ERRORS @@ -13750,7 +13775,7 @@ elif test $pkg_failed = untried; then $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -13759,7 +13784,7 @@ and GCONF_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GCONF_CFLAGS=$pkg_cv_GCONF_CFLAGS GCONF_LIBS=$pkg_cv_GCONF_LIBS @@ -13769,95 +13794,6 @@ $as_echo "yes" >&6; } fi pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO_UNIX" >&5 -$as_echo_n "checking for GIO_UNIX... " >&6; } - -if test -n "$GIO_UNIX_CFLAGS"; then - pkg_cv_GIO_UNIX_CFLAGS="$GIO_UNIX_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= \$GIO_UNIX_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= $GIO_UNIX_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GIO_UNIX_CFLAGS=`$PKG_CONFIG --cflags "gio-unix-2.0 >= $GIO_UNIX_REQUIRED" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GIO_UNIX_LIBS"; then - pkg_cv_GIO_UNIX_LIBS="$GIO_UNIX_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-unix-2.0 >= \$GIO_UNIX_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-unix-2.0 >= $GIO_UNIX_REQUIRED") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GIO_UNIX_LIBS=`$PKG_CONFIG --libs "gio-unix-2.0 >= $GIO_UNIX_REQUIRED" 2>/dev/null` -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-unix-2.0 >= $GIO_UNIX_REQUIRED" 2>&1` - else - GIO_UNIX_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-unix-2.0 >= $GIO_UNIX_REQUIRED" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GIO_UNIX_PKG_ERRORS" >&5 - - as_fn_error "Package requirements (gio-unix-2.0 >= $GIO_UNIX_REQUIRED) were not met: - -$GIO_UNIX_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables GIO_UNIX_CFLAGS -and GIO_UNIX_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables GIO_UNIX_CFLAGS -and GIO_UNIX_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } -else - GIO_UNIX_CFLAGS=$pkg_cv_GIO_UNIX_CFLAGS - GIO_UNIX_LIBS=$pkg_cv_GIO_UNIX_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -fi - -pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GIO" >&5 $as_echo_n "checking for GIO... " >&6; } @@ -13865,12 +13801,12 @@ if test -n "$GIO_CFLAGS"; then pkg_cv_GIO_CFLAGS="$GIO_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0, gio-unix-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-2.0, gio-unix-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 >= $GIO_REQUIRED" 2>/dev/null` + pkg_cv_GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0, gio-unix-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -13881,12 +13817,12 @@ if test -n "$GIO_LIBS"; then pkg_cv_GIO_LIBS="$GIO_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0 >= \$GIO_REQUIRED\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0 >= $GIO_REQUIRED") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0, gio-unix-2.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "gio-2.0, gio-unix-2.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 >= $GIO_REQUIRED" 2>/dev/null` + pkg_cv_GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0, gio-unix-2.0" 2>/dev/null` else pkg_failed=yes fi @@ -13906,14 +13842,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0 >= $GIO_REQUIRED" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gio-2.0, gio-unix-2.0" 2>&1` else - GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0 >= $GIO_REQUIRED" 2>&1` + GIO_PKG_ERRORS=`$PKG_CONFIG --print-errors "gio-2.0, gio-unix-2.0" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$GIO_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gio-2.0 >= $GIO_REQUIRED) were not met: + as_fn_error $? "Package requirements (gio-2.0, gio-unix-2.0) were not met: $GIO_PKG_ERRORS @@ -13928,7 +13864,7 @@ elif test $pkg_failed = untried; then $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -13937,7 +13873,7 @@ and GIO_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GIO_CFLAGS=$pkg_cv_GIO_CFLAGS GIO_LIBS=$pkg_cv_GIO_LIBS @@ -14002,7 +13938,7 @@ fi # Put the nasty error message in config.log where it belongs echo "$GMODULE_PKG_ERRORS" >&5 - as_fn_error "Package requirements (gmodule-2.0) were not met: + as_fn_error $? "Package requirements (gmodule-2.0) were not met: $GMODULE_PKG_ERRORS @@ -14017,7 +13953,7 @@ elif test $pkg_failed = untried; then $as_echo "no" >&6; } { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "The pkg-config script could not be found or is too old. Make sure it +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it is in your PATH or set the PKG_CONFIG environment variable to the full path to pkg-config. @@ -14026,7 +13962,7 @@ and GMODULE_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else GMODULE_CFLAGS=$pkg_cv_GMODULE_CFLAGS GMODULE_LIBS=$pkg_cv_GMODULE_LIBS @@ -14036,6 +13972,7 @@ $as_echo "yes" >&6; } fi + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` else @@ -14072,7 +14009,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >& if test "${enable_schemas_install+set}" = set; then : enableval=$enable_schemas_install; case ${enableval} in yes|no) ;; - *) as_fn_error "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; esac fi @@ -14128,7 +14065,7 @@ fi if test "$GCONFTOOL" = "no"; then - as_fn_error "gconftool-2 not found" "$LINENO" 5 + as_fn_error $? "gconftool-2 not found" "$LINENO" 5 fi # Check whether --enable-debug was given. @@ -14208,6 +14145,8 @@ if test "x$KRB5_CONFIG" != "xnone"; then KRB5_CFLAGS="`${KRB5_CONFIG} --cflags krb5`" +else + as_fn_error $? "krb5-config not found. You need to install a Kerberos development package" "$LINENO" 5 fi savedCFLAGS="$CFLAGS" @@ -14290,8 +14229,7 @@ for ac_func in krb5_get_error_message \ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -14584,7 +14522,7 @@ fi if test "x$with_libnotify" = "xcheck" ; then with_libnotify=no else - as_fn_error "You must install libnotify >= $LIBNOTIFY_REQUIRED to compile krb5-auth-dialog" "$LINENO" 5 + as_fn_error $? "You must install libnotify >= $LIBNOTIFY_REQUIRED to compile krb5-auth-dialog" "$LINENO" 5 fi elif test $pkg_failed = untried; then @@ -14594,7 +14532,7 @@ $as_echo "no" >&6; } if test "x$with_libnotify" = "xcheck" ; then with_libnotify=no else - as_fn_error "You must install libnotify >= $LIBNOTIFY_REQUIRED to compile krb5-auth-dialog" "$LINENO" 5 + as_fn_error $? "You must install libnotify >= $LIBNOTIFY_REQUIRED to compile krb5-auth-dialog" "$LINENO" 5 fi else @@ -14628,8 +14566,7 @@ for ac_func in seteuid stpcpy mmap do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -15134,7 +15071,7 @@ else fi test $fail = 1 && - as_fn_error "You must install the PAM development package in order to compile krb5-auth-dialog" "$LINENO" 5 + as_fn_error $? "You must install the PAM development package in order to compile krb5-auth-dialog" "$LINENO" 5 fi fi @@ -15236,6 +15173,7 @@ DEFS=-DHAVE_CONFIG_H ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -15259,15 +15197,15 @@ else fi if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then - as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. + as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then - as_fn_error "conditional \"AMDEP\" was never defined. + as_fn_error $? "conditional \"AMDEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -15275,35 +15213,35 @@ fi if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then - as_fn_error "conditional \"am__fastdepCC\" was never defined. + as_fn_error $? "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_SK_TRUE}" && test -z "${ENABLE_SK_FALSE}"; then - as_fn_error "conditional \"ENABLE_SK\" was never defined. + as_fn_error $? "conditional \"ENABLE_SK\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then - as_fn_error "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. + as_fn_error $? "conditional \"HAVE_GNOME_DOC_UTILS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${GCONF_SCHEMAS_INSTALL_TRUE}" && test -z "${GCONF_SCHEMAS_INSTALL_FALSE}"; then - as_fn_error "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. + as_fn_error $? "conditional \"GCONF_SCHEMAS_INSTALL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_PKINIT_TRUE}" && test -z "${ENABLE_PKINIT_FALSE}"; then - as_fn_error "conditional \"ENABLE_PKINIT\" was never defined. + as_fn_error $? "conditional \"ENABLE_PKINIT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_NETWORK_MANAGER_TRUE}" && test -z "${ENABLE_NETWORK_MANAGER_FALSE}"; then - as_fn_error "conditional \"ENABLE_NETWORK_MANAGER\" was never defined. + as_fn_error $? "conditional \"ENABLE_NETWORK_MANAGER\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_LIBNOTIFY_TRUE}" && test -z "${HAVE_LIBNOTIFY_FALSE}"; then - as_fn_error "conditional \"HAVE_LIBNOTIFY\" was never defined. + as_fn_error $? "conditional \"HAVE_LIBNOTIFY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ENABLE_PAM_PLUGIN_TRUE}" && test -z "${ENABLE_PAM_PLUGIN_FALSE}"; then - as_fn_error "conditional \"ENABLE_PAM_PLUGIN\" was never defined. + as_fn_error $? "conditional \"ENABLE_PAM_PLUGIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi @@ -15453,19 +15391,19 @@ export LANGUAGE (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 fi - $as_echo "$as_me: error: $1" >&2 + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -15661,7 +15599,7 @@ $as_echo X"$as_dir" | test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -15714,8 +15652,8 @@ 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 krb5-auth-dialog $as_me 0.16, which was -generated by GNU Autoconf 2.65. Invocation command line was +This file was extended by krb5-auth-dialog $as_me 0.17, which was +generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -15780,11 +15718,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -krb5-auth-dialog config.status 0.16 -configured by $0, generated by GNU Autoconf 2.65, +krb5-auth-dialog config.status 0.17 +configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -15802,11 +15740,16 @@ ac_need_defaults=: while test $# != 0 do case $1 in - --*=*) + --*=?*) ac_option=`expr "X$1" : 'X\([^=]*\)='` ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` ac_shift=: ;; + --*=) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg= + ac_shift=: + ;; *) ac_option=$1 ac_optarg=$2 @@ -15828,6 +15771,7 @@ do $ac_shift case $ac_optarg in *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; + '') as_fn_error $? "missing file argument" ;; esac as_fn_append CONFIG_FILES " '$ac_optarg'" ac_need_defaults=false;; @@ -15840,7 +15784,7 @@ do ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -15849,7 +15793,7 @@ Try \`$0 --help' for more information.";; ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -16182,7 +16126,7 @@ do "plugins/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -16220,7 +16164,7 @@ $debug || { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -16237,7 +16181,7 @@ if test "x$ac_cr" = x; then fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -16251,18 +16195,18 @@ _ACEOF echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -16351,20 +16295,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 _ACEOF -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -16392,7 +16344,7 @@ for ac_last_try in false false :; do if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -16477,7 +16429,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -16490,7 +16442,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -16518,7 +16470,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -16545,7 +16497,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -16682,22 +16634,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -16708,19 +16660,19 @@ which seems to be undefined. Please make sure it is defined." >&2;} $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi # Compute "$ac_file"'s index in $config_headers. _am_arg="$ac_file" @@ -17500,7 +17452,7 @@ _LT_EOF ;; "po/stamp-it":C) if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then - as_fn_error "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 + as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 fi rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" >"po/stamp-it.tmp" @@ -17528,7 +17480,7 @@ _ACEOF ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -17549,7 +17501,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 diff --git a/configure.ac b/configure.ac index 48e2e6f..c96302d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([krb5-auth-dialog], [0.16]) +AC_INIT([krb5-auth-dialog], [0.17]) AC_CONFIG_SRCDIR(src/ka-dialog.c) dnl Make automake keep quiet about wildcards & other GNUmake-isms AM_INIT_AUTOMAKE([-Wno-portability]) @@ -27,23 +27,42 @@ AM_PROG_CC_C_O KA_COMPILE_WARNINGS([maximum]) GNOME_DOC_INIT -GTK_REQUIRED="2.16.0" -DBUS_REQUIRED="0.60" -GCONF_REQUIRED="2.8" -LIBNOTIFY_REQUIRED="0.4" -GIO_UNIX_REQUIRED="0.0" -GIO_REQUIRED="0.0" - -dnl check for deprecated symbols: -dnl GNOME_MAINTAINER_MODE_DEFINES - -PKG_CHECK_MODULES(GTK, gtk+-2.0 >= $GTK_REQUIRED) +AC_MSG_CHECKING([which gtk+ version to compile against]) +AC_ARG_WITH([gtk], + [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])], + [case "$with_gtk" in + 2.0|3.0) ;; + *) AC_MSG_ERROR([invalid gtk version specified]) ;; + esac], + [with_gtk=2.0]) +AC_MSG_RESULT([$with_gtk]) + +case "$with_gtk" in + 2.0) GTK_API_VERSION=2.0 + GTK_REQUIRED=2.16.0 + GLIB_REQUIRED=2.16.0 + DBUS_REQUIRED=0.60 + GCONF_REQUIRED=2.8 + LIBNOTIFY_REQUIRED=0.4 + ;; + 3.0) GTK_API_VERSION=3.0 + GTK_REQUIRED=2.90.4 + GLIB_REQUIRED="2.25.10" + DBUS_REQUIRED="0.82" + GCONF_REQUIRED="2.31" + LIBNOTIFY_REQUIRED="0.5.1" + ;; +esac + +PKG_CHECK_MODULES(GTK, [gtk+-$GTK_API_VERSION >= $GTK_REQUIRED, glib-2.0 >= $GLIB_REQUIRED]) PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_REQUIRED) PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED) -PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= $GIO_UNIX_REQUIRED) -PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED) +PKG_CHECK_MODULES(GIO, [gio-2.0, gio-unix-2.0]) PKG_CHECK_MODULES(GMODULE, gmodule-2.0) +dnl check for deprecated symbols: +dnl GNOME_MAINTAINER_MODE_DEFINES + AM_GCONF_SOURCE_2 AC_PATH_PROG([GCONFTOOL], [gconftool-2], [no]) @@ -76,6 +95,8 @@ if test "x$KRB5_CONFIG" != "xnone"; then KRB5_CFLAGS="`${KRB5_CONFIG} --cflags krb5`" AC_SUBST(KRB5_CFLAGS) AC_SUBST(KRB5_LIBS) +else + AC_MSG_ERROR([krb5-config not found. You need to install a Kerberos development package]) fi dnl Check for API differences between Heimdal and MIT Kerberos diff --git a/etpo/Makefile.in b/etpo/Makefile.in index 57d4be4..3d0aebc 100644 --- a/etpo/Makefile.in +++ b/etpo/Makefile.in @@ -142,8 +142,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ diff --git a/examples/Makefile.in b/examples/Makefile.in index 9e55a5a..33148b6 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -95,8 +95,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ diff --git a/gtksecentry/Makefile.in b/gtksecentry/Makefile.in index f6ce2dc..56746df 100644 --- a/gtksecentry/Makefile.in +++ b/gtksecentry/Makefile.in @@ -130,8 +130,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ diff --git a/gtksecentry/gtksecentry.c b/gtksecentry/gtksecentry.c index 177eab8..f68f094 100644 --- a/gtksecentry/gtksecentry.c +++ b/gtksecentry/gtksecentry.c @@ -2317,7 +2317,11 @@ gtk_secure_entry_draw_text(GtkSecureEntry * entry) g_utf8_offset_to_pointer(text, start_pos) - text; gint end_index = g_utf8_offset_to_pointer(text, end_pos) - text; +#if GTK_CHECK_VERSION(2, 90, 5) + cairo_region_t *clip_region = cairo_region_create(); +#else GdkRegion *clip_region = gdk_region_new(); +#endif GdkGC *text_gc; GdkGC *selection_gc; @@ -2350,15 +2354,22 @@ gtk_secure_entry_draw_text(GtkSecureEntry * entry) gdk_draw_rectangle(entry->text_area, selection_gc, TRUE, rect.x, rect.y, rect.width, rect.height); - +#if GTK_CHECK_VERSION(2, 90, 5) + cairo_region_union_rectangle (clip_region, &rect); +#else gdk_region_union_with_rect(clip_region, &rect); +#endif } gdk_gc_set_clip_region(text_gc, clip_region); gdk_draw_layout(entry->text_area, text_gc, x, y, layout); gdk_gc_set_clip_region(text_gc, NULL); +#if GTK_CHECK_VERSION(2, 90, 5) + cairo_region_destroy(clip_region); +#else gdk_region_destroy(clip_region); +#endif g_free(ranges); } } diff --git a/help/Makefile.in b/help/Makefile.in index 5c76aef..c0d8d95 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -120,8 +120,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ diff --git a/icons/22x22/Makefile.in b/icons/22x22/Makefile.in index 03c63c2..2a7cf26 100644 --- a/icons/22x22/Makefile.in +++ b/icons/22x22/Makefile.in @@ -119,8 +119,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ diff --git a/icons/48x48/Makefile.in b/icons/48x48/Makefile.in index d4b4d9c..d8eba28 100644 --- a/icons/48x48/Makefile.in +++ b/icons/48x48/Makefile.in @@ -119,8 +119,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ diff --git a/icons/Makefile.in b/icons/Makefile.in index 791f33d..007b499 100644 --- a/icons/Makefile.in +++ b/icons/Makefile.in @@ -135,8 +135,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ diff --git a/icons/scalable/Makefile.in b/icons/scalable/Makefile.in index f5ac22e..1270915 100644 --- a/icons/scalable/Makefile.in +++ b/icons/scalable/Makefile.in @@ -119,8 +119,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ diff --git a/krb5-auth-dialog.spec b/krb5-auth-dialog.spec index a885a49..cb27f5f 100644 --- a/krb5-auth-dialog.spec +++ b/krb5-auth-dialog.spec @@ -1,6 +1,6 @@ Summary: Kerberos 5 authentication dialog Name: krb5-auth-dialog -Version: 0.16 +Version: 0.17 Release: 1 License: GPL Group: User Interface/X diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 8fecd5c..cf69e7b 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -11,6 +11,7 @@ endif pkglib_LTLIBRARIES = \ libka-plugin-dummy.la \ $(PAM_PLUGIN) \ + libka-plugin-afs.la \ $(NULL) # Dummy example plugin @@ -47,3 +48,19 @@ libka_plugin_pam_la_LDFLAGS = \ $(PAM_LIBS) \ $(NULL) endif + +# AFS plugin +libka_plugin_afs_la_SOURCES = \ + ka-plugin-afs.c \ + ka-plugin-afs.h \ + $(NULL) + +libka_plugin_afs_la_CPPFLAGS = \ + $(GTK_CFLAGS) \ + -I$(top_srcdir)/src \ + $(NULL) + +libka_plugin_afs_la_LDFLAGS = \ + -module \ + -avoid-version \ + $(NULL) diff --git a/plugins/Makefile.in b/plugins/Makefile.in index 34ec198..1047119 100644 --- a/plugins/Makefile.in +++ b/plugins/Makefile.in @@ -68,14 +68,22 @@ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(pkglibdir)" LTLIBRARIES = $(pkglib_LTLIBRARIES) -libka_plugin_dummy_la_LIBADD = +libka_plugin_afs_la_LIBADD = am__objects_1 = -am_libka_plugin_dummy_la_OBJECTS = \ - libka_plugin_dummy_la-ka-plugin-dummy.lo $(am__objects_1) -libka_plugin_dummy_la_OBJECTS = $(am_libka_plugin_dummy_la_OBJECTS) +am_libka_plugin_afs_la_OBJECTS = libka_plugin_afs_la-ka-plugin-afs.lo \ + $(am__objects_1) +libka_plugin_afs_la_OBJECTS = $(am_libka_plugin_afs_la_OBJECTS) AM_V_lt = $(am__v_lt_$(V)) am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) am__v_lt_0 = --silent +libka_plugin_afs_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ + $(AM_CFLAGS) $(CFLAGS) $(libka_plugin_afs_la_LDFLAGS) \ + $(LDFLAGS) -o $@ +libka_plugin_dummy_la_LIBADD = +am_libka_plugin_dummy_la_OBJECTS = \ + libka_plugin_dummy_la-ka-plugin-dummy.lo $(am__objects_1) +libka_plugin_dummy_la_OBJECTS = $(am_libka_plugin_dummy_la_OBJECTS) libka_plugin_dummy_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libka_plugin_dummy_la_LDFLAGS) \ @@ -118,9 +126,11 @@ am__v_CCLD_0 = @echo " CCLD " $@; AM_V_GEN = $(am__v_GEN_$(V)) am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) am__v_GEN_0 = @echo " GEN " $@; -SOURCES = $(libka_plugin_dummy_la_SOURCES) \ +SOURCES = $(libka_plugin_afs_la_SOURCES) \ + $(libka_plugin_dummy_la_SOURCES) \ $(libka_plugin_pam_la_SOURCES) -DIST_SOURCES = $(libka_plugin_dummy_la_SOURCES) \ +DIST_SOURCES = $(libka_plugin_afs_la_SOURCES) \ + $(libka_plugin_dummy_la_SOURCES) \ $(am__libka_plugin_pam_la_SOURCES_DIST) ETAGS = etags CTAGS = ctags @@ -167,8 +177,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ @@ -312,6 +320,7 @@ NULL = pkglib_LTLIBRARIES = \ libka-plugin-dummy.la \ $(PAM_PLUGIN) \ + libka-plugin-afs.la \ $(NULL) @@ -349,6 +358,23 @@ libka_plugin_dummy_la_LDFLAGS = \ @ENABLE_PAM_PLUGIN_TRUE@ $(PAM_LIBS) \ @ENABLE_PAM_PLUGIN_TRUE@ $(NULL) + +# AFS plugin +libka_plugin_afs_la_SOURCES = \ + ka-plugin-afs.c \ + ka-plugin-afs.h \ + $(NULL) + +libka_plugin_afs_la_CPPFLAGS = \ + $(GTK_CFLAGS) \ + -I$(top_srcdir)/src \ + $(NULL) + +libka_plugin_afs_la_LDFLAGS = \ + -module \ + -avoid-version \ + $(NULL) + all: all-am .SUFFIXES: @@ -414,6 +440,8 @@ clean-pkglibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done +libka-plugin-afs.la: $(libka_plugin_afs_la_OBJECTS) $(libka_plugin_afs_la_DEPENDENCIES) + $(AM_V_CCLD)$(libka_plugin_afs_la_LINK) -rpath $(pkglibdir) $(libka_plugin_afs_la_OBJECTS) $(libka_plugin_afs_la_LIBADD) $(LIBS) libka-plugin-dummy.la: $(libka_plugin_dummy_la_OBJECTS) $(libka_plugin_dummy_la_DEPENDENCIES) $(AM_V_CCLD)$(libka_plugin_dummy_la_LINK) -rpath $(pkglibdir) $(libka_plugin_dummy_la_OBJECTS) $(libka_plugin_dummy_la_LIBADD) $(LIBS) libka-plugin-pam.la: $(libka_plugin_pam_la_OBJECTS) $(libka_plugin_pam_la_DEPENDENCIES) @@ -425,6 +453,7 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libka_plugin_afs_la-ka-plugin-afs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libka_plugin_pam_la-ka-plugin-pam.Plo@am__quote@ @@ -452,6 +481,14 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +libka_plugin_afs_la-ka-plugin-afs.lo: ka-plugin-afs.c +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_afs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libka_plugin_afs_la-ka-plugin-afs.lo -MD -MP -MF $(DEPDIR)/libka_plugin_afs_la-ka-plugin-afs.Tpo -c -o libka_plugin_afs_la-ka-plugin-afs.lo `test -f 'ka-plugin-afs.c' || echo '$(srcdir)/'`ka-plugin-afs.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libka_plugin_afs_la-ka-plugin-afs.Tpo $(DEPDIR)/libka_plugin_afs_la-ka-plugin-afs.Plo +@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ka-plugin-afs.c' object='libka_plugin_afs_la-ka-plugin-afs.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_afs_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libka_plugin_afs_la-ka-plugin-afs.lo `test -f 'ka-plugin-afs.c' || echo '$(srcdir)/'`ka-plugin-afs.c + libka_plugin_dummy_la-ka-plugin-dummy.lo: ka-plugin-dummy.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libka_plugin_dummy_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libka_plugin_dummy_la-ka-plugin-dummy.lo -MD -MP -MF $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Tpo -c -o libka_plugin_dummy_la-ka-plugin-dummy.lo `test -f 'ka-plugin-dummy.c' || echo '$(srcdir)/'`ka-plugin-dummy.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Tpo $(DEPDIR)/libka_plugin_dummy_la-ka-plugin-dummy.Plo diff --git a/plugins/ka-plugin-afs.c b/plugins/ka-plugin-afs.c new file mode 100644 index 0000000..57daed0 --- /dev/null +++ b/plugins/ka-plugin-afs.c @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#include "ka-plugin-afs.h" +#include <gmodule.h> + +G_DEFINE_TYPE (KaPluginAfs, ka_plugin_afs, KA_TYPE_PLUGIN) +#define GET_PRIVATE(o) \ + (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_AFS, KaPluginAfsPrivate)) + +int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION; +int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION; + +G_MODULE_EXPORT KaPlugin * +ka_plugin_create (void) +{ + return KA_PLUGIN (ka_plugin_afs_new ()); +} + +typedef struct _KaPluginAfsPrivate KaPluginAfsPrivate; + +struct _KaPluginAfsPrivate { + gulong handlers[2]; +}; + +static void +event_cb (gpointer *applet, gchar *princ, guint when, gpointer user_data) +{ + GError *err = NULL; + gboolean ret; + int i; + const char *afslog_cmds[] = { "aklog", "afslog" }; + + for (i = 0; i < G_N_ELEMENTS (afslog_cmds); i++) { + ret = g_spawn_command_line_async (afslog_cmds[i], &err); + if (!ret) { + if (G_SPAWN_ERROR_NOENT != err->code) + g_warning ("%s", err->message); + } else + break; + g_clear_error (&err); + } + + if (!ret) + g_warning ("Couldn't run any afslog command"); +} + +static void +ka_plugin_afs_finalize (GObject *object) +{ + G_OBJECT_CLASS (ka_plugin_afs_parent_class)->finalize (object); +} + +static void +ka_plugin_afs_activate (KaPlugin *self, KaApplet *applet) +{ + KaPluginAfsPrivate *priv = GET_PRIVATE (self); + + priv->handlers[0] = g_signal_connect (applet, + "krb-tgt-acquired", + G_CALLBACK (event_cb), "Acquired"); + priv->handlers[1] = g_signal_connect (applet, + "krb-tgt-renewed", + G_CALLBACK (event_cb), "Renewed"); +} + +static void +ka_plugin_afs_deactivate (KaPlugin *self, KaApplet *applet) +{ + int i; + KaPluginAfsPrivate *priv = GET_PRIVATE (self); + + for (i = 0; i < G_N_ELEMENTS (priv->handlers); i++) + g_signal_handler_disconnect (applet, priv->handlers[i]); +} + +static void +ka_plugin_afs_class_init (KaPluginAfsClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass); + + g_type_class_add_private (klass, sizeof (KaPluginAfsPrivate)); + + plugin_class->activate = ka_plugin_afs_activate; + plugin_class->deactivate = ka_plugin_afs_deactivate; + object_class->finalize = ka_plugin_afs_finalize; +} + +static void +ka_plugin_afs_init (KaPluginAfs *self) +{ +} + +KaPluginAfs * +ka_plugin_afs_new (void) +{ + return g_object_new (KA_TYPE_PLUGIN_AFS, KA_PLUGIN_PROP_NAME, "afs", NULL); +} diff --git a/plugins/ka-plugin-afs.h b/plugins/ka-plugin-afs.h new file mode 100644 index 0000000..c4fb71d --- /dev/null +++ b/plugins/ka-plugin-afs.h @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2010 Guido Guenther <agx@sigxcpu.org> + * + * 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, 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef _KA_PLUGIN_DUMMY +#define _KA_PLUGIN_DUMMY + +#include "ka-plugin.h" + +G_BEGIN_DECLS +#define KA_TYPE_PLUGIN_AFS ka_plugin_afs_get_type() +#define KA_PLUGIN_AFS(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_PLUGIN_AFS, KaPluginAfs)) +#define KA_PLUGIN_AFS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_PLUGIN_AFS, KaPluginAfsClass)) +#define KA_IS_PLUGIN_AFS(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_PLUGIN_AFS)) +#define KA_IS_PLUGIN_AFS_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_PLUGIN_AFS)) +#define KA_PLUGIN_AFS_GET_CLASS(obj) \ + (G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_PLUGIN_AFS, KaPluginAfsClass)) + +typedef struct { + KaPlugin parent; +} KaPluginAfs; + +typedef struct { + KaPluginClass parent_class; +} KaPluginAfsClass; + +GType ka_plugin_afs_get_type (void); + +KaPluginAfs *ka_plugin_afs_new (void); + +G_END_DECLS +#endif /* _KA_PLUGIN_AFS */ diff --git a/plugins/ka-plugin-dummy.c b/plugins/ka-plugin-dummy.c index 6485c0d..99bd739 100644 --- a/plugins/ka-plugin-dummy.c +++ b/plugins/ka-plugin-dummy.c @@ -20,17 +20,16 @@ #include <gmodule.h> G_DEFINE_TYPE (KaPluginDummy, ka_plugin_dummy, KA_TYPE_PLUGIN) - #define GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_DUMMY, KaPluginDummyPrivate)) int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION; int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION; -G_MODULE_EXPORT KaPlugin* +G_MODULE_EXPORT KaPlugin * ka_plugin_create (void) { - return KA_PLUGIN (ka_plugin_dummy_new()); + return KA_PLUGIN (ka_plugin_dummy_new ()); } typedef struct _KaPluginDummyPrivate KaPluginDummyPrivate; @@ -39,57 +38,55 @@ struct _KaPluginDummyPrivate { gulong handlers[3]; }; -event_cb (gpointer* applet, gchar* princ, guint when, gpointer user_data) +static void +event_cb (gpointer *applet, gchar *princ, guint when, gpointer user_data) { - g_message("%s %s @%d", user_data, princ, when); + g_message ("%s %s @%d", user_data, princ, when); } static void ka_plugin_dummy_finalize (GObject *object) { - G_OBJECT_CLASS (ka_plugin_dummy_parent_class)->finalize (object); + G_OBJECT_CLASS (ka_plugin_dummy_parent_class)->finalize (object); } static void -ka_plugin_dummy_activate (KaPlugin *self, KaApplet* applet) +ka_plugin_dummy_activate (KaPlugin *self, KaApplet *applet) { - KaPluginDummyPrivate *priv = GET_PRIVATE (self); - - priv->handlers[0] = g_signal_connect (applet, - "krb-tgt-expired", - G_CALLBACK (event_cb), - "Expired"); - priv->handlers[1] = g_signal_connect (applet, - "krb-tgt-acquired", - G_CALLBACK (event_cb), - "Acquired"); - priv->handlers[2] = g_signal_connect (applet, - "krb-tgt-renewed", - G_CALLBACK (event_cb), - "Renewed"); + KaPluginDummyPrivate *priv = GET_PRIVATE (self); + + priv->handlers[0] = g_signal_connect (applet, + "krb-tgt-expired", + G_CALLBACK (event_cb), "Expired"); + priv->handlers[1] = g_signal_connect (applet, + "krb-tgt-acquired", + G_CALLBACK (event_cb), "Acquired"); + priv->handlers[2] = g_signal_connect (applet, + "krb-tgt-renewed", + G_CALLBACK (event_cb), "Renewed"); } static void -ka_plugin_dummy_deactivate (KaPlugin *self, KaApplet* applet) +ka_plugin_dummy_deactivate (KaPlugin *self, KaApplet *applet) { - int i; - KaPluginDummyPrivate *priv = GET_PRIVATE (self); + int i; + KaPluginDummyPrivate *priv = GET_PRIVATE (self); - for (i = 0; i < G_N_ELEMENTS(priv->handlers); i++) - g_signal_handler_disconnect (applet, priv->handlers[i]); + for (i = 0; i < G_N_ELEMENTS (priv->handlers); i++) + g_signal_handler_disconnect (applet, priv->handlers[i]); } static void ka_plugin_dummy_class_init (KaPluginDummyClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass); - g_type_class_add_private (klass, sizeof (KaPluginDummyPrivate)); + g_type_class_add_private (klass, sizeof (KaPluginDummyPrivate)); - plugin_class->activate = ka_plugin_dummy_activate; - plugin_class->deactivate = ka_plugin_dummy_deactivate; - object_class->finalize = ka_plugin_dummy_finalize; + plugin_class->activate = ka_plugin_dummy_activate; + plugin_class->deactivate = ka_plugin_dummy_deactivate; + object_class->finalize = ka_plugin_dummy_finalize; } static void @@ -97,9 +94,9 @@ ka_plugin_dummy_init (KaPluginDummy *self) { } -KaPluginDummy* +KaPluginDummy * ka_plugin_dummy_new (void) { - return g_object_new (KA_TYPE_PLUGIN_DUMMY, KA_PLUGIN_PROP_NAME, - "dummy", NULL); + return g_object_new (KA_TYPE_PLUGIN_DUMMY, KA_PLUGIN_PROP_NAME, + "dummy", NULL); } diff --git a/plugins/ka-plugin-dummy.h b/plugins/ka-plugin-dummy.h index 311861a..460d64a 100644 --- a/plugins/ka-plugin-dummy.h +++ b/plugins/ka-plugin-dummy.h @@ -22,36 +22,29 @@ #include "ka-plugin.h" G_BEGIN_DECLS - #define KA_TYPE_PLUGIN_DUMMY ka_plugin_dummy_get_type() - #define KA_PLUGIN_DUMMY(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_PLUGIN_DUMMY, KaPluginDummy)) - #define KA_PLUGIN_DUMMY_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_PLUGIN_DUMMY, KaPluginDummyClass)) - #define KA_IS_PLUGIN_DUMMY(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_PLUGIN_DUMMY)) - #define KA_IS_PLUGIN_DUMMY_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_PLUGIN_DUMMY)) - #define KA_PLUGIN_DUMMY_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_PLUGIN_DUMMY, KaPluginDummyClass)) typedef struct { - KaPlugin parent; + KaPlugin parent; } KaPluginDummy; typedef struct { - KaPluginClass parent_class; + KaPluginClass parent_class; } KaPluginDummyClass; GType ka_plugin_dummy_get_type (void); -KaPluginDummy* ka_plugin_dummy_new (void); +KaPluginDummy *ka_plugin_dummy_new (void); G_END_DECLS - #endif /* _KA_PLUGIN_DUMMY */ diff --git a/plugins/ka-plugin-pam.c b/plugins/ka-plugin-pam.c index 53d1f06..b700854 100644 --- a/plugins/ka-plugin-pam.c +++ b/plugins/ka-plugin-pam.c @@ -22,7 +22,6 @@ #include <security/pam_appl.h> G_DEFINE_TYPE (KaPluginPam, ka_plugin_pam, KA_TYPE_PLUGIN) - #define GET_PRIVATE(o) \ (G_TYPE_INSTANCE_GET_PRIVATE ((o), KA_TYPE_PLUGIN_PAM, KaPluginPamPrivate)) @@ -31,10 +30,10 @@ typedef struct _KaPluginPamPrivate KaPluginPamPrivate; int ka_plugin_major_version = KA_PLUGIN_MAJOR_VERSION; int ka_plugin_minor_version = KA_PLUGIN_MINOR_VERSION; -G_MODULE_EXPORT KaPlugin* +G_MODULE_EXPORT KaPlugin * ka_plugin_create (void) { - return KA_PLUGIN (ka_plugin_pam_new()); + return KA_PLUGIN (ka_plugin_pam_new ()); } struct _KaPluginPamPrivate { @@ -44,76 +43,77 @@ struct _KaPluginPamPrivate { static void ka_plugin_pam_finalize (GObject *object) { - G_OBJECT_CLASS (ka_plugin_pam_parent_class)->finalize (object); + G_OBJECT_CLASS (ka_plugin_pam_parent_class)->finalize (object); } -static int simple_conv( int n, const struct pam_message **msg, struct pam_response **resp, void *data) +static int +simple_conv (int n, const struct pam_message **msg, struct pam_response **resp, + void *data) { - return (PAM_CONV_ERR); + return (PAM_CONV_ERR); } static struct pam_conv simplepamconv = { simple_conv, NULL }; static void -renewed_event_cb (gpointer* applet, gchar* princ, guint when, gpointer user_data) +renewed_event_cb (gpointer *applet, gchar *princ, guint when, + gpointer user_data) { - const char *user; - pam_handle_t *pamh = NULL; - int retval = 0; + const char *user; + pam_handle_t *pamh = NULL; + int retval = 0; - user = g_get_user_name (); - retval = pam_start("ka-plugin-pam", user, &simplepamconv, &pamh); - if (retval) - goto out; + user = g_get_user_name (); + retval = pam_start ("ka-plugin-pam", user, &simplepamconv, &pamh); + if (retval) + goto out; - retval = pam_setcred(pamh, PAM_ESTABLISH_CRED); - if (retval) - goto out; + retval = pam_setcred (pamh, PAM_ESTABLISH_CRED); + if (retval) + goto out; out: - if (retval) - g_warning("PAM plugin: %s", pam_strerror(pamh, retval)); + if (retval) + g_warning ("PAM plugin: %s", pam_strerror (pamh, retval)); - if (pamh) - pam_end(pamh, PAM_SUCCESS); + if (pamh) + pam_end (pamh, PAM_SUCCESS); } static void -ka_plugin_pam_activate (KaPlugin *self, KaApplet* applet) +ka_plugin_pam_activate (KaPlugin *self, KaApplet *applet) { - KaPluginPamPrivate *priv = GET_PRIVATE (self); - - priv->handlers[1] = g_signal_connect (applet, - "krb-tgt-acquired", - G_CALLBACK (renewed_event_cb), - NULL); - priv->handlers[0] = g_signal_connect (applet, - "krb-tgt-renewed", - G_CALLBACK (renewed_event_cb), - NULL); + KaPluginPamPrivate *priv = GET_PRIVATE (self); + + priv->handlers[1] = g_signal_connect (applet, + "krb-tgt-acquired", + G_CALLBACK (renewed_event_cb), NULL); + priv->handlers[0] = g_signal_connect (applet, + "krb-tgt-renewed", + G_CALLBACK (renewed_event_cb), NULL); } static void -ka_plugin_pam_deactivate (KaPlugin *self, KaApplet* applet) +ka_plugin_pam_deactivate (KaPlugin *self, KaApplet *applet) { - KaPluginPamPrivate *priv = GET_PRIVATE (self); + KaPluginPamPrivate *priv = GET_PRIVATE (self); - g_signal_handler_disconnect (applet, priv->handlers[0]); - g_signal_handler_disconnect (applet, priv->handlers[1]); + g_signal_handler_disconnect (applet, priv->handlers[0]); + g_signal_handler_disconnect (applet, priv->handlers[1]); } static void ka_plugin_pam_class_init (KaPluginPamClass *klass) { - GObjectClass *object_class = G_OBJECT_CLASS (klass); - KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + KaPluginClass *plugin_class = KA_PLUGIN_CLASS (klass); - g_type_class_add_private (klass, sizeof (KaPluginPamPrivate)); + g_type_class_add_private (klass, sizeof (KaPluginPamPrivate)); - plugin_class->activate = ka_plugin_pam_activate; - plugin_class->deactivate = ka_plugin_pam_deactivate; - object_class->finalize = ka_plugin_pam_finalize; + plugin_class->activate = ka_plugin_pam_activate; + plugin_class->deactivate = ka_plugin_pam_deactivate; + object_class->finalize = ka_plugin_pam_finalize; } static void @@ -121,8 +121,8 @@ ka_plugin_pam_init (KaPluginPam *self) { } -KaPluginPam* +KaPluginPam * ka_plugin_pam_new (void) { - return g_object_new (KA_TYPE_PLUGIN_PAM, KA_PLUGIN_PROP_NAME, "pam", NULL); + return g_object_new (KA_TYPE_PLUGIN_PAM, KA_PLUGIN_PROP_NAME, "pam", NULL); } diff --git a/plugins/ka-plugin-pam.h b/plugins/ka-plugin-pam.h index c693121..5f9b34a 100644 --- a/plugins/ka-plugin-pam.h +++ b/plugins/ka-plugin-pam.h @@ -22,38 +22,29 @@ #include <ka-plugin.h> G_BEGIN_DECLS - #define KA_TYPE_PLUGIN_PAM ka_plugin_pam_get_type() - #define KA_PLUGIN_PAM(obj) \ (G_TYPE_CHECK_INSTANCE_CAST ((obj), KA_TYPE_PLUGIN_PAM, KaPluginPam)) - #define KA_PLUGIN_PAM_CLASS(klass) \ (G_TYPE_CHECK_CLASS_CAST ((klass), KA_TYPE_PLUGIN_PAM, KaPluginPamClass)) - #define KA_IS_PLUGIN_PAM(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), KA_TYPE_PLUGIN_PAM)) - #define KA_IS_PLUGIN_PAM_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), KA_TYPE_PLUGIN_PAM)) - #define KA_PLUGIN_PAM_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), KA_TYPE_PLUGIN_PAM, KaPluginPamClass)) typedef struct { - KaPlugin parent; + KaPlugin parent; } KaPluginPam; typedef struct { - KaPluginClass parent_class; + KaPluginClass parent_class; } KaPluginPamClass; GType ka_plugin_pam_get_type (void); -KaPluginPam* ka_plugin_pam_new (void); +KaPluginPam *ka_plugin_pam_new (void); G_END_DECLS - #endif /* _KA_PLUGIN_PAM */ - -/* ka-plugin-pam.c */ @@ -10,5 +10,6 @@ pa sl sv uk +zh_CN zh_HK zh_TW @@ -13,13 +13,15 @@ # Guido Günther <agx@sigxcpu.org>, 2009. # Mario Blättermann <mariobl@gnome.org>, 2009, 2010. # Christian Kirbach <Christian.Kirbach@googlemail.com>, 2009, 2010. +# msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog master\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-05-21 09:43+0200\n" -"PO-Revision-Date: 2010-05-20 16:43+0200\n" -"Last-Translator: Christian Kirbach <Christian.Kirbach@googlemail.com>\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" +"auth-dialog&component=general\n" +"POT-Creation-Date: 2010-07-26 11:26+0000\n" +"PO-Revision-Date: 2010-07-27 00:21+0100\n" +"Last-Translator: Mario Blättermann <mariobl@gnome.org>\n" "Language-Team: Deutsch <gnome-de@gnome.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -45,7 +47,7 @@ msgstr "Ticket _erneuern" msgid "unknown error" msgstr "Unbekannter Fehler" -#: ../src/ka-dialog.c:332 +#: ../src/ka-dialog.c:333 msgid "Expired" msgstr "Abgelaufen" @@ -85,7 +87,7 @@ msgstr "%s-Fehler" #. Translators: files from dummy-strings.c are *all* possible errors #. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in -#. doubt please translate strings from files starting with krb5-auth +#. doubt please translate strings from files starting with ka- and krb5-auth- #. first since these are the ones the user will see in any case. #: ../src/dummy-strings.c:10 msgid "ASN.1 failed call to system time library" @@ -206,9 +208,8 @@ msgstr "Client oder Server hat einen Null-Schlüssel" #. krb5_err.et:krb5:KRB5KDC_ERR_NULL_KEY #: ../src/dummy-strings.c:33 -#, fuzzy msgid "Ticket is ineligible for postdating" -msgstr "Ticket kommt nicht für ? in Frage" +msgstr "Ticket kommt nicht für Nachdatierung in Frage" #. krb5_err.et:krb5:KRB5KDC_ERR_CANNOT_POSTDATE #: ../src/dummy-strings.c:34 @@ -399,9 +400,8 @@ msgstr "Unpassender Prüfsummentyp in Nachricht" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_INAPP_CKSUM #: ../src/dummy-strings.c:71 -#, fuzzy msgid "Policy rejects transited path" -msgstr "Richtlinie lehnt ? ab" +msgstr "Richtlinie lehnt umgewandelten Pfad ab" #. krb5_err.et:krb5:KRB5KRB_AP_PATH_NOT_ACCEPTED #: ../src/dummy-strings.c:72 @@ -650,8 +650,7 @@ msgstr "Kerberos-Dienst ist unbekannt" #: ../src/dummy-strings.c:120 msgid "Cannot contact any KDC for requested realm" msgstr "" -"Es kann kein KDC des angeforderten Administrationsbereiches kontaktiert " -"werden" +"Es kann kein KDC des angeforderten Administrationsbereiches kontaktiert werden" #. krb5_err.et:krb5:KRB5_KDC_UNREACH #: ../src/dummy-strings.c:121 @@ -951,8 +950,7 @@ msgstr "" #: ../src/dummy-strings.c:177 msgid "Unsupported key table format version number" msgstr "" -"Nicht unterstützte Formatversionsnummer des Schlüsseltabelle-" -"Zwischenspeichers" +"Nicht unterstützte Formatversionsnummer des Schlüsseltabelle-Zwischenspeichers" #. krb5_err.et:krb5:KRB5_KEYTAB_BADVNO #: ../src/dummy-strings.c:178 @@ -994,9 +992,8 @@ msgstr "" #. krb5_err.et:krb5:KRB5_REALM_CANT_RESOLVE #: ../src/dummy-strings.c:185 -#, fuzzy msgid "Requesting ticket can't get forwardable tickets" -msgstr "Angefordertes Ticket ?" +msgstr "Angefordertes Ticket kann keine weiterleitbaren Tickets erhalten" #. krb5_err.et:krb5:KRB5_TKT_NOT_FORWARDABLE #: ../src/dummy-strings.c:186 @@ -1046,8 +1043,7 @@ msgstr "Name der Schlüsseltabelle ist zu lang" #: ../src/dummy-strings.c:194 msgid "Key version number for principal in key table is incorrect" msgstr "" -"Versionsnummer des Schlüssels für Principal in Schlüsseltabelle ist " -"fehlerhaft" +"Versionsnummer des Schlüssels für Principal in Schlüsseltabelle ist fehlerhaft" #. krb5_err.et:krb5:KRB5_KT_KVNONOTFOUND #: ../src/dummy-strings.c:195 @@ -1440,36 +1436,36 @@ msgstr "Falsche magische Zahl für GSSAPI QUEUE" msgid "Your credentials expire in %.2d:%.2dh" msgstr "Anmeldeinformationen laufen in %.2d:%.2dh ab." -#: ../src/ka-applet.c:491 +#: ../src/ka-applet.c:500 msgid "Don't show me this again" msgstr "Dies nicht mehr anzeigen" -#: ../src/ka-applet.c:533 +#: ../src/ka-applet.c:542 msgid "Network credentials valid" msgstr "Anmeldeinformationen sind gültig" -#: ../src/ka-applet.c:534 +#: ../src/ka-applet.c:543 msgid "You've refreshed your Kerberos credentials." msgstr "Sie haben Ihre Kerberos-Anmeldeinformationen erneuert." -#: ../src/ka-applet.c:550 +#: ../src/ka-applet.c:559 msgid "Network credentials expiring" msgstr "Anmeldeinformationen laufen ab" -#: ../src/ka-applet.c:569 +#: ../src/ka-applet.c:578 msgid "Network credentials expired" msgstr "Anmeldeinformationen abgelaufen" -#: ../src/ka-applet.c:570 +#: ../src/ka-applet.c:579 msgid "Your Kerberos credentails have expired." msgstr "Ihre Kerberos-Anmeldeinformationen sind abgelaufen." -#: ../src/ka-applet.c:615 +#: ../src/ka-applet.c:624 #, c-format msgid "There was an error launching the preferences dialog: %s" msgstr "Fehler beim Öffnen des Einstellungsdialogs: %s" -#: ../src/ka-applet.c:656 +#: ../src/ka-applet.c:665 #, c-format msgid "" "There was an error displaying %s:\n" @@ -1479,7 +1475,7 @@ msgstr "" "%s" #. Translators: add the translators of your language here -#: ../src/ka-applet.c:692 +#: ../src/ka-applet.c:701 msgid "translator-credits" msgstr "" "Guido Günther <agx@sigxcpu.org>\n" @@ -1487,10 +1483,15 @@ msgstr "" "Christian Kirbach <Christian.Kirbach@googlemail.com>" #. kdestroy -#: ../src/ka-applet.c:734 +#: ../src/ka-applet.c:743 msgid "Remove Credentials _Cache" msgstr "_Anmeldeinformationen löschen" +#. Ticket dialog +#: ../src/ka-applet.c:753 +msgid "_List Tickets" +msgstr "Tickets auf_listen" + #: ../src/ka-tools.c:45 #, c-format msgid "" @@ -1607,8 +1608,7 @@ msgid "Show trayicon" msgstr "Benachrichtigungssymbol anzeigen" #: ../src/krb5-auth-dialog.schemas.in.h:19 -msgid "" -"Start prompting/displaying notifications that many minutes before expiry" +msgid "Start prompting/displaying notifications that many minutes before expiry" msgstr "So viele Minuten vor Ablauf benachrichtigen/anzeigen" #: ../src/krb5-auth-dialog.schemas.in.h:20 @@ -1686,8 +1686,8 @@ msgstr "Legt fest, ob erneuerbare Tickets angefordert werden sollen" #: ../preferences/krb5-auth-dialog-preferences.xml.h:8 msgid "If checked, use a security token (Smartcard) to authenticate." msgstr "" -"Legt fest, ob ein Sicherheits-Token (Smartcard) zur Identifizierung " -"verwendet wird" +"Legt fest, ob ein Sicherheits-Token (Smartcard) zur Identifizierung verwendet " +"wird" #: ../preferences/krb5-auth-dialog-preferences.xml.h:9 msgid "Kerberos" @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: krb5-auth-dialog.master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" "auth-dialog&component=general\n" -"POT-Creation-Date: 2010-04-27 17:51+0000\n" -"PO-Revision-Date: 2010-04-28 08:26+0200\n" +"POT-Creation-Date: 2010-07-26 11:26+0000\n" +"PO-Revision-Date: 2010-07-28 17:14+0200\n" "Last-Translator: Jorge González <jorgegonz@svn.gnome.org>\n" "Language-Team: Español <gnome-es-list@gnome.org>\n" "MIME-Version: 1.0\n" @@ -33,51 +33,51 @@ msgstr "Tiques de servicio" msgid "_Renew Ticket" msgstr "_Renovar tique" -#: ../src/krb5-auth-dialog.c:172 +#: ../src/ka-dialog.c:172 msgid "unknown error" msgstr "error desconocido" -#: ../src/krb5-auth-dialog.c:328 +#: ../src/ka-dialog.c:333 msgid "Expired" msgstr "Caducado" -#: ../src/krb5-auth-pwdialog.c:173 +#: ../src/ka-pwdialog.c:174 #, c-format msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "No se pudo obtener el tique de Kerberos: «%s»" -#: ../src/krb5-auth-pwdialog.c:210 ../src/krb5-auth-applet.c:390 +#: ../src/ka-pwdialog.c:211 ../src/ka-applet.c:390 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" msgstr[0] "Sus credenciales caducan en %d minuto" msgstr[1] "Sus credenciales caducan en %d minutos" -#: ../src/krb5-auth-pwdialog.c:215 ../src/krb5-auth-applet.c:395 +#: ../src/ka-pwdialog.c:216 ../src/ka-applet.c:395 msgid "Your credentials have expired" msgstr "Sus credenciales han caducado" -#: ../src/krb5-auth-pwdialog.c:236 +#: ../src/ka-pwdialog.c:237 msgid "Please enter your Kerberos password:" msgstr "Introduzca su contraseña de Kerberos:" -#: ../src/krb5-auth-pwdialog.c:247 +#: ../src/ka-pwdialog.c:248 #, c-format msgid "Please enter the password for '%s':" msgstr "Introduzca la contraseña para «%s»:" -#: ../src/krb5-auth-pwdialog.c:267 +#: ../src/ka-pwdialog.c:268 msgid "The password you entered is invalid" msgstr "La contraseña que ha introducido no es válida" -#: ../src/krb5-auth-pwdialog.c:283 +#: ../src/ka-pwdialog.c:284 #, c-format msgid "%s Error" msgstr "Error %s" #. Translators: files from dummy-strings.c are *all* possible errors #. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in -#. doubt please translate strings from files starting with krb5-auth +#. doubt please translate strings from files starting with ka- and krb5-auth- #. first since these are the ones the user will see in any case. #: ../src/dummy-strings.c:10 msgid "ASN.1 failed call to system time library" @@ -1403,41 +1403,41 @@ msgid "Bad magic number for GSSAPI QUEUE" msgstr "Número mágico erróneo para GSSAPI QUEUE" #. Translators: First number is hours, second number is minutes -#: ../src/krb5-auth-applet.c:386 +#: ../src/ka-applet.c:386 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Sus credenciales caducan en %.2d:%.2dh" -#: ../src/krb5-auth-applet.c:491 +#: ../src/ka-applet.c:500 msgid "Don't show me this again" msgstr "No mostrar este mensaje de nuevo" -#: ../src/krb5-auth-applet.c:533 +#: ../src/ka-applet.c:542 msgid "Network credentials valid" msgstr "Credenciales de red válidas" -#: ../src/krb5-auth-applet.c:534 +#: ../src/ka-applet.c:543 msgid "You've refreshed your Kerberos credentials." msgstr "Ha actualizado sus credenciales de Kerberos." -#: ../src/krb5-auth-applet.c:550 +#: ../src/ka-applet.c:559 msgid "Network credentials expiring" msgstr "Las credenciales de red van a caducar" -#: ../src/krb5-auth-applet.c:569 +#: ../src/ka-applet.c:578 msgid "Network credentials expired" msgstr "Las credenciales de red han caducado" -#: ../src/krb5-auth-applet.c:570 +#: ../src/ka-applet.c:579 msgid "Your Kerberos credentails have expired." msgstr "Sus credenciales Kerberos han caducado" -#: ../src/krb5-auth-applet.c:615 +#: ../src/ka-applet.c:624 #, c-format msgid "There was an error launching the preferences dialog: %s" msgstr "Hubo un error al lanzar el diálogo de preferencias: %s" -#: ../src/krb5-auth-applet.c:656 +#: ../src/ka-applet.c:665 #, c-format msgid "" "There was an error displaying %s:\n" @@ -1447,18 +1447,24 @@ msgstr "" "%s" #. Translators: add the translators of your language here -#: ../src/krb5-auth-applet.c:692 +#: ../src/ka-applet.c:701 msgid "translator-credits" msgstr "" "Jorge González <jorgegonz@svn.gnome.org>, 2009-2010\n" "Daniel Mustieles <daniel.mustieles@gmail.com>, 2009" #. kdestroy -#: ../src/krb5-auth-applet.c:734 +#: ../src/ka-applet.c:743 msgid "Remove Credentials _Cache" msgstr "Quitar la _caché de credenciales" -#: ../src/krb5-auth-tools.c:45 +#. Ticket dialog +#: ../src/ka-applet.c:753 +#| msgid "Service Tickets" +msgid "_List Tickets" +msgstr "_Listar tiques" + +#: ../src/ka-tools.c:45 #, c-format msgid "" "There was an error displaying help:\n" @@ -1467,31 +1473,31 @@ msgstr "" "Hubo un error al mostrar la ayuda:\n" "%s" -#: ../src/krb5-auth-tickets.c:54 +#: ../src/ka-tickets.c:54 msgid "Principal" msgstr "Principal" -#: ../src/krb5-auth-tickets.c:60 +#: ../src/ka-tickets.c:60 msgid "Start Time" msgstr "Tiempo de inicio" -#: ../src/krb5-auth-tickets.c:66 +#: ../src/ka-tickets.c:66 msgid "End Time" msgstr "Tiempo de finalización" -#: ../src/krb5-auth-tickets.c:72 +#: ../src/ka-tickets.c:72 msgid "Fwd" msgstr "Rnv" -#: ../src/krb5-auth-tickets.c:78 +#: ../src/ka-tickets.c:78 msgid "Proxy" msgstr "Proxy" -#: ../src/krb5-auth-tickets.c:84 +#: ../src/ka-tickets.c:84 msgid "Renew" msgstr "Renovar" -#: ../src/krb5-auth-tickets.c:107 +#: ../src/ka-tickets.c:107 msgid "Error displaying service ticket information" msgstr "Error al mostrar la información del tique de servicio" @@ -1602,15 +1608,15 @@ msgstr "tique de notificación válido" msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "Advertencia: ejecutar q-agent setuid en este sistema es peligroso\n" -#: ../preferences/krb5-auth-dialog-preferences.c:345 +#: ../preferences/ka-preferences.c:345 msgid "Choose Certificate" msgstr "Elija un certificado" -#: ../preferences/krb5-auth-dialog-preferences.c:361 +#: ../preferences/ka-preferences.c:361 msgid "X509 Certificates" msgstr "Certificados X509" -#: ../preferences/krb5-auth-dialog-preferences.c:365 +#: ../preferences/ka-preferences.c:365 msgid "all files" msgstr "todos los archivos" @@ -3,15 +3,15 @@ # This file is distributed under the same license as the krb5-auth-dialog package. # # Laurent Coudeur <laurentc@iol.ie>, 2009 -# Claude Paroz <claude@2xlibre.net>, 2009 +# Claude Paroz <claude@2xlibre.net>, 2009-2010 # msgid "" msgstr "" "Project-Id-Version: krb5-auth-dialog master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" "auth-dialog&component=general\n" -"POT-Creation-Date: 2009-10-12 15:10+0000\n" -"PO-Revision-Date: 2009-10-16 23:53+0200\n" +"POT-Creation-Date: 2010-07-26 11:26+0000\n" +"PO-Revision-Date: 2010-07-04 22:01+0200\n" "Last-Translator: Claude Paroz <claude@2xlibre.net>\n" "Language-Team: GNOME French Team <gnomefr@traduc.org>\n" "MIME-Version: 1.0\n" @@ -32,51 +32,51 @@ msgstr "Tickets de service" msgid "_Renew Ticket" msgstr "_Renouveler le ticket" -#: ../src/krb5-auth-dialog.c:172 +#: ../src/ka-dialog.c:172 msgid "unknown error" msgstr "erreur inconnue" -#: ../src/krb5-auth-dialog.c:328 +#: ../src/ka-dialog.c:333 msgid "Expired" msgstr "Expiré" -#: ../src/krb5-auth-pwdialog.c:170 +#: ../src/ka-pwdialog.c:174 #, c-format msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "Impossible d'acquérir le ticket Kerberos : « %s »" -#: ../src/krb5-auth-pwdialog.c:207 ../src/krb5-auth-applet.c:359 +#: ../src/ka-pwdialog.c:211 ../src/ka-applet.c:390 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" msgstr[0] "Vos informations d'authentification vont expirer dans %d minute" msgstr[1] "Vos informations d'authentification vont expirer dans %d minutes" -#: ../src/krb5-auth-pwdialog.c:212 ../src/krb5-auth-applet.c:364 +#: ../src/ka-pwdialog.c:216 ../src/ka-applet.c:395 msgid "Your credentials have expired" msgstr "Vos informations d'authentification ont expiré." -#: ../src/krb5-auth-pwdialog.c:233 +#: ../src/ka-pwdialog.c:237 msgid "Please enter your Kerberos password:" msgstr "Veuillez saisir votre mot de passe Kerberos :" -#: ../src/krb5-auth-pwdialog.c:244 +#: ../src/ka-pwdialog.c:248 #, c-format msgid "Please enter the password for '%s':" msgstr "Veuillez saisir le mot de passe pour « %s » :" -#: ../src/krb5-auth-pwdialog.c:264 +#: ../src/ka-pwdialog.c:268 msgid "The password you entered is invalid" msgstr "Le mot de passe que vous avez saisi n'est pas valide" -#: ../src/krb5-auth-pwdialog.c:280 +#: ../src/ka-pwdialog.c:284 #, c-format msgid "%s Error" msgstr "Erreur %s" #. Translators: files from dummy-strings.c are *all* possible errors #. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in -#. doubt please translate strings from files starting with krb5-auth +#. doubt please translate strings from files starting with ka- and krb5-auth- #. first since these are the ones the user will see in any case. #: ../src/dummy-strings.c:10 msgid "ASN.1 failed call to system time library" @@ -1402,43 +1402,43 @@ msgid "Bad magic number for GSSAPI QUEUE" msgstr "Numéro magique GSSAPI QUEUE incorrect" #. Translators: First number is hours, second number is minutes -#: ../src/krb5-auth-applet.c:355 +#: ../src/ka-applet.c:386 #, c-format msgid "Your credentials expire in %.2d:%.2dh" msgstr "Vos informations d'authentification expirent dans %.2d h %.2d" -#: ../src/krb5-auth-applet.c:460 +#: ../src/ka-applet.c:500 msgid "Don't show me this again" msgstr "Ne plus afficher" -#: ../src/krb5-auth-applet.c:497 +#: ../src/ka-applet.c:542 msgid "Network credentials valid" msgstr "Informations d'authentification réseau valides" -#: ../src/krb5-auth-applet.c:498 +#: ../src/ka-applet.c:543 msgid "You've refreshed your Kerberos credentials." msgstr "Vous avez actualisé vos informations d'authentification Kerberos." -#: ../src/krb5-auth-applet.c:511 +#: ../src/ka-applet.c:559 msgid "Network credentials expiring" msgstr "Informations d'authentification Kerberos en cours d'expiration" -#: ../src/krb5-auth-applet.c:526 +#: ../src/ka-applet.c:578 msgid "Network credentials expired" msgstr "Informations d'authentification réseau expirées" -#: ../src/krb5-auth-applet.c:527 +#: ../src/ka-applet.c:579 msgid "Your Kerberos credentails have expired." msgstr "Vos informations d'authentification Kerberos ont expiré." -#: ../src/krb5-auth-applet.c:570 +#: ../src/ka-applet.c:624 #, c-format msgid "There was an error launching the preferences dialog: %s" msgstr "" -"Une erreur est survenue lors de l'ouverture de la boîte de dialogue " -"des préférences : %s" +"Une erreur est survenue lors de l'ouverture de la boîte de dialogue des " +"préférences : %s" -#: ../src/krb5-auth-applet.c:611 +#: ../src/ka-applet.c:665 #, c-format msgid "" "There was an error displaying %s:\n" @@ -1448,18 +1448,23 @@ msgstr "" "%s" #. Translators: add the translators of your language here -#: ../src/krb5-auth-applet.c:647 +#: ../src/ka-applet.c:701 msgid "translator-credits" msgstr "" "Laurent Coudeur <laurentc@iol.ie>\n" "Claude Paroz <claude@2xlibre.net>" #. kdestroy -#: ../src/krb5-auth-applet.c:689 +#: ../src/ka-applet.c:743 msgid "Remove Credentials _Cache" msgstr "Supprimer le _cache des informations d'authentification" -#: ../src/krb5-auth-tools.c:45 +#. Ticket dialog +#: ../src/ka-applet.c:753 +msgid "_List Tickets" +msgstr "É_numérer les tickets" + +#: ../src/ka-tools.c:45 #, c-format msgid "" "There was an error displaying help:\n" @@ -1468,31 +1473,31 @@ msgstr "" "Une erreur est survenue lors de l'affichage de l'aide :\n" "%s" -#: ../src/krb5-auth-tickets.c:54 +#: ../src/ka-tickets.c:54 msgid "Principal" msgstr "Principal" -#: ../src/krb5-auth-tickets.c:60 +#: ../src/ka-tickets.c:60 msgid "Start Time" msgstr "Heure de début" -#: ../src/krb5-auth-tickets.c:66 +#: ../src/ka-tickets.c:66 msgid "End Time" msgstr "Heure de fin" -#: ../src/krb5-auth-tickets.c:72 +#: ../src/ka-tickets.c:72 msgid "Fwd" msgstr "Transfert" -#: ../src/krb5-auth-tickets.c:78 +#: ../src/ka-tickets.c:78 msgid "Proxy" msgstr "Proxy" -#: ../src/krb5-auth-tickets.c:84 +#: ../src/ka-tickets.c:84 msgid "Renew" msgstr "Renouvellement" -#: ../src/krb5-auth-tickets.c:107 +#: ../src/ka-tickets.c:107 msgid "Error displaying service ticket information" msgstr "Erreur lors de l'affichage des informations du ticket de service" @@ -1501,97 +1506,105 @@ msgid "Kerberos Network Authentication Dialog" msgstr "Boîte de dialogue d'authentification réseau Kerberos" #: ../src/krb5-auth-dialog.schemas.in.h:1 +msgid "Enabled plugins" +msgstr "Greffons actifs" + +#: ../src/krb5-auth-dialog.schemas.in.h:2 msgid "Forwardable ticket" msgstr "Ticket transférable" -#: ../src/krb5-auth-dialog.schemas.in.h:2 +#: ../src/krb5-auth-dialog.schemas.in.h:3 msgid "Kerberos principal" msgstr "Principal Kerberos" -#: ../src/krb5-auth-dialog.schemas.in.h:3 +#: ../src/krb5-auth-dialog.schemas.in.h:4 +msgid "List of plugins that should be loaded and activated on startup." +msgstr "Liste de greffons qui sont chargés et activés au démarrage." + +#: ../src/krb5-auth-dialog.schemas.in.h:5 msgid "Notify user when ticket becomes valid" msgstr "Avertir l'utilisateur lorsque le ticket devient valide" -#: ../src/krb5-auth-dialog.schemas.in.h:4 +#: ../src/krb5-auth-dialog.schemas.in.h:6 msgid "Notify user when ticket has expired" msgstr "Avertir l'utilisateur lorsque le ticket a expiré" -#: ../src/krb5-auth-dialog.schemas.in.h:5 +#: ../src/krb5-auth-dialog.schemas.in.h:7 msgid "Notify user when ticket is about to expire" msgstr "Avertir l'utilisateur lorsque le ticket est sur le point d'expirer" -#: ../src/krb5-auth-dialog.schemas.in.h:6 +#: ../src/krb5-auth-dialog.schemas.in.h:8 msgid "PKINIT CA certificates" msgstr "Certificats CA PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:7 +#: ../src/krb5-auth-dialog.schemas.in.h:9 msgid "PKINIT identifier" msgstr "Identifiant PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:8 +#: ../src/krb5-auth-dialog.schemas.in.h:10 msgid "PKINIT trust anchors" msgstr "Ancrages de confiance PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:9 +#: ../src/krb5-auth-dialog.schemas.in.h:11 msgid "Prompt minutes before expiry" msgstr "Avertir n minutes avant l'expiration" -#: ../src/krb5-auth-dialog.schemas.in.h:10 +#: ../src/krb5-auth-dialog.schemas.in.h:12 msgid "Proxiable ticket" msgstr "Ticket utilisable via proxy" -#: ../src/krb5-auth-dialog.schemas.in.h:11 +#: ../src/krb5-auth-dialog.schemas.in.h:13 msgid "Renewable ticket" msgstr "Ticket renouvelable" -#: ../src/krb5-auth-dialog.schemas.in.h:12 +#: ../src/krb5-auth-dialog.schemas.in.h:14 msgid "Requested tickets should be forwardable" msgstr "Les tickets demandés doivent être transférables" -#: ../src/krb5-auth-dialog.schemas.in.h:13 +#: ../src/krb5-auth-dialog.schemas.in.h:15 msgid "Requested tickets should be proxiable" msgstr "Les tickets demandés doivent être utilisables au travers d'un proxy" -#: ../src/krb5-auth-dialog.schemas.in.h:14 +#: ../src/krb5-auth-dialog.schemas.in.h:16 msgid "Requested tickets should be renewable" msgstr "Les tickets demandés doivent être renouvelables" -#: ../src/krb5-auth-dialog.schemas.in.h:15 +#: ../src/krb5-auth-dialog.schemas.in.h:17 msgid "Show a trayicon in the status area of the panel" msgstr "" "Afficher une icône de notification dans la zone correspondante du tableau de " "bord" -#: ../src/krb5-auth-dialog.schemas.in.h:16 +#: ../src/krb5-auth-dialog.schemas.in.h:18 msgid "Show trayicon" msgstr "Afficher une icône de notification" -#: ../src/krb5-auth-dialog.schemas.in.h:17 +#: ../src/krb5-auth-dialog.schemas.in.h:19 msgid "" "Start prompting/displaying notifications that many minutes before expiry" msgstr "" "Commencer à demander/afficher des notifications tant de minutes avant " "l'expiration" -#: ../src/krb5-auth-dialog.schemas.in.h:18 +#: ../src/krb5-auth-dialog.schemas.in.h:20 msgid "The kerberos principal to acquire the ticket for" msgstr "Le principal Kerberos pour lequel obtenir le ticket" -#: ../src/krb5-auth-dialog.schemas.in.h:19 +#: ../src/krb5-auth-dialog.schemas.in.h:21 msgid "The principal's public/private/certificate identifier when using PKINIT" msgstr "" "L'identifiant publique/privé/certificat du principal lors de l'utilisation " "de PKINIT" -#: ../src/krb5-auth-dialog.schemas.in.h:20 +#: ../src/krb5-auth-dialog.schemas.in.h:22 msgid "ticket expired notification" msgstr "Notification de ticket expiré" -#: ../src/krb5-auth-dialog.schemas.in.h:21 +#: ../src/krb5-auth-dialog.schemas.in.h:23 msgid "ticket expiring notification" msgstr "Notification de ticket en cours d'expiration" -#: ../src/krb5-auth-dialog.schemas.in.h:22 +#: ../src/krb5-auth-dialog.schemas.in.h:24 msgid "valid ticket notification" msgstr "Notification de ticket valide" @@ -1600,15 +1613,15 @@ msgstr "Notification de ticket valide" msgid "Warning: running q-agent setuid on this system is dangerous\n" msgstr "Avertissement : exécuter q-agent setuid sur ce système est dangereux\n" -#: ../preferences/krb5-auth-dialog-preferences.c:345 +#: ../preferences/ka-preferences.c:345 msgid "Choose Certificate" msgstr "Choix d'un certificat" -#: ../preferences/krb5-auth-dialog-preferences.c:361 +#: ../preferences/ka-preferences.c:361 msgid "X509 Certificates" msgstr "Certificats X509" -#: ../preferences/krb5-auth-dialog-preferences.c:365 +#: ../preferences/ka-preferences.c:365 msgid "all files" msgstr "tous les fichiers" @@ -1646,7 +1659,8 @@ msgstr "Si coché, demande des tickets renouvelables" #: ../preferences/krb5-auth-dialog-preferences.xml.h:8 msgid "If checked, use a security token (Smartcard) to authenticate." -msgstr "Si coché, utilise un jeton de sécurité (Smartcard) pour l'authentification." +msgstr "" +"Si coché, utilise un jeton de sécurité (Smartcard) pour l'authentification." #: ../preferences/krb5-auth-dialog-preferences.xml.h:9 msgid "Kerberos" @@ -1,5 +1,5 @@ -# translation of nb.po to Norwegian BokmÃ¥l -# Norwegian bokmÃ¥l translation of krb5-auth-dialog +# translation of nb.po to Norwegian Bokmål +# Norwegian bokmål translation of krb5-auth-dialog # Copyright (C) 2005 Red Hat, Inc. # This file is distributed under the same license as the krb5-auth-dialog package. # @@ -10,9 +10,9 @@ msgstr "" "Project-Id-Version: nb\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-05-21 09:43+0200\n" -"PO-Revision-Date: 2010-06-05 17:11MET\n" +"PO-Revision-Date: 2010-07-25 01:08MET\n" "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n" -"Language-Team: Norwegian BokmÃ¥l <i18n-nb@lister.ping.uio.no>\n" +"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -25,9 +25,8 @@ msgid "Network Authentication" msgstr "Nettverksautentisering" #: ../src/krb5-auth-dialog.xml.h:2 -#, fuzzy msgid "Service Tickets" -msgstr "Fo_rny billett" +msgstr "Tjenestebilletter" #: ../src/krb5-auth-dialog.xml.h:3 msgid "_Renew Ticket" @@ -39,23 +38,23 @@ msgstr "ukjent feil" #: ../src/ka-dialog.c:332 msgid "Expired" -msgstr "UtgÃ¥tt" +msgstr "Utgått" #: ../src/ka-pwdialog.c:174 #, c-format msgid "Couldn't acquire kerberos ticket: '%s'" -msgstr "" +msgstr "Fikk ikke tak i kerberosbillett: '%s'" #: ../src/ka-pwdialog.c:211 ../src/ka-applet.c:390 #, c-format msgid "Your credentials expire in %d minute" msgid_plural "Your credentials expire in %d minutes" -msgstr[0] "PÃ¥loggingsinformasjonen utløper om %d minutt" -msgstr[1] "PÃ¥loggingsinformasjonen utløper om %d minutter" +msgstr[0] "Påloggingsinformasjonen utløper om %d minutt" +msgstr[1] "Påloggingsinformasjonen utløper om %d minutter" #: ../src/ka-pwdialog.c:216 ../src/ka-applet.c:395 msgid "Your credentials have expired" -msgstr "PÃ¥loggingsinformasjonen har gÃ¥tt ut" +msgstr "Påloggingsinformasjonen har gått ut" #: ../src/ka-pwdialog.c:237 msgid "Please enter your Kerberos password:" @@ -64,7 +63,7 @@ msgstr "Vennligst skriv inn ditt Kerberos-passord:" #: ../src/ka-pwdialog.c:248 #, c-format msgid "Please enter the password for '%s':" -msgstr "Vennligst oppgi passord for «%s»:" +msgstr "Vennligst oppgi passord for «%s»:" #: ../src/ka-pwdialog.c:268 msgid "The password you entered is invalid" @@ -101,7 +100,7 @@ msgstr "" #. asn1_err.et:asn1:ASN1_TYPE_MISMATCH #: ../src/dummy-strings.c:14 msgid "ASN.1 value too large" -msgstr "" +msgstr "ASN.1-verdi for stor" #. asn1_err.et:asn1:ASN1_OVERFLOW #: ../src/dummy-strings.c:15 @@ -146,22 +145,22 @@ msgstr "" #. asn1_err.et:asn1:ASN1_MISSING_EOC #: ../src/dummy-strings.c:23 msgid "No error" -msgstr "" +msgstr "Ingen feil" #. krb5_err.et:krb5:KRB5KDC_ERR_NONE #: ../src/dummy-strings.c:24 msgid "Client's entry in database has expired" -msgstr "" +msgstr "Klientens oppføring i databasen har gått ut" #. krb5_err.et:krb5:KRB5KDC_ERR_NAME_EXP #: ../src/dummy-strings.c:25 msgid "Server's entry in database has expired" -msgstr "" +msgstr "Tjenerens oppføring i databasen har gått ut" #. krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_EXP #: ../src/dummy-strings.c:26 msgid "Requested protocol version not supported" -msgstr "" +msgstr "Forespurt protokollversjon er ikke støttet" #. krb5_err.et:krb5:KRB5KDC_ERR_BAD_PVNO #: ../src/dummy-strings.c:27 @@ -191,7 +190,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE #: ../src/dummy-strings.c:32 msgid "Client or server has a null key" -msgstr "Klient eller tjener har en tom nøkkel" +msgstr "Klient eller tjener har en tom nøkkel" #. krb5_err.et:krb5:KRB5KDC_ERR_NULL_KEY #: ../src/dummy-strings.c:33 @@ -291,12 +290,12 @@ msgstr "" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BAD_INTEGRITY #: ../src/dummy-strings.c:52 msgid "Ticket expired" -msgstr "Billett utgÃ¥tt" +msgstr "Billett utgått" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_EXPIRED #: ../src/dummy-strings.c:53 msgid "Ticket not yet valid" -msgstr "Billett er ikke gyldig ennÃ¥" +msgstr "Billett er ikke gyldig ennå" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_NYV #: ../src/dummy-strings.c:54 @@ -356,7 +355,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADKEYVER #: ../src/dummy-strings.c:65 msgid "Service key not available" -msgstr "" +msgstr "Tjenestenøkkel er ikke tilgjengelig" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOKEY #. krb5_err.et:krb5:KRB5_NO_LOCALNAME @@ -377,7 +376,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_METHOD #: ../src/dummy-strings.c:69 msgid "Incorrect sequence number in message" -msgstr "" +msgstr "Feil sekvensnummer i melding" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADSEQ #: ../src/dummy-strings.c:70 @@ -392,7 +391,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KRB_AP_PATH_NOT_ACCEPTED #: ../src/dummy-strings.c:72 msgid "Response too big for UDP, retry with TCP" -msgstr "" +msgstr "Responsen er for stor for UDP. Forsøk på nytt med TCP" #. krb5_err.et:krb5:KRB5KRB_ERR_RESPONSE_TOO_BIG #: ../src/dummy-strings.c:73 @@ -487,7 +486,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED #: ../src/dummy-strings.c:91 msgid "Public key encryption not supported" -msgstr "" +msgstr "Offentlig nøkkel-kryptering er ikke støttet" #. krb5_err.et:krb5:KRB5KDC_ERR_PUBLIC_KEY_ENCRYPTION_NOT_SUPPORTED #: ../src/dummy-strings.c:92 @@ -502,7 +501,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_LIBOS_BADLOCKFLAG #: ../src/dummy-strings.c:94 msgid "Cannot read password" -msgstr "" +msgstr "Kan ikke lese passord" #. krb5_err.et:krb5:KRB5_LIBOS_CANTREADPWD #: ../src/dummy-strings.c:95 @@ -547,7 +546,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_BADMSGTYPE #: ../src/dummy-strings.c:103 msgid "Credential cache name malformed" -msgstr "" +msgstr "Navn på fullmaktsmellomlager er ikke velformet" #. krb5_err.et:krb5:KRB5_CC_BADNAME #: ../src/dummy-strings.c:104 @@ -627,7 +626,7 @@ msgstr "" #. krb5_err.et:krb5:KRB5_REALM_UNKNOWN #: ../src/dummy-strings.c:119 msgid "Kerberos service unknown" -msgstr "" +msgstr "Ukjent kerberostjeneste" #. krb5_err.et:krb5:KRB5_SERVICE_UNKNOWN #: ../src/dummy-strings.c:120 @@ -1382,38 +1381,33 @@ msgstr "" #. Translators: First number is hours, second number is minutes #: ../src/ka-applet.c:386 -#, fuzzy, c-format +#, c-format msgid "Your credentials expire in %.2d:%.2dh" -msgstr "PÃ¥loggingsinformasjonen utløper om %d minutt" +msgstr "Fine fullmakter utgår om %.2d:%.2dt" #: ../src/ka-applet.c:491 msgid "Don't show me this again" msgstr "Ikke vis meg dette igjen" #: ../src/ka-applet.c:533 -#, fuzzy msgid "Network credentials valid" -msgstr "PÃ¥loggingsinformasjonen har gÃ¥tt ut" +msgstr "Nettverksfullmakter er gyldige" #: ../src/ka-applet.c:534 -#, fuzzy msgid "You've refreshed your Kerberos credentials." -msgstr "PÃ¥loggingsinformasjonen har gÃ¥tt ut" +msgstr "Du har fornyhet dine kerberosfullmakter" #: ../src/ka-applet.c:550 -#, fuzzy msgid "Network credentials expiring" -msgstr "PÃ¥loggingsinformasjonen har gÃ¥tt ut" +msgstr "Nettverksfullmaktene går ut" #: ../src/ka-applet.c:569 -#, fuzzy msgid "Network credentials expired" -msgstr "PÃ¥loggingsinformasjonen har gÃ¥tt ut" +msgstr "Nettverksfullmaktene har gått ut" #: ../src/ka-applet.c:570 -#, fuzzy msgid "Your Kerberos credentails have expired." -msgstr "PÃ¥loggingsinformasjonen har gÃ¥tt ut" +msgstr "Dine kerberosfullmakter har gått ut." #: ../src/ka-applet.c:615 #, c-format @@ -1430,12 +1424,12 @@ msgstr "" #. Translators: add the translators of your language here #: ../src/ka-applet.c:692 msgid "translator-credits" -msgstr "" +msgstr "Petter Reinholdtsen <pere@hungry.com>, 2010" #. kdestroy #: ../src/ka-applet.c:734 msgid "Remove Credentials _Cache" -msgstr "" +msgstr "Fjern fullmakts_mellomlager" #: ../src/ka-tools.c:45 #, c-format @@ -1494,15 +1488,15 @@ msgstr "Liste over utvidelser som skal lastes og aktiveres ved start" #: ../src/krb5-auth-dialog.schemas.in.h:5 msgid "Notify user when ticket becomes valid" -msgstr "" +msgstr "Meld fra til bruker når billett blir gyldig" #: ../src/krb5-auth-dialog.schemas.in.h:6 msgid "Notify user when ticket has expired" -msgstr "" +msgstr "Meld fra til bruker når billett har gått ut" #: ../src/krb5-auth-dialog.schemas.in.h:7 msgid "Notify user when ticket is about to expire" -msgstr "" +msgstr "Meld fra til bruker når billett snart går ut" #: ../src/krb5-auth-dialog.schemas.in.h:8 msgid "PKINIT CA certificates" @@ -1595,7 +1589,7 @@ msgstr "" #: ../preferences/krb5-auth-dialog-preferences.xml.h:1 msgid "Appearance" -msgstr "" +msgstr "Utseende" #: ../preferences/krb5-auth-dialog-preferences.xml.h:2 msgid "Applet" @@ -1643,7 +1637,7 @@ msgstr "" #: ../preferences/krb5-auth-dialog-preferences.xml.h:13 msgid "Notifications" -msgstr "" +msgstr "Varsler" #: ../preferences/krb5-auth-dialog-preferences.xml.h:14 msgid "PKINIT:" @@ -1651,7 +1645,7 @@ msgstr "PKINIT:" #: ../preferences/krb5-auth-dialog-preferences.xml.h:15 msgid "Requested Kerberos tickets should be:" -msgstr "" +msgstr "Forespurte kerberosbilletter bør være:" #: ../preferences/krb5-auth-dialog-preferences.xml.h:16 msgid "" @@ -1678,7 +1672,7 @@ msgstr "Brukerid:" #. Used in combination: 'Warn x minutes before expiry' #: ../preferences/krb5-auth-dialog-preferences.xml.h:22 msgid "Warn" -msgstr "" +msgstr "Varsle" #: ../preferences/krb5-auth-dialog-preferences.xml.h:23 msgid "X509 trust anchors:" @@ -1690,12 +1684,12 @@ msgstr "" #: ../preferences/krb5-auth-dialog-preferences.xml.h:25 msgid "forwardable" -msgstr "" +msgstr "videresendbar" #. Used in combination: 'Warn x minutes before expiry' #: ../preferences/krb5-auth-dialog-preferences.xml.h:27 msgid "minutes before expiry" -msgstr "" +msgstr "minutter før utgåelsen" #: ../preferences/krb5-auth-dialog-preferences.xml.h:28 msgid "proxiable" @@ -1708,3 +1702,5 @@ msgstr "fornybar" msgid "PKINIT anchors:" msgstr "PKINIT Anker:" +msgid "_List Tickets" +msgstr "_Vis billetter" @@ -1,4 +1,4 @@ -# Slovenian translation for krb5-auth-dialog. +# Slovenian translations for krb5-auth-dialog. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the krb5-auth-dialog package. # @@ -6,11 +6,11 @@ # msgid "" msgstr "" -"Project-Id-Version: krb5-auth-dialog\n" +"Project-Id-Version: krb5-auth-dialog master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-auth-dialog&component=general\n" -"POT-Creation-Date: 2010-04-29 08:29+0000\n" -"PO-Revision-Date: 2010-05-01 09:34+0100\n" -"Last-Translator: Andrej Žnidaršič <andrej.znidarsic@gmail.com>\n" +"POT-Creation-Date: 2010-07-29 10:31+0000\n" +"PO-Revision-Date: 2010-08-05 13:21+0100\n" +"Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n" "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -38,16 +38,16 @@ msgstr "_Obnovi vstopnico" msgid "unknown error" msgstr "neznana napaka" -#: ../src/ka-dialog.c:328 +#: ../src/ka-dialog.c:333 msgid "Expired" msgstr "Pretečeno" -#: ../src/ka-pwdialog.c:173 +#: ../src/ka-pwdialog.c:174 #, c-format msgid "Couldn't acquire kerberos ticket: '%s'" msgstr "Ni mogoče pridobiti vstopnice kerberos: '%s'" -#: ../src/ka-pwdialog.c:210 +#: ../src/ka-pwdialog.c:211 #: ../src/ka-applet.c:390 #, c-format msgid "Your credentials expire in %d minute" @@ -57,32 +57,32 @@ msgstr[1] "Vaša poverila potečejo v %d minuti" msgstr[2] "Vaša poverila potečejo v %d minutah" msgstr[3] "Vaša poverila potečejo v %d minutah" -#: ../src/ka-pwdialog.c:215 +#: ../src/ka-pwdialog.c:216 #: ../src/ka-applet.c:395 msgid "Your credentials have expired" msgstr "Vaša poverila so potekla" -#: ../src/ka-pwdialog.c:236 +#: ../src/ka-pwdialog.c:237 msgid "Please enter your Kerberos password:" msgstr "Vnesite svoje geslo Kerberos:" -#: ../src/ka-pwdialog.c:247 +#: ../src/ka-pwdialog.c:248 #, c-format msgid "Please enter the password for '%s':" msgstr "Vnesite geslo za '%s':" -#: ../src/ka-pwdialog.c:267 +#: ../src/ka-pwdialog.c:268 msgid "The password you entered is invalid" msgstr "Vneseno geslo je neveljavno" -#: ../src/ka-pwdialog.c:283 +#: ../src/ka-pwdialog.c:284 #, c-format msgid "%s Error" msgstr "%s napaka" #. Translators: files from dummy-strings.c are *all* possible errors #. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in -#. doubt please translate strings from files starting with krb5-auth +#. doubt please translate strings from files starting with ka- and krb5-auth- #. first since these are the ones the user will see in any case. #: ../src/dummy-strings.c:10 msgid "ASN.1 failed call to system time library" @@ -331,7 +331,7 @@ msgstr "Nepravilen spletni naslov" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADADDR #: ../src/dummy-strings.c:59 msgid "Protocol version mismatch" -msgstr "Neujemanje različice protokola" +msgstr "Neskladje različice protokola" #. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADVERSION #: ../src/dummy-strings.c:60 @@ -463,12 +463,12 @@ msgstr "Stanje preklica ni na voljo" #. krb5_err.et:krb5:KRB5KDC_ERR_REVOCATION_STATUS_UNAVAILABLE #: ../src/dummy-strings.c:85 msgid "Client name mismatch" -msgstr "Neujemanje imena odjemalca" +msgstr "Neskladje imena odjemalca" #. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NAME_MISMATCH #: ../src/dummy-strings.c:86 msgid "KDC name mismatch" -msgstr "Neujemanje imena KDC" +msgstr "Neskladje imena KDC" #. krb5_err.et:krb5:KRB5KDC_ERR_KDC_NAME_MISMATCH #: ../src/dummy-strings.c:87 @@ -563,7 +563,7 @@ msgstr "Neznana vrsta predpomnilnika poveril" #. krb5_err.et:krb5:KRB5_CC_UNKNOWN_TYPE #: ../src/dummy-strings.c:105 msgid "Matching credential not found" -msgstr "Skladajočega poverila ni mogoče najti" +msgstr "Skladnega poverila ni mogoče najti" #. krb5_err.et:krb5:KRB5_CC_NOTFOUND #: ../src/dummy-strings.c:106 @@ -603,7 +603,7 @@ msgstr "Časovni zamik sistemske ure je v odgovoru KDC prevelik" #. krb5_err.et:krb5:KRB5_KDCREP_SKEW #: ../src/dummy-strings.c:113 msgid "Client/server realm mismatch in initial ticket request" -msgstr "Neujemanje področja odjemalca/strežnika v začetni zahtevi vstopnice" +msgstr "Neskladje področja odjemalca/strežnika v začetni zahtevi vstopnice" #. krb5_err.et:krb5:KRB5_IN_TKT_REALM_MISMATCH #: ../src/dummy-strings.c:114 @@ -1393,36 +1393,36 @@ msgstr "Slabo čarobno število od GSSAPI VRSTE" msgid "Your credentials expire in %.2d:%.2dh" msgstr "Vaša poverila potečejo v %.2d%.2dh" -#: ../src/ka-applet.c:491 +#: ../src/ka-applet.c:500 msgid "Don't show me this again" msgstr "Tega ne prikaži več" -#: ../src/ka-applet.c:533 +#: ../src/ka-applet.c:542 msgid "Network credentials valid" msgstr "Omrežna varovala so veljavna" -#: ../src/ka-applet.c:534 +#: ../src/ka-applet.c:543 msgid "You've refreshed your Kerberos credentials." msgstr "Osvežili ste svoja poverila Kerberos" -#: ../src/ka-applet.c:550 +#: ../src/ka-applet.c:559 msgid "Network credentials expiring" msgstr "Omrežna varovala bodo potekla" -#: ../src/ka-applet.c:569 +#: ../src/ka-applet.c:578 msgid "Network credentials expired" msgstr "Omrežna varovala so potekla" -#: ../src/ka-applet.c:570 +#: ../src/ka-applet.c:579 msgid "Your Kerberos credentails have expired." msgstr "Vaša varovala Kerberos so potekla." -#: ../src/ka-applet.c:615 +#: ../src/ka-applet.c:624 #, c-format msgid "There was an error launching the preferences dialog: %s" msgstr "Prišlo je do napake med zagonom pogovornega okna možnosti: %s" -#: ../src/ka-applet.c:656 +#: ../src/ka-applet.c:665 #, c-format msgid "" "There was an error displaying %s:\n" @@ -1432,17 +1432,22 @@ msgstr "" "%s" #. Translators: add the translators of your language here -#: ../src/ka-applet.c:692 +#: ../src/ka-applet.c:701 msgid "translator-credits" msgstr "" "Andrej Žnidaršič\n" "Matej Urbančič" #. kdestroy -#: ../src/ka-applet.c:734 +#: ../src/ka-applet.c:743 msgid "Remove Credentials _Cache" msgstr "Odstrani _predpomnilnik varoval" +#. Ticket dialog +#: ../src/ka-applet.c:753 +msgid "_List Tickets" +msgstr "_Naštej vstopnice" + #: ../src/ka-tools.c:45 #, c-format msgid "" @@ -1679,7 +1684,7 @@ msgstr "Uporabi SmartCard" #: ../preferences/krb5-auth-dialog-preferences.xml.h:20 msgid "Userid:" -msgstr "Uporabniški id:" +msgstr "Uporabniški ID:" #. Used in combination: 'Warn x minutes before expiry' #: ../preferences/krb5-auth-dialog-preferences.xml.h:22 @@ -1705,74 +1710,8 @@ msgstr "minut pred iztekom" #: ../preferences/krb5-auth-dialog-preferences.xml.h:28 msgid "proxiable" -msgstr "posredovano" +msgstr "posredovana" #: ../preferences/krb5-auth-dialog-preferences.xml.h:29 msgid "renewable" -msgstr "obnovljiva" - -#~ msgid "_Preferences" -#~ msgstr "_Možnosti" -#~ msgid "_About" -#~ msgstr "_O Programu" -#~ msgid "_Quit" -#~ msgstr "_Končaj" -#~ msgid "Cursor Position" -#~ msgstr "Položaj kazalca" -#~ msgid "The current position of the insertion cursor in chars" -#~ msgstr "Trenutni položaj kazalca vstavljanja v znakih" -#~ msgid "Selection Bound" -#~ msgstr "Vezava izbire" -#~ msgid "" -#~ "The position of the opposite end of the selection from the cursor in chars" -#~ msgstr "Položaj nasprotnega konca izbire od kazalca (v znakih)" -#~ msgid "Maximum length" -#~ msgstr "Največja dolžina" -#~ msgid "Maximum number of characters for this entry. Zero if no maximum" -#~ msgstr "Največje število znakov v tem vnosu. Vrednost 0 onemogoči omejitev" -#~ msgid "Has Frame" -#~ msgstr "Ima okvir" -#~ msgid "FALSE removes outside bevel from entry" -#~ msgstr "Neizbrana možnost odstrani zunanjo izobčenost vnosa" -#~ msgid "Invisible character" -#~ msgstr "Nevidni znak" -#~ msgid "" -#~ "The character to use when masking entry contents (in \"password mode\")" -#~ msgstr "Znak za maskiranje vsebine vnosa (v \"geselskem načinu\")" -#~ msgid "Activates default" -#~ msgstr "Zaženi privzetega" -#~ msgid "" -#~ "Whether to activate the default widget (such as the default button in a " -#~ "dialog) when Enter is pressed" -#~ msgstr "" -#~ "Ali se zažene privzet gradnik (na primer privzet gumb pogovornega okna), " -#~ "ko je pritisnjena vnosna tipka." -#~ msgid "Width in chars" -#~ msgstr "Širina v znakih" -#~ msgid "Number of characters to leave space for in the entry" -#~ msgstr "Število znakov za katere naj bo v vnosu izpuščen prostor" -#~ msgid "Scroll offset" -#~ msgstr "Drsni zamik" -#~ msgid "Number of pixels of the entry scrolled off the screen to the left" -#~ msgstr "Število točk vnosa, ki drsijo mimo zaslona na levo" -#~ msgid "Text" -#~ msgstr "Besedilo" -#~ msgid "The contents of the entry" -#~ msgstr "Vsebina vnosa" -#~ msgid " " -#~ msgstr " " -#~ msgid "PKINT anchors:" -#~ msgstr "Sidra PKINT:" -#~ msgid "Path to CA certificates used as trust anchors for PKINIT" -#~ msgstr "Pot do potrdil CA, ki so uporabljena kot sidra zaupanja za PKINIT " -#~ msgid "" -#~ "The principal's public/private/certificate identifier. Leave empty if not " -#~ "using PKINIT." -#~ msgstr "" -#~ "Ravnateljevo javno/zasebno/potrdilno določilo. V kolikor PKINIT ni v " -#~ "uporabi, je možnost izpuščena." -#~ msgid "gtk-close" -#~ msgstr "gtk-close" -#~ msgid "gtk-help" -#~ msgstr "gtk-help" - +msgstr "obnovljiva"
\ No newline at end of file diff --git a/po/zh_CN.po b/po/zh_CN.po new file mode 100644 index 0000000..3f6848d --- /dev/null +++ b/po/zh_CN.po @@ -0,0 +1,1719 @@ +# Chinese (China) translation for krb5-auth-dialog. +# Copyright (C) 2010 Free Software Foundation, Inc. +# This file is distributed under the same license as the krb5-auth-dialog package. +# Yinghua_Wang <wantinghard@gmail.com>, 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: krb5-auth-dialog master\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=krb5-" +"auth-dialog&component=general\n" +"POT-Creation-Date: 2010-07-29 10:31+0000\n" +"PO-Revision-Date: 2010-08-11 19:30+0800\n" +"Last-Translator: Yinghua Wang <wantinghard@gmail.com>\n" +"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: ../src/krb5-auth-dialog.xml.h:1 ../src/krb5-auth-dialog.desktop.in.h:2 +#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:1 +msgid "Network Authentication" +msgstr "网络认证" + +#: ../src/krb5-auth-dialog.xml.h:2 +msgid "Service Tickets" +msgstr "服务票据" + +#: ../src/krb5-auth-dialog.xml.h:3 +msgid "_Renew Ticket" +msgstr "更新票据(_R)" + +#: ../src/ka-dialog.c:172 +msgid "unknown error" +msgstr "未知错误" + +#: ../src/ka-dialog.c:333 +msgid "Expired" +msgstr "已过期" + +#: ../src/ka-pwdialog.c:174 +#, c-format +msgid "Couldn't acquire kerberos ticket: '%s'" +msgstr "无法获取 Kerberos 票据：'%s'" + +#: ../src/ka-pwdialog.c:211 ../src/ka-applet.c:390 +#, c-format +msgid "Your credentials expire in %d minute" +msgid_plural "Your credentials expire in %d minutes" +msgstr[0] "您的证书于 %d 分钟后过期" + +#: ../src/ka-pwdialog.c:216 ../src/ka-applet.c:395 +msgid "Your credentials have expired" +msgstr "您的证书已过期" + +#: ../src/ka-pwdialog.c:237 +msgid "Please enter your Kerberos password:" +msgstr "请输入您的 Kerberos 密码：" + +#: ../src/ka-pwdialog.c:248 +#, c-format +msgid "Please enter the password for '%s':" +msgstr "请输入 '%s' 的密码：" + +#: ../src/ka-pwdialog.c:268 +msgid "The password you entered is invalid" +msgstr "您输入的密码不正确" + +#: ../src/ka-pwdialog.c:284 +#, c-format +msgid "%s Error" +msgstr "%s 错误" + +#. Translators: files from dummy-strings.c are *all* possible errors +#. returned from Kerberos (since Kerberos itself doesn't handle i18n). If in +#. doubt please translate strings from files starting with ka- and krb5-auth- +#. first since these are the ones the user will see in any case. +#: ../src/dummy-strings.c:10 +msgid "ASN.1 failed call to system time library" +msgstr "ASN.1 调用系统时间库失败" + +#. asn1_err.et:asn1:ASN1_BAD_TIMEFORMAT +#: ../src/dummy-strings.c:11 +msgid "ASN.1 structure is missing a required field" +msgstr "ASN.1 结构年少某个要求的字段" + +#. asn1_err.et:asn1:ASN1_MISSING_FIELD +#: ../src/dummy-strings.c:12 +msgid "ASN.1 unexpected field number" +msgstr "ASN.1 异常的字段号" + +#. asn1_err.et:asn1:ASN1_MISPLACED_FIELD +#: ../src/dummy-strings.c:13 +msgid "ASN.1 type numbers are inconsistent" +msgstr "ASN.1 类型号不一致" + +#. asn1_err.et:asn1:ASN1_TYPE_MISMATCH +#: ../src/dummy-strings.c:14 +msgid "ASN.1 value too large" +msgstr "ASN.1 值过大" + +#. asn1_err.et:asn1:ASN1_OVERFLOW +#: ../src/dummy-strings.c:15 +msgid "ASN.1 encoding ended unexpectedly" +msgstr "ASN.1 编码异常结束" + +#. asn1_err.et:asn1:ASN1_OVERRUN +#: ../src/dummy-strings.c:16 +msgid "ASN.1 identifier doesn't match expected value" +msgstr "ASN.1 标识符不符合期望的值" + +#. asn1_err.et:asn1:ASN1_BAD_ID +#: ../src/dummy-strings.c:17 +msgid "ASN.1 length doesn't match expected value" +msgstr "ASN.1 长度不符合期望的值" + +#. asn1_err.et:asn1:ASN1_BAD_LENGTH +#: ../src/dummy-strings.c:18 +msgid "ASN.1 badly-formatted encoding" +msgstr "ASN.1 编码格式错误" + +#. asn1_err.et:asn1:ASN1_BAD_FORMAT +#: ../src/dummy-strings.c:19 +msgid "ASN.1 parse error" +msgstr "ASN.1 解析错误" + +#. asn1_err.et:asn1:ASN1_PARSE_ERROR +#: ../src/dummy-strings.c:20 +msgid "ASN.1 bad return from gmtime" +msgstr "ASN.1 从 gmtime 中错误地返回" + +#. asn1_err.et:asn1:ASN1_BAD_GMTIME +#: ../src/dummy-strings.c:21 +msgid "ASN.1 non-constructed indefinite encoding" +msgstr "ASN.1 结构混乱不明的编码" + +#. asn1_err.et:asn1:ASN1_MISMATCH_INDEF +#: ../src/dummy-strings.c:22 +msgid "ASN.1 missing expected EOC" +msgstr "ASN.1 缺少应有的 EOC" + +#. asn1_err.et:asn1:ASN1_MISSING_EOC +#: ../src/dummy-strings.c:23 +msgid "No error" +msgstr "无错误" + +#. krb5_err.et:krb5:KRB5KDC_ERR_NONE +#: ../src/dummy-strings.c:24 +msgid "Client's entry in database has expired" +msgstr "数据库中的客户端记录已过期" + +#. krb5_err.et:krb5:KRB5KDC_ERR_NAME_EXP +#: ../src/dummy-strings.c:25 +msgid "Server's entry in database has expired" +msgstr "数据库中的服务器记录已过期" + +#. krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_EXP +#: ../src/dummy-strings.c:26 +msgid "Requested protocol version not supported" +msgstr "请求的协议版本不支持" + +#. krb5_err.et:krb5:KRB5KDC_ERR_BAD_PVNO +#: ../src/dummy-strings.c:27 +msgid "Client's key is encrypted in an old master key" +msgstr "客户端的密钥已在一个旧的主密钥中加密" + +#. krb5_err.et:krb5:KRB5KDC_ERR_C_OLD_MAST_KVNO +#: ../src/dummy-strings.c:28 +msgid "Server's key is encrypted in an old master key" +msgstr "服务器的密钥已在一个旧的主密钥中加密" + +#. krb5_err.et:krb5:KRB5KDC_ERR_S_OLD_MAST_KVNO +#: ../src/dummy-strings.c:29 +msgid "Client not found in Kerberos database" +msgstr "在 Kerberos 数据库中找不到客户端" + +#. krb5_err.et:krb5:KRB5KDC_ERR_C_PRINCIPAL_UNKNOWN +#: ../src/dummy-strings.c:30 +msgid "Server not found in Kerberos database" +msgstr "在 Kerberos 数据库中找不到服务器" + +#. krb5_err.et:krb5:KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN +#: ../src/dummy-strings.c:31 +msgid "Principal has multiple entries in Kerberos database" +msgstr "Kerberos 数据库中有多条委托方记录" + +#. krb5_err.et:krb5:KRB5KDC_ERR_PRINCIPAL_NOT_UNIQUE +#: ../src/dummy-strings.c:32 +msgid "Client or server has a null key" +msgstr "客户端或服务器的密钥为空" + +#. krb5_err.et:krb5:KRB5KDC_ERR_NULL_KEY +#: ../src/dummy-strings.c:33 +msgid "Ticket is ineligible for postdating" +msgstr "票据没有续期的资格" + +#. krb5_err.et:krb5:KRB5KDC_ERR_CANNOT_POSTDATE +#: ../src/dummy-strings.c:34 +msgid "Requested effective lifetime is negative or too short" +msgstr "请求的有效生存期为负值或过短" + +#. krb5_err.et:krb5:KRB5KDC_ERR_NEVER_VALID +#: ../src/dummy-strings.c:35 +msgid "KDC policy rejects request" +msgstr "KDC 策略拒绝请求" + +#. krb5_err.et:krb5:KRB5KDC_ERR_POLICY +#: ../src/dummy-strings.c:36 +msgid "KDC can't fulfill requested option" +msgstr "KDC 无法完成请求的选项" + +#. krb5_err.et:krb5:KRB5KDC_ERR_BADOPTION +#: ../src/dummy-strings.c:37 +msgid "KDC has no support for encryption type" +msgstr "KDC 不支持加密类型" + +#. krb5_err.et:krb5:KRB5KDC_ERR_ETYPE_NOSUPP +#: ../src/dummy-strings.c:38 +msgid "KDC has no support for checksum type" +msgstr "KDC 不支持校验和类型" + +#. krb5_err.et:krb5:KRB5KDC_ERR_SUMTYPE_NOSUPP +#: ../src/dummy-strings.c:39 +msgid "KDC has no support for padata type" +msgstr "KDC 不支持 padata 类型" + +#. krb5_err.et:krb5:KRB5KDC_ERR_PADATA_TYPE_NOSUPP +#: ../src/dummy-strings.c:40 +#, fuzzy +msgid "KDC has no support for transited type" +msgstr "KDC 不支持过渡类型" + +#. krb5_err.et:krb5:KRB5KDC_ERR_TRTYPE_NOSUPP +#: ../src/dummy-strings.c:41 +msgid "Clients credentials have been revoked" +msgstr "客户端证书已撤销" + +#. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_REVOKED +#: ../src/dummy-strings.c:42 +msgid "Credentials for server have been revoked" +msgstr "服务器证书已撤销" + +#. krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_REVOKED +#: ../src/dummy-strings.c:43 +msgid "TGT has been revoked" +msgstr "TGT 已被撤销" + +#. krb5_err.et:krb5:KRB5KDC_ERR_TGT_REVOKED +#: ../src/dummy-strings.c:44 +msgid "Client not yet valid - try again later" +msgstr "客户端尚未生效 - 稍后重试" + +#. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NOTYET +#: ../src/dummy-strings.c:45 +msgid "Server not yet valid - try again later" +msgstr "服务器尚未生效 - 稍后重试" + +#. krb5_err.et:krb5:KRB5KDC_ERR_SERVICE_NOTYET +#: ../src/dummy-strings.c:46 +msgid "Password has expired" +msgstr "密码已过期" + +#. krb5_err.et:krb5:KRB5KDC_ERR_KEY_EXP +#: ../src/dummy-strings.c:47 +msgid "Preauthentication failed" +msgstr "预认证失败" + +#. krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_FAILED +#: ../src/dummy-strings.c:48 +msgid "Additional pre-authentication required" +msgstr "需要额外的预认证" + +#. krb5_err.et:krb5:KRB5KDC_ERR_PREAUTH_REQUIRED +#: ../src/dummy-strings.c:49 +msgid "Requested server and ticket don't match" +msgstr "请求的服务器和票据不匹配" + +#. krb5_err.et:krb5:KRB5KDC_ERR_SERVER_NOMATCH +#: ../src/dummy-strings.c:50 +msgid "A service is not available that is required to process the request" +msgstr "没有处理请求所需的服务" + +#. krb5_err.et:krb5:KRB5KDC_ERR_SVC_UNAVAILABLE +#: ../src/dummy-strings.c:51 +msgid "Decrypt integrity check failed" +msgstr "解密完整性检查失败" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_BAD_INTEGRITY +#: ../src/dummy-strings.c:52 +msgid "Ticket expired" +msgstr "票据过期" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_EXPIRED +#: ../src/dummy-strings.c:53 +msgid "Ticket not yet valid" +msgstr "票据尚未生效" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_NYV +#: ../src/dummy-strings.c:54 +msgid "Request is a replay" +msgstr "重放请求" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_REPEAT +#: ../src/dummy-strings.c:55 +msgid "The ticket isn't for us" +msgstr "票据不属于已方" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOT_US +#: ../src/dummy-strings.c:56 +msgid "Ticket/authenticator don't match" +msgstr "票据/认证器不匹配" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADMATCH +#: ../src/dummy-strings.c:57 +msgid "Clock skew too great" +msgstr "时钟偏移过大" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_SKEW +#: ../src/dummy-strings.c:58 +msgid "Incorrect net address" +msgstr "网络地址不正确" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADADDR +#: ../src/dummy-strings.c:59 +msgid "Protocol version mismatch" +msgstr "协议版本不符" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADVERSION +#: ../src/dummy-strings.c:60 +msgid "Invalid message type" +msgstr "无效的信息类型" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_MSG_TYPE +#: ../src/dummy-strings.c:61 +msgid "Message stream modified" +msgstr "信息流已被修改" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_MODIFIED +#: ../src/dummy-strings.c:62 +msgid "Message out of order" +msgstr "信息混乱" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADORDER +#: ../src/dummy-strings.c:63 +msgid "Illegal cross-realm ticket" +msgstr "非法的跨域票据" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_ILL_CR_TKT +#: ../src/dummy-strings.c:64 +msgid "Key version is not available" +msgstr "密钥版本不可用" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADKEYVER +#: ../src/dummy-strings.c:65 +msgid "Service key not available" +msgstr "服务密钥不可用" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_NOKEY +#. krb5_err.et:krb5:KRB5_NO_LOCALNAME +#: ../src/dummy-strings.c:66 ../src/dummy-strings.c:122 +msgid "Mutual authentication failed" +msgstr "互认证失败" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_MUT_FAIL +#: ../src/dummy-strings.c:67 +msgid "Incorrect message direction" +msgstr "信息方向不正确" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADDIRECTION +#: ../src/dummy-strings.c:68 +msgid "Alternative authentication method required" +msgstr "需要替代的认证方法" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_METHOD +#: ../src/dummy-strings.c:69 +msgid "Incorrect sequence number in message" +msgstr "信息中的次序号不正确" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_BADSEQ +#: ../src/dummy-strings.c:70 +msgid "Inappropriate type of checksum in message" +msgstr "信息中的校验和类型不合适" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_INAPP_CKSUM +#: ../src/dummy-strings.c:71 +#, fuzzy +msgid "Policy rejects transited path" +msgstr "策略拒绝中转路径" + +#. krb5_err.et:krb5:KRB5KRB_AP_PATH_NOT_ACCEPTED +#: ../src/dummy-strings.c:72 +#, fuzzy +msgid "Response too big for UDP, retry with TCP" +msgstr "UDP 响应数据包过大，用 TCP 重试" + +#. krb5_err.et:krb5:KRB5KRB_ERR_RESPONSE_TOO_BIG +#: ../src/dummy-strings.c:73 +msgid "Generic error (see e-text)" +msgstr "普通错误(见 e-text)" + +#. krb5_err.et:krb5:KRB5KRB_ERR_GENERIC +#: ../src/dummy-strings.c:74 +#, fuzzy +msgid "Field is too long for this implementation" +msgstr "此实现的字段过长" + +#. krb5_err.et:krb5:KRB5KRB_ERR_FIELD_TOOLONG +#: ../src/dummy-strings.c:75 +msgid "Client not trusted" +msgstr "不可信的客户端" + +#. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NOT_TRUSTED +#: ../src/dummy-strings.c:76 +msgid "KDC not trusted" +msgstr "不可信的 KDC" + +#. krb5_err.et:krb5:KRB5KDC_ERR_KDC_NOT_TRUSTED +#: ../src/dummy-strings.c:77 +msgid "Invalid signature" +msgstr "无效的签名" + +#. krb5_err.et:krb5:KRB5KDC_ERR_INVALID_SIG +#: ../src/dummy-strings.c:78 +msgid "Key parameters not accepted" +msgstr "密钥参数不被接受" + +#. krb5_err.et:krb5:KRB5KDC_ERR_DH_KEY_PARAMETERS_NOT_ACCEPTED +#: ../src/dummy-strings.c:79 +msgid "Certificate mismatch" +msgstr "证书不符" + +#. krb5_err.et:krb5:KRB5KDC_ERR_CERTIFICATE_MISMATCH +#: ../src/dummy-strings.c:80 +msgid "Can't verify certificate" +msgstr "无法验证证书" + +#. krb5_err.et:krb5:KRB5KDC_ERR_CANT_VERIFY_CERTIFICATE +#: ../src/dummy-strings.c:81 +msgid "Invalid certificate" +msgstr "证书无效" + +#. krb5_err.et:krb5:KRB5KDC_ERR_INVALID_CERTIFICATE +#: ../src/dummy-strings.c:82 +msgid "Revoked certificate" +msgstr "已撤销的证书" + +#. krb5_err.et:krb5:KRB5KDC_ERR_REVOKED_CERTIFICATE +#: ../src/dummy-strings.c:83 +msgid "Revocation status unknown" +msgstr "撤销状态未知" + +#. krb5_err.et:krb5:KRB5KDC_ERR_REVOCATION_STATUS_UNKNOWN +#: ../src/dummy-strings.c:84 +msgid "Revocation status unavailable" +msgstr "无法获知撤销状态" + +#. krb5_err.et:krb5:KRB5KDC_ERR_REVOCATION_STATUS_UNAVAILABLE +#: ../src/dummy-strings.c:85 +msgid "Client name mismatch" +msgstr "客户端名称不符" + +#. krb5_err.et:krb5:KRB5KDC_ERR_CLIENT_NAME_MISMATCH +#: ../src/dummy-strings.c:86 +msgid "KDC name mismatch" +msgstr "KDC 名称不符" + +#. krb5_err.et:krb5:KRB5KDC_ERR_KDC_NAME_MISMATCH +#: ../src/dummy-strings.c:87 +msgid "Inconsistent key purpose" +msgstr "密钥用途不一致" + +#. krb5_err.et:krb5:KRB5KDC_ERR_INCONSISTENT_KEY_PURPOSE +#: ../src/dummy-strings.c:88 +#, fuzzy +msgid "Digest in certificate not accepted" +msgstr "详查证书不被接受" + +#. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_CERT_NOT_ACCEPTED +#: ../src/dummy-strings.c:89 +msgid "Checksum must be included" +msgstr "必须包含校验和" + +#. krb5_err.et:krb5:KRB5KDC_ERR_PA_CHECKSUM_MUST_BE_INCLUDED +#: ../src/dummy-strings.c:90 +#, fuzzy +msgid "Digest in signed-data not accepted" +msgstr "详查签名的数据不被接受" + +#. krb5_err.et:krb5:KRB5KDC_ERR_DIGEST_IN_SIGNED_DATA_NOT_ACCEPTED +#: ../src/dummy-strings.c:91 +msgid "Public key encryption not supported" +msgstr "不支持公钥加密" + +#. krb5_err.et:krb5:KRB5KDC_ERR_PUBLIC_KEY_ENCRYPTION_NOT_SUPPORTED +#: ../src/dummy-strings.c:92 +msgid "$Id: krb5_err.et 19934 2007-09-13 23:49:00Z tlyu $" +msgstr "$Id: krb5_err.et 19934 2007-09-13 23:49:00Z tlyu $" + +#. krb5_err.et:krb5:KRB5_ERR_RCSID +#: ../src/dummy-strings.c:93 +msgid "Invalid flag for file lock mode" +msgstr "文件锁定模式的标记无效" + +#. krb5_err.et:krb5:KRB5_LIBOS_BADLOCKFLAG +#: ../src/dummy-strings.c:94 +msgid "Cannot read password" +msgstr "无法读取密码" + +#. krb5_err.et:krb5:KRB5_LIBOS_CANTREADPWD +#: ../src/dummy-strings.c:95 +msgid "Password mismatch" +msgstr "密码不匹配" + +#. krb5_err.et:krb5:KRB5_LIBOS_BADPWDMATCH +#: ../src/dummy-strings.c:96 +msgid "Password read interrupted" +msgstr "密码读取被打断" + +#. krb5_err.et:krb5:KRB5_LIBOS_PWDINTR +#: ../src/dummy-strings.c:97 +msgid "Illegal character in component name" +msgstr "组件名称中有非法字符" + +#. krb5_err.et:krb5:KRB5_PARSE_ILLCHAR +#: ../src/dummy-strings.c:98 +msgid "Malformed representation of principal" +msgstr "委托方的表述有误" + +#. krb5_err.et:krb5:KRB5_PARSE_MALFORMED +#: ../src/dummy-strings.c:99 +msgid "Can't open/find Kerberos configuration file" +msgstr "无法打开/找到 Kerberos 配置文件" + +#. krb5_err.et:krb5:KRB5_CONFIG_CANTOPEN +#: ../src/dummy-strings.c:100 +msgid "Improper format of Kerberos configuration file" +msgstr "Kerberos 配置文件的格式不正确" + +#. krb5_err.et:krb5:KRB5_CONFIG_BADFORMAT +#: ../src/dummy-strings.c:101 +msgid "Insufficient space to return complete information" +msgstr "没有足够的空间来返回完整信息" + +#. krb5_err.et:krb5:KRB5_CONFIG_NOTENUFSPACE +#: ../src/dummy-strings.c:102 +msgid "Invalid message type specified for encoding" +msgstr "用于编码的信息类型无效" + +#. krb5_err.et:krb5:KRB5_BADMSGTYPE +#: ../src/dummy-strings.c:103 +msgid "Credential cache name malformed" +msgstr "证书缓存名称损坏" + +#. krb5_err.et:krb5:KRB5_CC_BADNAME +#: ../src/dummy-strings.c:104 +msgid "Unknown credential cache type" +msgstr "未知的证书缓存类型" + +#. krb5_err.et:krb5:KRB5_CC_UNKNOWN_TYPE +#: ../src/dummy-strings.c:105 +msgid "Matching credential not found" +msgstr "找不到匹配的证书" + +#. krb5_err.et:krb5:KRB5_CC_NOTFOUND +#: ../src/dummy-strings.c:106 +msgid "End of credential cache reached" +msgstr "到达了证书缓存末尾" + +#. krb5_err.et:krb5:KRB5_CC_END +#: ../src/dummy-strings.c:107 +msgid "Request did not supply a ticket" +msgstr "请求时未提供票据" + +#. krb5_err.et:krb5:KRB5_NO_TKT_SUPPLIED +#: ../src/dummy-strings.c:108 +msgid "Wrong principal in request" +msgstr "请求中的委托方错误" + +#. krb5_err.et:krb5:KRB5KRB_AP_WRONG_PRINC +#: ../src/dummy-strings.c:109 +msgid "Ticket has invalid flag set" +msgstr "票据的标记集无效" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_TKT_INVALID +#: ../src/dummy-strings.c:110 +#, fuzzy +msgid "Requested principal and ticket don't match" +msgstr "请求的委托方和票据不匹配" + +#. krb5_err.et:krb5:KRB5_PRINC_NOMATCH +#: ../src/dummy-strings.c:111 +msgid "KDC reply did not match expectations" +msgstr "KDC 回应与预期不符" + +#. krb5_err.et:krb5:KRB5_KDCREP_MODIFIED +#: ../src/dummy-strings.c:112 +msgid "Clock skew too great in KDC reply" +msgstr "KDC 回应中的时钟偏移过大" + +#. krb5_err.et:krb5:KRB5_KDCREP_SKEW +#: ../src/dummy-strings.c:113 +msgid "Client/server realm mismatch in initial ticket request" +msgstr "客户端/服务器域在初始票据请求中不匹配" + +#. krb5_err.et:krb5:KRB5_IN_TKT_REALM_MISMATCH +#: ../src/dummy-strings.c:114 +msgid "Program lacks support for encryption type" +msgstr "程序缺少加密类型支持" + +#. krb5_err.et:krb5:KRB5_PROG_ETYPE_NOSUPP +#: ../src/dummy-strings.c:115 +msgid "Program lacks support for key type" +msgstr "程序缺少密钥类型支持" + +#. krb5_err.et:krb5:KRB5_PROG_KEYTYPE_NOSUPP +#: ../src/dummy-strings.c:116 +msgid "Requested encryption type not used in message" +msgstr "请求的加密类型在信息没有使用" + +#. krb5_err.et:krb5:KRB5_WRONG_ETYPE +#: ../src/dummy-strings.c:117 +msgid "Program lacks support for checksum type" +msgstr "程序缺乏校验和支持" + +#. krb5_err.et:krb5:KRB5_PROG_SUMTYPE_NOSUPP +#: ../src/dummy-strings.c:118 +msgid "Cannot find KDC for requested realm" +msgstr "无法找到请示域的 KDC" + +#. krb5_err.et:krb5:KRB5_REALM_UNKNOWN +#: ../src/dummy-strings.c:119 +msgid "Kerberos service unknown" +msgstr "Kerberos 服务未知" + +#. krb5_err.et:krb5:KRB5_SERVICE_UNKNOWN +#: ../src/dummy-strings.c:120 +msgid "Cannot contact any KDC for requested realm" +msgstr "无法联系到请求域的任何 KDC" + +#. krb5_err.et:krb5:KRB5_KDC_UNREACH +#: ../src/dummy-strings.c:121 +msgid "No local name found for principal name" +msgstr "未找到对应委托方名称的本地名称" + +#. krb5_err.et:krb5:KRB5_MUTUAL_FAILED +#: ../src/dummy-strings.c:123 +msgid "Replay cache type is already registered" +msgstr "重放缓存类型已注册" + +#. krb5_err.et:krb5:KRB5_RC_TYPE_EXISTS +#: ../src/dummy-strings.c:124 +msgid "No more memory to allocate (in replay cache code)" +msgstr "没有更多可分配内存(在重放缓存代码中)" + +#. krb5_err.et:krb5:KRB5_RC_MALLOC +#: ../src/dummy-strings.c:125 +msgid "Replay cache type is unknown" +msgstr "重放缓存类型为未知" + +#. krb5_err.et:krb5:KRB5_RC_TYPE_NOTFOUND +#: ../src/dummy-strings.c:126 +msgid "Generic unknown RC error" +msgstr "普通的未知 RC 错误" + +#. krb5_err.et:krb5:KRB5_RC_UNKNOWN +#: ../src/dummy-strings.c:127 +msgid "Message is a replay" +msgstr "重放消息" + +#. krb5_err.et:krb5:KRB5_RC_REPLAY +#: ../src/dummy-strings.c:128 +msgid "Replay I/O operation failed XXX" +msgstr "重放 I/O 操作失败 XXX" + +#. krb5_err.et:krb5:KRB5_RC_IO +#: ../src/dummy-strings.c:129 +msgid "Replay cache type does not support non-volatile storage" +msgstr "重放缓存类型不支持非易失性存储" + +#. krb5_err.et:krb5:KRB5_RC_NOIO +#: ../src/dummy-strings.c:130 +msgid "Replay cache name parse/format error" +msgstr "重放缓存名称解析/格式错误" + +#. krb5_err.et:krb5:KRB5_RC_PARSE +#: ../src/dummy-strings.c:131 +msgid "End-of-file on replay cache I/O" +msgstr "重放缓存 I/O 的文件尾" + +#. krb5_err.et:krb5:KRB5_RC_IO_EOF +#: ../src/dummy-strings.c:132 +msgid "No more memory to allocate (in replay cache I/O code)" +msgstr "没有更多可分配内存(在重放缓存 I/O 代码中)" + +#. krb5_err.et:krb5:KRB5_RC_IO_MALLOC +#: ../src/dummy-strings.c:133 +msgid "Permission denied in replay cache code" +msgstr "重放缓存代码中拒绝访问" + +#. krb5_err.et:krb5:KRB5_RC_IO_PERM +#: ../src/dummy-strings.c:134 +msgid "I/O error in replay cache i/o code" +msgstr "重放缓存 I/O 代码中有 I/O 错误" + +#. krb5_err.et:krb5:KRB5_RC_IO_IO +#: ../src/dummy-strings.c:135 +msgid "Generic unknown RC/IO error" +msgstr "普通的未知 RC/IO 错误" + +#. krb5_err.et:krb5:KRB5_RC_IO_UNKNOWN +#: ../src/dummy-strings.c:136 +msgid "Insufficient system space to store replay information" +msgstr "保存重放信息的系统空间不足" + +#. krb5_err.et:krb5:KRB5_RC_IO_SPACE +#: ../src/dummy-strings.c:137 +msgid "Can't open/find realm translation file" +msgstr "无法打开/找到域翻译文件" + +#. krb5_err.et:krb5:KRB5_TRANS_CANTOPEN +#: ../src/dummy-strings.c:138 +msgid "Improper format of realm translation file" +msgstr "域翻译文件的格式不正确" + +#. krb5_err.et:krb5:KRB5_TRANS_BADFORMAT +#: ../src/dummy-strings.c:139 +msgid "Can't open/find lname translation database" +msgstr "无法打开/找到 lname 翻译数据库" + +#. krb5_err.et:krb5:KRB5_LNAME_CANTOPEN +#: ../src/dummy-strings.c:140 +msgid "No translation available for requested principal" +msgstr "没有对应请求的委托方的翻译" + +#. krb5_err.et:krb5:KRB5_LNAME_NOTRANS +#: ../src/dummy-strings.c:141 +msgid "Improper format of translation database entry" +msgstr "翻译数据库记录的格式不正确" + +#. krb5_err.et:krb5:KRB5_LNAME_BADFORMAT +#: ../src/dummy-strings.c:142 +msgid "Cryptosystem internal error" +msgstr "加密系统内部错误" + +#. krb5_err.et:krb5:KRB5_CRYPTO_INTERNAL +#: ../src/dummy-strings.c:143 +msgid "Key table name malformed" +msgstr "密钥表名称有误" + +#. krb5_err.et:krb5:KRB5_KT_BADNAME +#: ../src/dummy-strings.c:144 +msgid "Unknown Key table type" +msgstr "未知的密钥表类型" + +#. krb5_err.et:krb5:KRB5_KT_UNKNOWN_TYPE +#: ../src/dummy-strings.c:145 +msgid "Key table entry not found" +msgstr "找不到密钥表记录" + +#. krb5_err.et:krb5:KRB5_KT_NOTFOUND +#: ../src/dummy-strings.c:146 +msgid "End of key table reached" +msgstr "到达了密钥表末尾" + +#. krb5_err.et:krb5:KRB5_KT_END +#: ../src/dummy-strings.c:147 +msgid "Cannot write to specified key table" +msgstr "无法定稿指定的密钥表" + +#. krb5_err.et:krb5:KRB5_KT_NOWRITE +#: ../src/dummy-strings.c:148 +msgid "Error writing to key table" +msgstr "写入密钥表出错" + +#. krb5_err.et:krb5:KRB5_KT_IOERR +#: ../src/dummy-strings.c:149 +msgid "Cannot find ticket for requested realm" +msgstr "无法找到请求的域" + +#. krb5_err.et:krb5:KRB5_NO_TKT_IN_RLM +#: ../src/dummy-strings.c:150 +#, fuzzy +msgid "DES key has bad parity" +msgstr "DES 奇偶性错误" + +#. krb5_err.et:krb5:KRB5DES_BAD_KEYPAR +#: ../src/dummy-strings.c:151 +msgid "DES key is a weak key" +msgstr "DES 密钥是一个弱密钥" + +#. krb5_err.et:krb5:KRB5DES_WEAK_KEY +#: ../src/dummy-strings.c:152 +msgid "Bad encryption type" +msgstr "加密类型错误" + +#. krb5_err.et:krb5:KRB5_BAD_ENCTYPE +#: ../src/dummy-strings.c:153 +msgid "Key size is incompatible with encryption type" +msgstr "密钥大小与加密类型不兼容" + +#. krb5_err.et:krb5:KRB5_BAD_KEYSIZE +#: ../src/dummy-strings.c:154 +msgid "Message size is incompatible with encryption type" +msgstr "消息大小与加密类型不兼容" + +#. krb5_err.et:krb5:KRB5_BAD_MSIZE +#: ../src/dummy-strings.c:155 +msgid "Credentials cache type is already registered." +msgstr "证书缓存类型已经注册过。" + +#. krb5_err.et:krb5:KRB5_CC_TYPE_EXISTS +#: ../src/dummy-strings.c:156 +msgid "Key table type is already registered." +msgstr "密钥表类型已注册。" + +#. krb5_err.et:krb5:KRB5_KT_TYPE_EXISTS +#: ../src/dummy-strings.c:157 +#, fuzzy +msgid "Credentials cache I/O operation failed XXX" +msgstr "证书缓存 I/O 操作失败 XXX" + +#. krb5_err.et:krb5:KRB5_CC_IO +#: ../src/dummy-strings.c:158 +msgid "Credentials cache permissions incorrect" +msgstr "证书缓存许可不正确" + +#. krb5_err.et:krb5:KRB5_FCC_PERM +#: ../src/dummy-strings.c:159 +msgid "No credentials cache found" +msgstr "没有找到证书缓存" + +#. krb5_err.et:krb5:KRB5_FCC_NOFILE +#: ../src/dummy-strings.c:160 +msgid "Internal credentials cache error" +msgstr "内部证书缓存错误" + +#. krb5_err.et:krb5:KRB5_FCC_INTERNAL +#: ../src/dummy-strings.c:161 +msgid "Error writing to credentials cache" +msgstr "写入证书缓存出错" + +#. krb5_err.et:krb5:KRB5_CC_WRITE +#: ../src/dummy-strings.c:162 +msgid "No more memory to allocate (in credentials cache code)" +msgstr "无更多可分配内存(在证书缓存代码中)" + +#. krb5_err.et:krb5:KRB5_CC_NOMEM +#: ../src/dummy-strings.c:163 +msgid "Bad format in credentials cache" +msgstr "证书缓存中有格式错误" + +#. krb5_err.et:krb5:KRB5_CC_FORMAT +#: ../src/dummy-strings.c:164 +msgid "No credentials found with supported encryption types" +msgstr "没有找到带支持的加密类型的证书" + +#. krb5_err.et:krb5:KRB5_CC_NOT_KTYPE +#: ../src/dummy-strings.c:165 +msgid "Invalid KDC option combination (library internal error)" +msgstr "无效的 KDC 选项组合(库内部错误)" + +#. krb5_err.et:krb5:KRB5_INVALID_FLAGS +#: ../src/dummy-strings.c:166 +msgid "Request missing second ticket" +msgstr "请求缺少第二票据" + +#. krb5_err.et:krb5:KRB5_NO_2ND_TKT +#: ../src/dummy-strings.c:167 +msgid "No credentials supplied to library routine" +msgstr "没有向库运行时提供证书" + +#. krb5_err.et:krb5:KRB5_NOCREDS_SUPPLIED +#: ../src/dummy-strings.c:168 +msgid "Bad sendauth version was sent" +msgstr "发送了错误的 sendauth 版本" + +#. krb5_err.et:krb5:KRB5_SENDAUTH_BADAUTHVERS +#: ../src/dummy-strings.c:169 +msgid "Bad application version was sent (via sendauth)" +msgstr "发送了错误的应用程序版本(通过 sendauth)" + +#. krb5_err.et:krb5:KRB5_SENDAUTH_BADAPPLVERS +#: ../src/dummy-strings.c:170 +msgid "Bad response (during sendauth exchange)" +msgstr "响应错误(在 sendiuth 交换时)" + +#. krb5_err.et:krb5:KRB5_SENDAUTH_BADRESPONSE +#: ../src/dummy-strings.c:171 +msgid "Server rejected authentication (during sendauth exchange)" +msgstr "服务器拒绝了认证(在 sendauth 交换时)" + +#. krb5_err.et:krb5:KRB5_SENDAUTH_REJECTED +#: ../src/dummy-strings.c:172 +msgid "Unsupported preauthentication type" +msgstr "不支持的预认证类型" + +#. krb5_err.et:krb5:KRB5_PREAUTH_BAD_TYPE +#: ../src/dummy-strings.c:173 +msgid "Required preauthentication key not supplied" +msgstr "要求的预认证密钥没有提供" + +#. krb5_err.et:krb5:KRB5_PREAUTH_NO_KEY +#: ../src/dummy-strings.c:174 +msgid "Generic preauthentication failure" +msgstr "普通预认证失败" + +#. krb5_err.et:krb5:KRB5_PREAUTH_FAILED +#: ../src/dummy-strings.c:175 +msgid "Unsupported replay cache format version number" +msgstr "不支持的重放缓存格式版本号" + +#. krb5_err.et:krb5:KRB5_RCACHE_BADVNO +#: ../src/dummy-strings.c:176 +msgid "Unsupported credentials cache format version number" +msgstr "不支持的证书缓存格式版本号" + +#. krb5_err.et:krb5:KRB5_CCACHE_BADVNO +#: ../src/dummy-strings.c:177 +msgid "Unsupported key table format version number" +msgstr "不支持的密钥表格式版本号" + +#. krb5_err.et:krb5:KRB5_KEYTAB_BADVNO +#: ../src/dummy-strings.c:178 +msgid "Program lacks support for address type" +msgstr "程序缺少对地址类型的支持" + +#. krb5_err.et:krb5:KRB5_PROG_ATYPE_NOSUPP +#: ../src/dummy-strings.c:179 +msgid "Message replay detection requires rcache parameter" +msgstr "信息重放检测需要 rcache 参数" + +#. krb5_err.et:krb5:KRB5_RC_REQUIRED +#: ../src/dummy-strings.c:180 +msgid "Hostname cannot be canonicalized" +msgstr "主机名无法规范化" + +#. krb5_err.et:krb5:KRB5_ERR_BAD_HOSTNAME +#: ../src/dummy-strings.c:181 +msgid "Cannot determine realm for host" +msgstr "无法确定主机的域" + +#. krb5_err.et:krb5:KRB5_ERR_HOST_REALM_UNKNOWN +#: ../src/dummy-strings.c:182 +msgid "Conversion to service principal undefined for name type" +msgstr "没有定义名称类型向服务器委托方的转换" + +#. krb5_err.et:krb5:KRB5_SNAME_UNSUPP_NAMETYPE +#: ../src/dummy-strings.c:183 +msgid "Initial Ticket response appears to be Version 4 error" +msgstr "初始票据响应似为版本 4 错误" + +#. krb5_err.et:krb5:KRB5KRB_AP_ERR_V4_REPLY +#: ../src/dummy-strings.c:184 +msgid "Cannot resolve network address for KDC in requested realm" +msgstr "无法解析请求域中 KDC 的网络地址" + +#. krb5_err.et:krb5:KRB5_REALM_CANT_RESOLVE +#: ../src/dummy-strings.c:185 +msgid "Requesting ticket can't get forwardable tickets" +msgstr "请求票据无法获得可转发的票据" + +#. krb5_err.et:krb5:KRB5_TKT_NOT_FORWARDABLE +#: ../src/dummy-strings.c:186 +msgid "Bad principal name while trying to forward credentials" +msgstr "在尝试转发证书时委托方名称出错" + +#. krb5_err.et:krb5:KRB5_FWD_BAD_PRINCIPAL +#: ../src/dummy-strings.c:187 +msgid "Looping detected inside krb5_get_in_tkt" +msgstr "在 krb5_get_in_tkt 中检查到循环" + +#. krb5_err.et:krb5:KRB5_GET_IN_TKT_LOOP +#: ../src/dummy-strings.c:188 +msgid "Configuration file does not specify default realm" +msgstr "配置文件没有指定默认域" + +#. krb5_err.et:krb5:KRB5_CONFIG_NODEFREALM +#: ../src/dummy-strings.c:189 +msgid "Bad SAM flags in obtain_sam_padata" +msgstr "在 obtain_sam_padata 中有错误的 SAM 标记" + +#. krb5_err.et:krb5:KRB5_SAM_UNSUPPORTED +#: ../src/dummy-strings.c:190 +msgid "Invalid encryption type in SAM challenge" +msgstr "" + +#. krb5_err.et:krb5:KRB5_SAM_INVALID_ETYPE +#: ../src/dummy-strings.c:191 +msgid "Missing checksum in SAM challenge" +msgstr "" + +#. krb5_err.et:krb5:KRB5_SAM_NO_CHECKSUM +#: ../src/dummy-strings.c:192 +msgid "Bad checksum in SAM challenge" +msgstr "" + +#. krb5_err.et:krb5:KRB5_SAM_BAD_CHECKSUM +#: ../src/dummy-strings.c:193 +msgid "Keytab name too long" +msgstr "密钥表名称过长" + +#. krb5_err.et:krb5:KRB5_KT_NAME_TOOLONG +#: ../src/dummy-strings.c:194 +msgid "Key version number for principal in key table is incorrect" +msgstr "密钥表中针对委托方的密钥版本号不正确" + +#. krb5_err.et:krb5:KRB5_KT_KVNONOTFOUND +#: ../src/dummy-strings.c:195 +msgid "This application has expired" +msgstr "该应用程序已过期" + +#. krb5_err.et:krb5:KRB5_APPL_EXPIRED +#: ../src/dummy-strings.c:196 +msgid "This Krb5 library has expired" +msgstr "该 krb5 库已过期" + +#. krb5_err.et:krb5:KRB5_LIB_EXPIRED +#: ../src/dummy-strings.c:197 +msgid "New password cannot be zero length" +msgstr "新密码长度不能为 0" + +#. krb5_err.et:krb5:KRB5_CHPW_PWDNULL +#: ../src/dummy-strings.c:198 +msgid "Password change failed" +msgstr "更改密码失败" + +#. krb5_err.et:krb5:KRB5_CHPW_FAIL +#: ../src/dummy-strings.c:199 +msgid "Bad format in keytab" +msgstr "密钥表格式错误" + +#. krb5_err.et:krb5:KRB5_KT_FORMAT +#: ../src/dummy-strings.c:200 +msgid "Encryption type not permitted" +msgstr "不允许的加密类型" + +#. krb5_err.et:krb5:KRB5_NOPERM_ETYPE +#: ../src/dummy-strings.c:201 +msgid "No supported encryption types (config file error?)" +msgstr "不支持的加密类型(配置文件错误？)" + +#. krb5_err.et:krb5:KRB5_CONFIG_ETYPE_NOSUPP +#: ../src/dummy-strings.c:202 +msgid "Program called an obsolete, deleted function" +msgstr "程序调用了一个废弃的、已删除的函数" + +#. krb5_err.et:krb5:KRB5_OBSOLETE_FN +#: ../src/dummy-strings.c:203 +msgid "unknown getaddrinfo failure" +msgstr "未知的 getaddrinfo 失败" + +#. krb5_err.et:krb5:KRB5_EAI_FAIL +#: ../src/dummy-strings.c:204 +msgid "no data available for host/domain name" +msgstr "主机名/域名没有可用数据" + +#. krb5_err.et:krb5:KRB5_EAI_NODATA +#: ../src/dummy-strings.c:205 +msgid "host/domain name not found" +msgstr "找不到主机名/域名" + +#. krb5_err.et:krb5:KRB5_EAI_NONAME +#: ../src/dummy-strings.c:206 +msgid "service name unknown" +msgstr "服务名未知" + +#. krb5_err.et:krb5:KRB5_EAI_SERVICE +#: ../src/dummy-strings.c:207 +msgid "Cannot determine realm for numeric host address" +msgstr "无法确定数值主机地址的域" + +#. krb5_err.et:krb5:KRB5_ERR_NUMERIC_REALM +#: ../src/dummy-strings.c:208 +msgid "Invalid key generation parameters from KDC" +msgstr "KDC 提供的密钥生成参数无效" + +#. krb5_err.et:krb5:KRB5_ERR_BAD_S2K_PARAMS +#: ../src/dummy-strings.c:209 +msgid "service not available" +msgstr "服务不可用" + +#. krb5_err.et:krb5:KRB5_ERR_NO_SERVICE +#: ../src/dummy-strings.c:210 +msgid "Ccache function not supported: read-only ccache type" +msgstr "不支持 Ccache 函数：只读的 ccache 类型" + +#. krb5_err.et:krb5:KRB5_CC_READONLY +#: ../src/dummy-strings.c:211 +msgid "Ccache function not supported: not implemented" +msgstr "不支持 Ccache 函数：尚未实现" + +#. krb5_err.et:krb5:KRB5_CC_NOSUPP +#: ../src/dummy-strings.c:212 +msgid "Invalid format of Kerberos lifetime or clock skew string" +msgstr "Kerberos 生存期或时钟偏移字符串无效" + +#. krb5_err.et:krb5:KRB5_DELTAT_BADFORMAT +#: ../src/dummy-strings.c:213 +msgid "Supplied data not handled by this plugin" +msgstr "提供的数据不由此插件处理" + +#. krb5_err.et:krb5:KRB5_PLUGIN_NO_HANDLE +#: ../src/dummy-strings.c:214 +msgid "Plugin does not support the operaton" +msgstr "插件不支持该操作" + +#. krb5_err.et:krb5:KRB5_PLUGIN_OP_NOTSUPP +#: ../src/dummy-strings.c:215 +msgid "Kerberos V5 magic number table" +msgstr "Kerberos V5 幻数表" + +#. kv5m_err.et:kv5m:KV5M_NONE +#: ../src/dummy-strings.c:216 +msgid "Bad magic number for krb5_principal structure" +msgstr "krb5_principal 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_PRINCIPAL +#: ../src/dummy-strings.c:217 +msgid "Bad magic number for krb5_data structure" +msgstr "krb5_data 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_DATA +#: ../src/dummy-strings.c:218 +msgid "Bad magic number for krb5_keyblock structure" +msgstr "krb5_keyblock 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_KEYBLOCK +#: ../src/dummy-strings.c:219 +msgid "Bad magic number for krb5_checksum structure" +msgstr "krb5_checksum 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_CHECKSUM +#: ../src/dummy-strings.c:220 +msgid "Bad magic number for krb5_encrypt_block structure" +msgstr "krb5_encrypt_block 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_ENCRYPT_BLOCK +#: ../src/dummy-strings.c:221 +msgid "Bad magic number for krb5_enc_data structure" +msgstr "krb5_enc_data 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_ENC_DATA +#: ../src/dummy-strings.c:222 +msgid "Bad magic number for krb5_cryptosystem_entry structure" +msgstr "krb5_cryptosystem_entry 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_CRYPTOSYSTEM_ENTRY +#: ../src/dummy-strings.c:223 +msgid "Bad magic number for krb5_cs_table_entry structure" +msgstr "krb5_cs_table_entry 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_CS_TABLE_ENTRY +#: ../src/dummy-strings.c:224 +msgid "Bad magic number for krb5_checksum_entry structure" +msgstr "krb5_checksum_entry 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_CHECKSUM_ENTRY +#: ../src/dummy-strings.c:225 +msgid "Bad magic number for krb5_authdata structure" +msgstr "krb5_authdata 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_AUTHDATA +#: ../src/dummy-strings.c:226 +msgid "Bad magic number for krb5_transited structure" +msgstr "krb5_transited 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_TRANSITED +#: ../src/dummy-strings.c:227 +msgid "Bad magic number for krb5_enc_tkt_part structure" +msgstr "krb5_enc_tkt_part 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_ENC_TKT_PART +#: ../src/dummy-strings.c:228 +msgid "Bad magic number for krb5_ticket structure" +msgstr "krb5_ticket 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_TICKET +#: ../src/dummy-strings.c:229 +msgid "Bad magic number for krb5_authenticator structure" +msgstr "krb5_authenticator 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_AUTHENTICATOR +#: ../src/dummy-strings.c:230 +msgid "Bad magic number for krb5_tkt_authent structure" +msgstr "krb5_tkt_authent 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_TKT_AUTHENT +#: ../src/dummy-strings.c:231 +msgid "Bad magic number for krb5_creds structure" +msgstr "krb5_creds 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_CREDS +#: ../src/dummy-strings.c:232 +msgid "Bad magic number for krb5_last_req_entry structure" +msgstr "krb5_last_req_entry 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_LAST_REQ_ENTRY +#: ../src/dummy-strings.c:233 +msgid "Bad magic number for krb5_pa_data structure" +msgstr "krb5_pa_data 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_PA_DATA +#: ../src/dummy-strings.c:234 +msgid "Bad magic number for krb5_kdc_req structure" +msgstr "krb5_kdc_req 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_KDC_REQ +#: ../src/dummy-strings.c:235 +msgid "Bad magic number for krb5_enc_kdc_rep_part structure" +msgstr "krb5_enc_kdc_rep_part 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_ENC_KDC_REP_PART +#: ../src/dummy-strings.c:236 +msgid "Bad magic number for krb5_kdc_rep structure" +msgstr "krb5_kdc_rep 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_KDC_REP +#: ../src/dummy-strings.c:237 +msgid "Bad magic number for krb5_error structure" +msgstr "krb5_error 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_ERROR +#: ../src/dummy-strings.c:238 +msgid "Bad magic number for krb5_ap_req structure" +msgstr "krb5_ap_req 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_AP_REQ +#: ../src/dummy-strings.c:239 +msgid "Bad magic number for krb5_ap_rep structure" +msgstr "krb5_ap_rep 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_AP_REP +#: ../src/dummy-strings.c:240 +msgid "Bad magic number for krb5_ap_rep_enc_part structure" +msgstr "krb5_ap_rep_enc_part 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_AP_REP_ENC_PART +#: ../src/dummy-strings.c:241 +msgid "Bad magic number for krb5_response structure" +msgstr "krb5_response 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_RESPONSE +#: ../src/dummy-strings.c:242 +msgid "Bad magic number for krb5_safe structure" +msgstr "krb5_safe 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_SAFE +#: ../src/dummy-strings.c:243 +msgid "Bad magic number for krb5_priv structure" +msgstr "krb5_priv 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_PRIV +#: ../src/dummy-strings.c:244 +msgid "Bad magic number for krb5_priv_enc_part structure" +msgstr "krb5_priv_enc_part 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_PRIV_ENC_PART +#: ../src/dummy-strings.c:245 +msgid "Bad magic number for krb5_cred structure" +msgstr "krb5_cred 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_CRED +#: ../src/dummy-strings.c:246 +msgid "Bad magic number for krb5_cred_info structure" +msgstr "krb5_cred_info 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_CRED_INFO +#: ../src/dummy-strings.c:247 +msgid "Bad magic number for krb5_cred_enc_part structure" +msgstr "krb5_cred_enc_part 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_CRED_ENC_PART +#: ../src/dummy-strings.c:248 +msgid "Bad magic number for krb5_pwd_data structure" +msgstr "krb5_pwd_data 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_PWD_DATA +#: ../src/dummy-strings.c:249 +msgid "Bad magic number for krb5_address structure" +msgstr "krb5_address 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_ADDRESS +#: ../src/dummy-strings.c:250 +msgid "Bad magic number for krb5_keytab_entry structure" +msgstr "krb5_keytab_entry 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_KEYTAB_ENTRY +#: ../src/dummy-strings.c:251 +msgid "Bad magic number for krb5_context structure" +msgstr "krb5_context 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_CONTEXT +#: ../src/dummy-strings.c:252 +msgid "Bad magic number for krb5_os_context structure" +msgstr "krb5_os_context 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_OS_CONTEXT +#: ../src/dummy-strings.c:253 +msgid "Bad magic number for krb5_alt_method structure" +msgstr "krb5_alt_method 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_ALT_METHOD +#: ../src/dummy-strings.c:254 +msgid "Bad magic number for krb5_etype_info_entry structure" +msgstr "krb5_etype_info_entry 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_ETYPE_INFO_ENTRY +#: ../src/dummy-strings.c:255 +msgid "Bad magic number for krb5_db_context structure" +msgstr "krb5_db_context 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_DB_CONTEXT +#: ../src/dummy-strings.c:256 +msgid "Bad magic number for krb5_auth_context structure" +msgstr "krb5_auth_context 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_AUTH_CONTEXT +#: ../src/dummy-strings.c:257 +msgid "Bad magic number for krb5_keytab structure" +msgstr "krb5_keytab 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_KEYTAB +#: ../src/dummy-strings.c:258 +msgid "Bad magic number for krb5_rcache structure" +msgstr "krb5_rcache 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_RCACHE +#: ../src/dummy-strings.c:259 +msgid "Bad magic number for krb5_ccache structure" +msgstr "krb5_ccache 结构的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_CCACHE +#: ../src/dummy-strings.c:260 +msgid "Bad magic number for krb5_preauth_ops" +msgstr "krb5_preauth_ops 的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_PREAUTH_OPS +#: ../src/dummy-strings.c:261 +msgid "Bad magic number for krb5_sam_challenge" +msgstr "krb5_sam_challenge 的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_SAM_CHALLENGE +#: ../src/dummy-strings.c:262 +msgid "Bad magic number for krb5_sam_challenge_2" +msgstr "krb5_sam_challenge_2 的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_SAM_CHALLENGE_2 +#: ../src/dummy-strings.c:263 +msgid "Bad magic number for krb5_sam_key" +msgstr "krb5_sam_key 的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_SAM_KEY +#. kv5m_err.et:kv5m:KV5M_ENC_SAM_RESPONSE_ENC +#: ../src/dummy-strings.c:264 ../src/dummy-strings.c:265 +msgid "Bad magic number for krb5_enc_sam_response_enc" +msgstr "krb5_enc_sam_response_enc 的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_ENC_SAM_RESPONSE_ENC_2 +#: ../src/dummy-strings.c:266 +msgid "Bad magic number for krb5_sam_response" +msgstr "krb5_sam_response 的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_SAM_RESPONSE +#: ../src/dummy-strings.c:267 +msgid "Bad magic number for krb5_sam_response 2" +msgstr "krb5_sam_response 2 的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_SAM_RESPONSE_2 +#: ../src/dummy-strings.c:268 +msgid "Bad magic number for krb5_predicted_sam_response" +msgstr "krb5_predicted_sam_response 的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_PREDICTED_SAM_RESPONSE +#: ../src/dummy-strings.c:269 +msgid "Bad magic number for passwd_phrase_element" +msgstr "passwd_phrase_element 的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_PASSWD_PHRASE_ELEMENT +#: ../src/dummy-strings.c:270 +msgid "Bad magic number for GSSAPI OID" +msgstr "GSSAPI OID 的幻数有误" + +#. kv5m_err.et:kv5m:KV5M_GSS_OID +#: ../src/dummy-strings.c:271 +msgid "Bad magic number for GSSAPI QUEUE" +msgstr "GSSAPI QUEUE 的幻数有误" + +#. Translators: First number is hours, second number is minutes +#: ../src/ka-applet.c:386 +#, c-format +msgid "Your credentials expire in %.2d:%.2dh" +msgstr "您的证书将于 %.2d:%.2dh 后过期" + +#: ../src/ka-applet.c:500 +#, fuzzy +msgid "Don't show me this again" +msgstr "不要再告诉我这个了" + +#: ../src/ka-applet.c:542 +msgid "Network credentials valid" +msgstr "网络证书有效" + +#: ../src/ka-applet.c:543 +msgid "You've refreshed your Kerberos credentials." +msgstr "您已更新自己的 Kerberos 证书。" + +#: ../src/ka-applet.c:559 +msgid "Network credentials expiring" +msgstr "网络证书即将过期" + +#: ../src/ka-applet.c:578 +msgid "Network credentials expired" +msgstr "网络证书已过期" + +#: ../src/ka-applet.c:579 +msgid "Your Kerberos credentails have expired." +msgstr "您的 Kerberos 证书已过期。" + +#: ../src/ka-applet.c:624 +#, c-format +msgid "There was an error launching the preferences dialog: %s" +msgstr "启动首选项对话框时出错：%s" + +#: ../src/ka-applet.c:665 +#, c-format +msgid "" +"There was an error displaying %s:\n" +"%s" +msgstr "" +"显示 %s 出错：\n" +"%s" + +#. Translators: add the translators of your language here +#: ../src/ka-applet.c:701 +msgid "translator-credits" +msgstr "Yinghua_Wang <wantinghard@gmail.com>" + +#. kdestroy +#: ../src/ka-applet.c:743 +msgid "Remove Credentials _Cache" +msgstr "移除证书缓存(_C)" + +#. Ticket dialog +#: ../src/ka-applet.c:753 +msgid "_List Tickets" +msgstr "列出票据(_L)" + +#: ../src/ka-tools.c:45 +#, c-format +msgid "" +"There was an error displaying help:\n" +"%s" +msgstr "" +"显示帮助时出现了一个错误：\n" +"%s" + +#: ../src/ka-tickets.c:54 +msgid "Principal" +msgstr "委托方" + +#: ../src/ka-tickets.c:60 +msgid "Start Time" +msgstr "开始时间" + +#: ../src/ka-tickets.c:66 +msgid "End Time" +msgstr "结束时间" + +#: ../src/ka-tickets.c:72 +msgid "Fwd" +msgstr "转发" + +#: ../src/ka-tickets.c:78 +msgid "Proxy" +msgstr "代理" + +#: ../src/ka-tickets.c:84 +msgid "Renew" +msgstr "更新" + +#: ../src/ka-tickets.c:107 +msgid "Error displaying service ticket information" +msgstr "显示服务票据信息出错" + +#: ../src/krb5-auth-dialog.desktop.in.h:1 +msgid "Kerberos Network Authentication Dialog" +msgstr "Kerberos 网络认证对话框" + +#: ../src/krb5-auth-dialog.schemas.in.h:1 +msgid "Enabled plugins" +msgstr "已启用的插件" + +#: ../src/krb5-auth-dialog.schemas.in.h:2 +msgid "Forwardable ticket" +msgstr "可转发票据" + +#: ../src/krb5-auth-dialog.schemas.in.h:3 +msgid "Kerberos principal" +msgstr "Kerberos 委托方" + +#: ../src/krb5-auth-dialog.schemas.in.h:4 +msgid "List of plugins that should be loaded and activated on startup." +msgstr "应在启动时加载和启用的插件列表。" + +#: ../src/krb5-auth-dialog.schemas.in.h:5 +msgid "Notify user when ticket becomes valid" +msgstr "在票据失效时通知用户" + +#: ../src/krb5-auth-dialog.schemas.in.h:6 +msgid "Notify user when ticket has expired" +msgstr "在票据过期时通知用户" + +#: ../src/krb5-auth-dialog.schemas.in.h:7 +msgid "Notify user when ticket is about to expire" +msgstr "在票据即将过期时通知用户" + +#: ../src/krb5-auth-dialog.schemas.in.h:8 +msgid "PKINIT CA certificates" +msgstr "PKINIT CA 证书" + +#: ../src/krb5-auth-dialog.schemas.in.h:9 +msgid "PKINIT identifier" +msgstr "PKINIT 标识符" + +#: ../src/krb5-auth-dialog.schemas.in.h:10 +msgid "PKINIT trust anchors" +msgstr "PKINIT 信任标记" + +#: ../src/krb5-auth-dialog.schemas.in.h:11 +msgid "Prompt minutes before expiry" +msgstr "提前通知过期的分钟数" + +#: ../src/krb5-auth-dialog.schemas.in.h:12 +msgid "Proxiable ticket" +msgstr "可代理的票据" + +#: ../src/krb5-auth-dialog.schemas.in.h:13 +msgid "Renewable ticket" +msgstr "可更新的票据" + +#: ../src/krb5-auth-dialog.schemas.in.h:14 +msgid "Requested tickets should be forwardable" +msgstr "请求的票据要是可转发的" + +#: ../src/krb5-auth-dialog.schemas.in.h:15 +msgid "Requested tickets should be proxiable" +msgstr "请求的票据要是可代理的" + +#: ../src/krb5-auth-dialog.schemas.in.h:16 +msgid "Requested tickets should be renewable" +msgstr "请求的票据要是可更新的" + +#: ../src/krb5-auth-dialog.schemas.in.h:17 +msgid "Show a trayicon in the status area of the panel" +msgstr "在面板的状态区显示托盘图标" + +#: ../src/krb5-auth-dialog.schemas.in.h:18 +msgid "Show trayicon" +msgstr "显示托盘图标" + +#: ../src/krb5-auth-dialog.schemas.in.h:19 +#, fuzzy +msgid "" +"Start prompting/displaying notifications that many minutes before expiry" +msgstr "在过期前这么多分钟前开始提示/显示通知" + +#: ../src/krb5-auth-dialog.schemas.in.h:20 +msgid "The kerberos principal to acquire the ticket for" +msgstr "获取票据的 Kerberos 委托方" + +#: ../src/krb5-auth-dialog.schemas.in.h:21 +msgid "The principal's public/private/certificate identifier when using PKINIT" +msgstr "使用 PKINIT 时委托方的公/私/证书标识符" + +#: ../src/krb5-auth-dialog.schemas.in.h:22 +msgid "ticket expired notification" +msgstr "票据过期通知" + +#: ../src/krb5-auth-dialog.schemas.in.h:23 +msgid "ticket expiring notification" +msgstr "票据将过期通知" + +#: ../src/krb5-auth-dialog.schemas.in.h:24 +msgid "valid ticket notification" +msgstr "有效票据通知" + +#: ../secmem/util.c:106 +#, c-format +msgid "Warning: running q-agent setuid on this system is dangerous\n" +msgstr "警告：在此系统上执行 q-agent setuid 是危险的\n" + +#: ../preferences/ka-preferences.c:345 +msgid "Choose Certificate" +msgstr "选择证书" + +#: ../preferences/ka-preferences.c:361 +msgid "X509 Certificates" +msgstr "X509 证书" + +#: ../preferences/ka-preferences.c:365 +msgid "all files" +msgstr "所有文件" + +#: ../preferences/krb5-auth-dialog-preferences.desktop.in.h:2 +msgid "Set your Kerberos network authentication preferences" +msgstr "设置您的 Kerberos 网络认证首选参数" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:1 +msgid "Appearance" +msgstr "外观" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:2 +msgid "Applet" +msgstr "小程序" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:3 +msgid "Certificate and private key used for authentication" +msgstr "用于认证的证书和私钥" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:4 +msgid "If checked, display the tray icon in the status bar" +msgstr "如果选择，在状态栏显示托盘图标" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:5 +msgid "If checked, request forwardable tickets" +msgstr "如果选择，请求可转发的票据" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:6 +msgid "If checked, request proxiable tickets" +msgstr "如果选择，请求可代理的票据" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:7 +msgid "If checked, request renewable tickets" +msgstr "如果选择，请求可更新的票据" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:8 +msgid "If checked, use a security token (Smartcard) to authenticate." +msgstr "如果选择，使用加密令牌(智能卡)认证。" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:9 +msgid "Kerberos" +msgstr "Kerberos" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:10 +msgid "Kerberos Authentication Configuration" +msgstr "Kerberos 认证配置" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:11 +msgid "Kerberos User" +msgstr "Kerberos 用户" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:12 +msgid "Kerberos principal:" +msgstr "Kerberos 委托方：" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:13 +msgid "Notifications" +msgstr "通知" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:14 +msgid "PKINIT:" +msgstr "PKINIT：" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:15 +msgid "Requested Kerberos tickets should be:" +msgstr "请求的 Kerberos 票据应该：" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:16 +msgid "" +"Send notification about ticket expiry that many minutes before it finally " +"expires" +msgstr "在票据最终过期前若干分钟发送票据过期通知" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:17 +msgid "Show tray icon" +msgstr "显示托盘图标" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:18 +msgid "Ticket Options" +msgstr "票据选项" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:19 +msgid "Use Smartcard" +msgstr "使用智能卡" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:20 +msgid "Userid:" +msgstr "用户标识：" + +#. Used in combination: 'Warn x minutes before expiry' +#: ../preferences/krb5-auth-dialog-preferences.xml.h:22 +msgid "Warn" +msgstr "警告" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:23 +msgid "X509 trust anchors:" +msgstr "X509 信任标记：" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:24 +msgid "_Browse..." +msgstr "浏览(_B)..." + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:25 +msgid "forwardable" +msgstr "可转发的" + +#. Used in combination: 'Warn x minutes before expiry' +#: ../preferences/krb5-auth-dialog-preferences.xml.h:27 +#, fuzzy +msgid "minutes before expiry" +msgstr "过期前的分钟数" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:28 +msgid "proxiable" +msgstr "可代理的" + +#: ../preferences/krb5-auth-dialog-preferences.xml.h:29 +msgid "renewable" +msgstr "可更新的" diff --git a/preferences/Makefile.in b/preferences/Makefile.in index 852125f..a5e9542 100644 --- a/preferences/Makefile.in +++ b/preferences/Makefile.in @@ -167,8 +167,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ diff --git a/secmem/Makefile.in b/secmem/Makefile.in index 215dd4b..e86541b 100644 --- a/secmem/Makefile.in +++ b/secmem/Makefile.in @@ -149,8 +149,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ diff --git a/src/Makefile.in b/src/Makefile.in index ace15f5..0162189 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -181,8 +181,6 @@ GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ GIO_CFLAGS = @GIO_CFLAGS@ GIO_LIBS = @GIO_LIBS@ -GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@ -GIO_UNIX_LIBS = @GIO_UNIX_LIBS@ GMODULE_CFLAGS = @GMODULE_CFLAGS@ GMODULE_LIBS = @GMODULE_LIBS@ GMOFILES = @GMOFILES@ diff --git a/src/ka-applet.c b/src/ka-applet.c index bce4288..9beafd1 100644 --- a/src/ka-applet.c +++ b/src/ka-applet.c @@ -750,7 +750,7 @@ ka_applet_create_context_menu (KaApplet* applet) ka_applet_menu_add_separator_item (menu); /* Ticket dialog */ - menu_item = gtk_image_menu_item_new_with_mnemonic("_List Tickets"); + menu_item = gtk_image_menu_item_new_with_mnemonic(_("_List Tickets")); g_signal_connect (G_OBJECT (menu_item), "activate", G_CALLBACK (ka_applet_cb_show_tickets), applet); gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_item); |