some work on AboutDlg,
fixed problem with new databases git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@57 b624d157-de02-0410-bad0-e51aec6abb33
This commit is contained in:
		
							parent
							
								
									6154859afc
								
							
						
					
					
						commit
						49059c82f4
					
				| 
						 | 
					@ -1,339 +1,339 @@
 | 
				
			||||||
<pre>                         GNU GENERAL PUBLIC LICENSE
 | 
					<pre>                     GNU GENERAL PUBLIC LICENSE
 | 
				
			||||||
                           Version 2, June 1991
 | 
					                       Version 2, June 1991
 | 
				
			||||||
 | 
					
 | 
				
			||||||
     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 | 
					 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 | 
				
			||||||
                           51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 | 
					                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 | 
				
			||||||
     Everyone is permitted to copy and distribute verbatim copies
 | 
					 Everyone is permitted to copy and distribute verbatim copies
 | 
				
			||||||
     of this license document, but changing it is not allowed.
 | 
					 of this license document, but changing it is not allowed.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                                Preamble
 | 
					                            Preamble
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      The licenses for most software are designed to take away your
 | 
					  The licenses for most software are designed to take away your
 | 
				
			||||||
    freedom to share and change it. By contrast, the GNU General Public
 | 
					freedom to share and change it. By contrast, the GNU General Public
 | 
				
			||||||
    License is intended to guarantee your freedom to share and change free
 | 
					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
 | 
					software--to make sure the software is free for all its users. This
 | 
				
			||||||
    General Public License applies to most of the Free Software
 | 
					General Public License applies to most of the Free Software
 | 
				
			||||||
    Foundation's software and to any other program whose authors commit to
 | 
					Foundation's software and to any other program whose authors commit to
 | 
				
			||||||
    using it. (Some other Free Software Foundation software is covered by
 | 
					using it. (Some other Free Software Foundation software is covered by
 | 
				
			||||||
    the GNU Library General Public License instead.)  You can apply it to
 | 
					the GNU Library General Public License instead.)  You can apply it to
 | 
				
			||||||
    your programs, too.
 | 
					your programs, too.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      When we speak of free software, we are referring to freedom, not
 | 
					  When we speak of free software, we are referring to freedom, not
 | 
				
			||||||
    price. Our General Public Licenses are designed to make sure that you
 | 
					price. Our General Public Licenses are designed to make sure that you
 | 
				
			||||||
    have the freedom to distribute copies of free software (and charge for
 | 
					have the freedom to distribute copies of free software (and charge for
 | 
				
			||||||
    this service if you wish), that you receive source code or can get it
 | 
					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
 | 
					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.
 | 
					in new free programs; and that you know you can do these things.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      To protect your rights, we need to make restrictions that forbid
 | 
					  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.
 | 
					anyone to deny you these rights or to ask you to surrender the rights.
 | 
				
			||||||
    These restrictions translate to certain responsibilities for you if you
 | 
					These restrictions translate to certain responsibilities for you if you
 | 
				
			||||||
    distribute copies of the software, or if you modify it.
 | 
					distribute copies of the software, or if you modify it.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      For example, if you distribute copies of such a program, whether
 | 
					  For example, if you distribute copies of such a program, whether
 | 
				
			||||||
    gratis or for a fee, you must give the recipients all the rights that
 | 
					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
 | 
					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
 | 
					source code. And you must show them these terms so they know their
 | 
				
			||||||
    rights.
 | 
					rights.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      We protect your rights with two steps: (1) copyright the software, and
 | 
					  We protect your rights with two steps: (1) copyright the software, and
 | 
				
			||||||
    (2) offer you this license which gives you legal permission to copy,
 | 
					(2) offer you this license which gives you legal permission to copy,
 | 
				
			||||||
    distribute and/or modify the software.
 | 
					distribute and/or modify the software.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      Also, for each author's protection and ours, we want to make certain
 | 
					  Also, for each author's protection and ours, we want to make certain
 | 
				
			||||||
    that everyone understands that there is no warranty for this free
 | 
					that everyone understands that there is no warranty for this free
 | 
				
			||||||
    software. If the software is modified by someone else and passed on, we
 | 
					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
 | 
					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
 | 
					that any problems introduced by others will not reflect on the original
 | 
				
			||||||
    authors' reputations.
 | 
					authors' reputations.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      Finally, any free program is threatened constantly by software
 | 
					  Finally, any free program is threatened constantly by software
 | 
				
			||||||
    patents. We wish to avoid the danger that redistributors of a free
 | 
					patents. We wish to avoid the danger that redistributors of a free
 | 
				
			||||||
    program will individually obtain patent licenses, in effect making the
 | 
					program will individually obtain patent licenses, in effect making the
 | 
				
			||||||
    program proprietary. To prevent this, we have made it clear that any
 | 
					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.
 | 
					patent must be licensed for everyone's free use or not licensed at all.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      The precise terms and conditions for copying, distribution and
 | 
					  The precise terms and conditions for copying, distribution and
 | 
				
			||||||
    modification follow.
 | 
					modification follow.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                        GNU GENERAL PUBLIC LICENSE
 | 
					                    GNU GENERAL PUBLIC LICENSE
 | 
				
			||||||
       TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 | 
					   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      0. This License applies to any program or other work which contains
 | 
					  0. This License applies to any program or other work which contains
 | 
				
			||||||
    a notice placed by the copyright holder saying it may be distributed
 | 
					a notice placed by the copyright holder saying it may be distributed
 | 
				
			||||||
    under the terms of this General Public License. The "Program", below,
 | 
					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"
 | 
					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:
 | 
					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,
 | 
					that is to say, a work containing the Program or a portion of it,
 | 
				
			||||||
    either verbatim or with modifications and/or translated into another
 | 
					either verbatim or with modifications and/or translated into another
 | 
				
			||||||
    language. (Hereinafter, translation is included without limitation in
 | 
					language. (Hereinafter, translation is included without limitation in
 | 
				
			||||||
    the term "modification".)  Each licensee is addressed as "you".
 | 
					the term "modification".)  Each licensee is addressed as "you".
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Activities other than copying, distribution and modification are not
 | 
					Activities other than copying, distribution and modification are not
 | 
				
			||||||
    covered by this License; they are outside its scope. The act of
 | 
					covered by this License; they are outside its scope. The act of
 | 
				
			||||||
    running the Program is not restricted, and the output from the Program
 | 
					running the Program is not restricted, and the output from the Program
 | 
				
			||||||
    is covered only if its contents constitute a work based on the
 | 
					is covered only if its contents constitute a work based on the
 | 
				
			||||||
    Program (independent of having been made by running the Program).
 | 
					Program (independent of having been made by running the Program).
 | 
				
			||||||
    Whether that is true depends on what the Program does.
 | 
					Whether that is true depends on what the Program does.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      1. You may copy and distribute verbatim copies of the Program's
 | 
					  1. You may copy and distribute verbatim copies of the Program's
 | 
				
			||||||
    source code as you receive it, in any medium, provided that you
 | 
					source code as you receive it, in any medium, provided that you
 | 
				
			||||||
    conspicuously and appropriately publish on each copy an appropriate
 | 
					conspicuously and appropriately publish on each copy an appropriate
 | 
				
			||||||
    copyright notice and disclaimer of warranty; keep intact all the
 | 
					copyright notice and disclaimer of warranty; keep intact all the
 | 
				
			||||||
    notices that refer to this License and to the absence of any warranty;
 | 
					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
 | 
					and give any other recipients of the Program a copy of this License
 | 
				
			||||||
    along with the Program.
 | 
					along with the Program.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    You may charge a fee for the physical act of transferring a copy, and
 | 
					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.
 | 
					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
 | 
					  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
 | 
					of it, thus forming a work based on the Program, and copy and
 | 
				
			||||||
    distribute such modifications or work under the terms of Section 1
 | 
					distribute such modifications or work under the terms of Section 1
 | 
				
			||||||
    above, provided that you also meet all of these conditions:
 | 
					above, provided that you also meet all of these conditions:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        a) You must cause the modified files to carry prominent notices
 | 
					    a) You must cause the modified files to carry prominent notices
 | 
				
			||||||
        stating that you changed the files and the date of any change.
 | 
					    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
 | 
					    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
 | 
					    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
 | 
					    part thereof, to be licensed as a whole at no charge to all third
 | 
				
			||||||
        parties under the terms of this License.
 | 
					    parties under the terms of this License.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        c) If the modified program normally reads commands interactively
 | 
					    c) If the modified program normally reads commands interactively
 | 
				
			||||||
        when run, you must cause it, when started running for such
 | 
					    when run, you must cause it, when started running for such
 | 
				
			||||||
        interactive use in the most ordinary way, to print or display an
 | 
					    interactive use in the most ordinary way, to print or display an
 | 
				
			||||||
        announcement including an appropriate copyright notice and a
 | 
					    announcement including an appropriate copyright notice and a
 | 
				
			||||||
        notice that there is no warranty (or else, saying that you provide
 | 
					    notice that there is no warranty (or else, saying that you provide
 | 
				
			||||||
        a warranty) and that users may redistribute the program under
 | 
					    a warranty) and that users may redistribute the program under
 | 
				
			||||||
        these conditions, and telling the user how to view a copy of this
 | 
					    these conditions, and telling the user how to view a copy of this
 | 
				
			||||||
        License. (Exception: if the Program itself is interactive but
 | 
					    License. (Exception: if the Program itself is interactive but
 | 
				
			||||||
        does not normally print such an announcement, your work based on
 | 
					    does not normally print such an announcement, your work based on
 | 
				
			||||||
        the Program is not required to print an announcement.)
 | 
					    the Program is not required to print an announcement.)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    These requirements apply to the modified work as a whole. If
 | 
					These requirements apply to the modified work as a whole. If
 | 
				
			||||||
    identifiable sections of that work are not derived from the Program,
 | 
					identifiable sections of that work are not derived from the Program,
 | 
				
			||||||
    and can be reasonably considered independent and separate works in
 | 
					and can be reasonably considered independent and separate works in
 | 
				
			||||||
    themselves, then this License, and its terms, do not apply to those
 | 
					themselves, then this License, and its terms, do not apply to those
 | 
				
			||||||
    sections when you distribute them as separate works. But when you
 | 
					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
 | 
					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
 | 
					on the Program, the distribution of the whole must be on the terms of
 | 
				
			||||||
    this License, whose permissions for other licensees extend to the
 | 
					this License, whose permissions for other licensees extend to the
 | 
				
			||||||
    entire whole, and thus to each and every part regardless of who wrote it.
 | 
					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
 | 
					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
 | 
					your rights to work written entirely by you; rather, the intent is to
 | 
				
			||||||
    exercise the right to control the distribution of derivative or
 | 
					exercise the right to control the distribution of derivative or
 | 
				
			||||||
    collective works based on the Program.
 | 
					collective works based on the Program.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    In addition, mere aggregation of another work not 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
 | 
					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
 | 
					a storage or distribution medium does not bring the other work under
 | 
				
			||||||
    the scope of this License.
 | 
					the scope of this License.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      3. You may copy and distribute the Program (or a work based on it,
 | 
					  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
 | 
					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:
 | 
					Sections 1 and 2 above provided that you also do one of the following:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        a) Accompany it with the complete corresponding machine-readable
 | 
					    a) Accompany it with the complete corresponding machine-readable
 | 
				
			||||||
        source code, which must be distributed under the terms of Sections
 | 
					    source code, which must be distributed under the terms of Sections
 | 
				
			||||||
        1 and 2 above on a medium customarily used for software interchange; or,
 | 
					    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
 | 
					    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
 | 
					    years, to give any third party, for a charge no more than your
 | 
				
			||||||
        cost of physically performing source distribution, a complete
 | 
					    cost of physically performing source distribution, a complete
 | 
				
			||||||
        machine-readable copy of the corresponding source code, to be
 | 
					    machine-readable copy of the corresponding source code, to be
 | 
				
			||||||
        distributed under the terms of Sections 1 and 2 above on a medium
 | 
					    distributed under the terms of Sections 1 and 2 above on a medium
 | 
				
			||||||
        customarily used for software interchange; or,
 | 
					    customarily used for software interchange; or,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        c) Accompany it with the information you received as to the offer
 | 
					    c) Accompany it with the information you received as to the offer
 | 
				
			||||||
        to distribute corresponding source code. (This alternative is
 | 
					    to distribute corresponding source code. (This alternative is
 | 
				
			||||||
        allowed only for noncommercial distribution and only if you
 | 
					    allowed only for noncommercial distribution and only if you
 | 
				
			||||||
        received the program in object code or executable form with such
 | 
					    received the program in object code or executable form with such
 | 
				
			||||||
        an offer, in accord with Subsection b above.)
 | 
					    an offer, in accord with Subsection b above.)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    The source code for a work means the preferred form of the work for
 | 
					The source code for a work means the preferred form of the work for
 | 
				
			||||||
    making modifications to it. For an executable work, complete source
 | 
					making modifications to it. For an executable work, complete source
 | 
				
			||||||
    code means all the source code for all modules it contains, plus any
 | 
					code means all the source code for all modules it contains, plus any
 | 
				
			||||||
    associated interface definition files, plus the scripts used to
 | 
					associated interface definition files, plus the scripts used to
 | 
				
			||||||
    control compilation and installation of the executable. However, as a
 | 
					control compilation and installation of the executable. However, as a
 | 
				
			||||||
    special exception, the source code distributed need not include
 | 
					special exception, the source code distributed need not include
 | 
				
			||||||
    anything that is normally distributed (in either source or binary
 | 
					anything that is normally distributed (in either source or binary
 | 
				
			||||||
    form) with the major components (compiler, kernel, and so on) of the
 | 
					form) with the major components (compiler, kernel, and so on) of the
 | 
				
			||||||
    operating system on which the executable runs, unless that component
 | 
					operating system on which the executable runs, unless that component
 | 
				
			||||||
    itself accompanies the executable.
 | 
					itself accompanies the executable.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    If distribution of executable or object code is made by offering
 | 
					If distribution of executable or object code is made by offering
 | 
				
			||||||
    access to copy from a designated place, then offering equivalent
 | 
					access to copy from a designated place, then offering equivalent
 | 
				
			||||||
    access to copy the source code from the same place counts as
 | 
					access to copy the source code from the same place counts as
 | 
				
			||||||
    distribution of the source code, even though third parties are not
 | 
					distribution of the source code, even though third parties are not
 | 
				
			||||||
    compelled to copy the source along with the object code.
 | 
					compelled to copy the source along with the object code.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      4. You may not copy, modify, sublicense, or distribute the Program
 | 
					  4. You may not copy, modify, sublicense, or distribute the Program
 | 
				
			||||||
    except as expressly provided under this License. Any attempt
 | 
					except as expressly provided under this License. Any attempt
 | 
				
			||||||
    otherwise to copy, modify, sublicense or distribute the Program is
 | 
					otherwise to copy, modify, sublicense or distribute the Program is
 | 
				
			||||||
    void, and will automatically terminate your rights under this License.
 | 
					void, and will automatically terminate your rights under this License.
 | 
				
			||||||
    However, parties who have received copies, or rights, from you under
 | 
					However, parties who have received copies, or rights, from you under
 | 
				
			||||||
    this License will not have their licenses terminated so long as such
 | 
					this License will not have their licenses terminated so long as such
 | 
				
			||||||
    parties remain in full compliance.
 | 
					parties remain in full compliance.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      5. You are not required to accept this License, since you have not
 | 
					  5. You are not required to accept this License, since you have not
 | 
				
			||||||
    signed it. However, nothing else grants you permission to modify or
 | 
					signed it. However, nothing else grants you permission to modify or
 | 
				
			||||||
    distribute the Program or its derivative works. These actions are
 | 
					distribute the Program or its derivative works. These actions are
 | 
				
			||||||
    prohibited by law if you do not accept this License. Therefore, by
 | 
					prohibited by law if you do not accept this License. Therefore, by
 | 
				
			||||||
    modifying or distributing the Program (or any work based on the
 | 
					modifying or distributing the Program (or any work based on the
 | 
				
			||||||
    Program), you indicate your acceptance of this License to do so, and
 | 
					Program), you indicate your acceptance of this License to do so, and
 | 
				
			||||||
    all its terms and conditions for copying, distributing or modifying
 | 
					all its terms and conditions for copying, distributing or modifying
 | 
				
			||||||
    the Program or works based on it.
 | 
					the Program or works based on it.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      6. Each time you redistribute the Program (or any work based on the
 | 
					  6. Each time you redistribute the Program (or any work based on the
 | 
				
			||||||
    Program), the recipient automatically receives a license from the
 | 
					Program), the recipient automatically receives a license from the
 | 
				
			||||||
    original licensor to copy, distribute or modify the Program subject to
 | 
					original licensor to copy, distribute or modify the Program subject to
 | 
				
			||||||
    these terms and conditions. You may not impose any further
 | 
					these terms and conditions. You may not impose any further
 | 
				
			||||||
    restrictions on the recipients' exercise of the rights granted herein.
 | 
					restrictions on the recipients' exercise of the rights granted herein.
 | 
				
			||||||
    You are not responsible for enforcing compliance by third parties to
 | 
					You are not responsible for enforcing compliance by third parties to
 | 
				
			||||||
    this License.
 | 
					this License.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      7. If, as a consequence of a court judgment or allegation of patent
 | 
					  7. If, as a consequence of a court judgment or allegation of patent
 | 
				
			||||||
    infringement or for any other reason (not limited to patent issues),
 | 
					infringement or for any other reason (not limited to patent issues),
 | 
				
			||||||
    conditions are imposed on you (whether by court order, agreement or
 | 
					conditions are imposed on you (whether by court order, agreement or
 | 
				
			||||||
    otherwise) that contradict the conditions of this License, they do not
 | 
					otherwise) that contradict the conditions of this License, they do not
 | 
				
			||||||
    excuse you from the conditions of this License. If you cannot
 | 
					excuse you from the conditions of this License. If you cannot
 | 
				
			||||||
    distribute so as to satisfy simultaneously your obligations under this
 | 
					distribute so as to satisfy simultaneously your obligations under this
 | 
				
			||||||
    License and any other pertinent obligations, then as a consequence you
 | 
					License and any other pertinent obligations, then as a consequence you
 | 
				
			||||||
    may not distribute the Program at all. For example, if a patent
 | 
					may not distribute the Program at all. For example, if a patent
 | 
				
			||||||
    license would not permit royalty-free redistribution of the Program by
 | 
					license would not permit royalty-free redistribution of the Program by
 | 
				
			||||||
    all those who receive copies directly or indirectly through you, then
 | 
					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
 | 
					the only way you could satisfy both it and this License would be to
 | 
				
			||||||
    refrain entirely from distribution of the Program.
 | 
					refrain entirely from distribution of the Program.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    If any portion of this section is held invalid or unenforceable under
 | 
					If any portion of this section is held invalid or unenforceable under
 | 
				
			||||||
    any particular circumstance, the balance of the section is intended to
 | 
					any particular circumstance, the balance of the section is intended to
 | 
				
			||||||
    apply and the section as a whole is intended to apply in other
 | 
					apply and the section as a whole is intended to apply in other
 | 
				
			||||||
    circumstances.
 | 
					circumstances.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    It is not the purpose of this section to induce you to infringe any
 | 
					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
 | 
					patents or other property right claims or to contest validity of any
 | 
				
			||||||
    such claims; this section has the sole purpose of protecting the
 | 
					such claims; this section has the sole purpose of protecting the
 | 
				
			||||||
    integrity of the free software distribution system, which is
 | 
					integrity of the free software distribution system, which is
 | 
				
			||||||
    implemented by public license practices. Many people have made
 | 
					implemented by public license practices. Many people have made
 | 
				
			||||||
    generous contributions to the wide range of software distributed
 | 
					generous contributions to the wide range of software distributed
 | 
				
			||||||
    through that system in reliance on consistent application of that
 | 
					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
 | 
					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
 | 
					to distribute software through any other system and a licensee cannot
 | 
				
			||||||
    impose that choice.
 | 
					impose that choice.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    This section is intended to make thoroughly clear what is believed to
 | 
					This section is intended to make thoroughly clear what is believed to
 | 
				
			||||||
    be a consequence of the rest of this License.
 | 
					be a consequence of the rest of this License.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      8. If the distribution and/or use of the Program is restricted in
 | 
					  8. If the distribution and/or use of the Program is restricted in
 | 
				
			||||||
    certain countries either by patents or by copyrighted interfaces, the
 | 
					certain countries either by patents or by copyrighted interfaces, the
 | 
				
			||||||
    original copyright holder who places the Program under this License
 | 
					original copyright holder who places the Program under this License
 | 
				
			||||||
    may add an explicit geographical distribution limitation excluding
 | 
					may add an explicit geographical distribution limitation excluding
 | 
				
			||||||
    those countries, so that distribution is permitted only in or among
 | 
					those countries, so that distribution is permitted only in or among
 | 
				
			||||||
    countries not thus excluded. In such case, this License incorporates
 | 
					countries not thus excluded. In such case, this License incorporates
 | 
				
			||||||
    the limitation as if written in the body of this License.
 | 
					the limitation as if written in the body of this License.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      9. The Free Software Foundation may publish revised and/or new versions
 | 
					  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
 | 
					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
 | 
					be similar in spirit to the present version, but may differ in detail to
 | 
				
			||||||
    address new problems or concerns.
 | 
					address new problems or concerns.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Each version is given a distinguishing version number. If the Program
 | 
					Each version is given a distinguishing version number. If the Program
 | 
				
			||||||
    specifies a version number of this License which applies to it and "any
 | 
					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
 | 
					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
 | 
					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
 | 
					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
 | 
					this License, you may choose any version ever published by the Free Software
 | 
				
			||||||
    Foundation.
 | 
					Foundation.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      10. If you wish to incorporate parts of the Program into other free
 | 
					  10. If you wish to incorporate parts of the Program into other free
 | 
				
			||||||
    programs whose distribution conditions are different, write to the author
 | 
					programs whose distribution conditions are different, write to the author
 | 
				
			||||||
    to ask for permission. For software which is copyrighted by the Free
 | 
					to ask for permission. For software which is copyrighted by the Free
 | 
				
			||||||
    Software Foundation, write to the Free Software Foundation; we sometimes
 | 
					Software Foundation, write to the Free Software Foundation; we sometimes
 | 
				
			||||||
    make exceptions for this. Our decision will be guided by the two goals
 | 
					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 preserving the free status of all derivatives of our free software and
 | 
				
			||||||
    of promoting the sharing and reuse of software generally.
 | 
					of promoting the sharing and reuse of software generally.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                                NO WARRANTY
 | 
					                            NO WARRANTY
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS 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
 | 
					FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
 | 
				
			||||||
    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
 | 
					OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
 | 
				
			||||||
    PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
 | 
					PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
 | 
				
			||||||
    OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 | 
					OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 | 
				
			||||||
    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
 | 
					MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
 | 
				
			||||||
    TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
 | 
					TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
 | 
				
			||||||
    PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 | 
					PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
 | 
				
			||||||
    REPAIR OR CORRECTION.
 | 
					REPAIR OR CORRECTION.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
 | 
					  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
 | 
					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,
 | 
					REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
 | 
				
			||||||
    INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
 | 
					INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
 | 
				
			||||||
    OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
 | 
					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
 | 
					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
 | 
					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
 | 
					PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 | 
				
			||||||
    POSSIBILITY OF SUCH DAMAGES.
 | 
					POSSIBILITY OF SUCH DAMAGES.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                         END OF TERMS AND CONDITIONS
 | 
					                     END OF TERMS AND CONDITIONS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            Appendix: How to Apply These Terms to Your New Programs
 | 
					        Appendix: How to Apply These Terms to Your New Programs
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      If you develop a new program, and you want it to be of the greatest
 | 
					  If you develop a new program, and you want it to be of the greatest
 | 
				
			||||||
    possible use to the public, the best way to achieve this is to make it
 | 
					possible use to the public, the best way to achieve this is to make it
 | 
				
			||||||
    free software which everyone can redistribute and change under these terms.
 | 
					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 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
 | 
					to attach them to the start of each source file to most effectively
 | 
				
			||||||
    convey the exclusion of warranty; and each file should have at least
 | 
					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.
 | 
					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.>
 | 
					    <one line to give the program's name and a brief idea of what it does.>
 | 
				
			||||||
        Copyright (C) 19yy  <name of author>
 | 
					    Copyright (C) 19yy  <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
 | 
					    it under the terms of the GNU General Public License as published by
 | 
				
			||||||
        the Free Software Foundation; either version 2 of the License, or
 | 
					    the Free Software Foundation; either version 2 of the License, or
 | 
				
			||||||
        (at your option) any later version.
 | 
					    (at your option) any later version.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        This program is distributed in the hope that it will be useful,
 | 
					    This program is distributed in the hope that it will be useful,
 | 
				
			||||||
        but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
					    but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
				
			||||||
        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 | 
					    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 | 
				
			||||||
        GNU General Public License for more details.
 | 
					    GNU General Public License for more details.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        You should have received a copy of the GNU General Public License
 | 
					    You should have received a copy of the GNU General Public License
 | 
				
			||||||
        along with this program; if not, write to the Free Software
 | 
					    along with this program; if not, write to the Free Software
 | 
				
			||||||
        Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 | 
					    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    Also add information on how to contact you by electronic and paper mail.
 | 
					Also add information on how to contact you by electronic and paper mail.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    If the program is interactive, make it output a short notice like this
 | 
					If the program is interactive, make it output a short notice like this
 | 
				
			||||||
    when it starts in an interactive mode:
 | 
					when it starts in an interactive mode:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        Gnomovision version 69, Copyright (C) 19yy name of author
 | 
					    Gnomovision version 69, Copyright (C) 19yy name of author
 | 
				
			||||||
        Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 | 
					    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
 | 
				
			||||||
        This is free software, and you are welcome to redistribute it
 | 
					    This is free software, and you are welcome to redistribute it
 | 
				
			||||||
        under certain conditions; type `show c' for details.
 | 
					    under certain conditions; type `show c' for details.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    The hypothetical commands `show w' and `show c' should show the appropriate
 | 
					The hypothetical commands `show w' and `show c' should show the appropriate
 | 
				
			||||||
    parts of the General Public License. Of course, the commands you use may
 | 
					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
 | 
					be called something other than `show w' and `show c'; they could even be
 | 
				
			||||||
    mouse-clicks or menu items--whatever suits your program.
 | 
					mouse-clicks or menu items--whatever suits your program.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    You should also get your employer (if you work as a programmer) or your
 | 
					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
 | 
					school, if any, to sign a "copyright disclaimer" for the program, if
 | 
				
			||||||
    necessary. Here is a sample; alter the names:
 | 
					necessary. Here is a sample; alter the names:
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      Yoyodyne, Inc., hereby disclaims all copyright interest in the program
 | 
					  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
 | 
				
			||||||
      `Gnomovision' (which makes passes at compilers) written by James Hacker.
 | 
					  `Gnomovision' (which makes passes at compilers) written by James Hacker.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      <signature of Ty Coon>, 1 April 1989
 | 
					  <signature of Ty Coon>, 1 April 1989
 | 
				
			||||||
      Ty Coon, President of Vice
 | 
					  Ty Coon, President of Vice
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    This General Public License does not permit incorporating your program into
 | 
					This General Public License does not permit incorporating your program into
 | 
				
			||||||
    proprietary programs. If your program is a subroutine library, you may
 | 
					proprietary programs. If your program is a subroutine library, you may
 | 
				
			||||||
    consider it more useful to permit linking proprietary applications with the
 | 
					consider it more useful to permit linking proprietary applications with the
 | 
				
			||||||
    library. If this is what you want to do, use the GNU Library General
 | 
					library. If this is what you want to do, use the GNU Library General
 | 
				
			||||||
    Public License instead of this License.</pre>
 | 
					Public License instead of this License.</pre>
 | 
				
			||||||
| 
						 | 
					@ -60,3 +60,9 @@ CGroup::~CGroup(){
 | 
				
			||||||
CEntry::~CEntry(){
 | 
					CEntry::~CEntry(){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Database::Database(){
 | 
				
			||||||
 | 
					file=NULL;
 | 
				
			||||||
 | 
					KeyEncRounds=6000;
 | 
				
			||||||
 | 
					CryptoAlgorithmus=ALGO_AES;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
/***************************************************************************
 | 
					/***************************************************************************
 | 
				
			||||||
 *   Copyright (C) 2005 by Tarek Saidi                                     *
 | 
					 *   Copyright (C) 2005-2006 by Tarek Saidi                                *
 | 
				
			||||||
 *   mail@tarek-saidi.de                                                   *
 | 
					 *   mail@tarek-saidi.de                                                   *
 | 
				
			||||||
 *                                                                         *
 | 
					 *                                                                         *
 | 
				
			||||||
 *   This program is free software; you can redistribute it and/or modify  *
 | 
					 *   This program is free software; you can redistribute it and/or modify  *
 | 
				
			||||||
| 
						 | 
					@ -22,6 +22,7 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <QList>
 | 
					#include <QList>
 | 
				
			||||||
#include <QDateTime>
 | 
					#include <QDateTime>
 | 
				
			||||||
 | 
					#include <QFile>
 | 
				
			||||||
#include "lib/SecString.h"
 | 
					#include "lib/SecString.h"
 | 
				
			||||||
using namespace std;
 | 
					using namespace std;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -72,13 +73,15 @@ static bool UI_ExpandByDefault;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
};
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define ALGO_AES         		0
 | 
				
			||||||
 | 
					#define ALGO_TWOFISH			1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Database{
 | 
					class Database{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
 | 
					 Database();
 | 
				
			||||||
 Q_UINT32 CryptoAlgorithmus;
 | 
					 Q_UINT32 CryptoAlgorithmus;
 | 
				
			||||||
 Q_UINT32 KeyEncRounds;
 | 
					 Q_UINT32 KeyEncRounds;
 | 
				
			||||||
 QString filename;
 | 
					 QFile* file;
 | 
				
			||||||
 bool modflag;
 | 
					 bool modflag;
 | 
				
			||||||
 int SearchGroupID;
 | 
					 int SearchGroupID;
 | 
				
			||||||
 QList<CGroup>Groups;
 | 
					 QList<CGroup>Groups;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -33,6 +33,8 @@
 | 
				
			||||||
using namespace std;
 | 
					using namespace std;
 | 
				
			||||||
#include "PwManager.h"
 | 
					#include "PwManager.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#define _ERROR Errors << QString("Unexpected error in: %1, Line:%2").arg(__FILE__).arg(__LINE__);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
QString PwDatabase::getError(){
 | 
					QString PwDatabase::getError(){
 | 
				
			||||||
if(Errors.size()){
 | 
					if(Errors.size()){
 | 
				
			||||||
QString r=Errors.front();
 | 
					QString r=Errors.front();
 | 
				
			||||||
| 
						 | 
					@ -64,7 +66,7 @@ for(i=GroupIndex+1; i<Groups.size(); i++){
 | 
				
			||||||
return ids;
 | 
					return ids;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool PwDatabase::loadDatabase(QString _filename, QString& err){
 | 
					bool PwDatabase::openDatabase(QString filename, QString& err){
 | 
				
			||||||
unsigned long total_size,crypto_size;
 | 
					unsigned long total_size,crypto_size;
 | 
				
			||||||
Q_UINT32 Signature1,Signature2,Version,NumGroups,NumEntries,Flags;
 | 
					Q_UINT32 Signature1,Signature2,Version,NumGroups,NumEntries,Flags;
 | 
				
			||||||
Q_UINT8 TrafoRandomSeed[32];
 | 
					Q_UINT8 TrafoRandomSeed[32];
 | 
				
			||||||
| 
						 | 
					@ -72,13 +74,18 @@ Q_UINT8 FinalRandomSeed[16];
 | 
				
			||||||
Q_UINT8 ContentsHash[32];
 | 
					Q_UINT8 ContentsHash[32];
 | 
				
			||||||
Q_UINT8 EncryptionIV[16];
 | 
					Q_UINT8 EncryptionIV[16];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
filename=_filename;
 | 
					file=new QFile(filename);
 | 
				
			||||||
QFile file(filename);
 | 
					if(!file->open(QIODevice::ReadWrite)){
 | 
				
			||||||
file.open(QIODevice::ReadOnly);
 | 
						if(!file->open(QIODevice::ReadOnly)){
 | 
				
			||||||
total_size=file.size();
 | 
							Errors << tr("Could not open file.");
 | 
				
			||||||
 | 
							delete file;
 | 
				
			||||||
 | 
							file=NULL;
 | 
				
			||||||
 | 
							return false;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					total_size=file->size();
 | 
				
			||||||
char* buffer = new char[total_size];
 | 
					char* buffer = new char[total_size];
 | 
				
			||||||
file.readBlock(buffer,total_size);
 | 
					file->readBlock(buffer,total_size);
 | 
				
			||||||
file.close();
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
if(total_size < DB_HEADER_SIZE){
 | 
					if(total_size < DB_HEADER_SIZE){
 | 
				
			||||||
err=tr("Unexpected file size (DB_TOTAL_SIZE < DB_HEADER_SIZE)");
 | 
					err=tr("Unexpected file size (DB_TOTAL_SIZE < DB_HEADER_SIZE)");
 | 
				
			||||||
| 
						 | 
					@ -383,8 +390,7 @@ else if(FileSize == 64){
 | 
				
			||||||
	  file.close();
 | 
						  file.close();
 | 
				
			||||||
	  return false;}
 | 
						  return false;}
 | 
				
			||||||
	file.close();
 | 
						file.close();
 | 
				
			||||||
	if(!convHexToBinaryKey(hex,(char*)FileKey)) return false;
 | 
						if(!convHexToBinaryKey(hex,(char*)FileKey)){return false;}
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
else{
 | 
					else{
 | 
				
			||||||
sha256_starts(&sha32);
 | 
					sha256_starts(&sha32);
 | 
				
			||||||
| 
						 | 
					@ -519,6 +525,9 @@ PwDatabase::~PwDatabase(){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void PwDatabase::newDatabase(){
 | 
				
			||||||
 | 
						file=new QFile();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool CEntry::ReadEntryField(Q_UINT16 FieldType, Q_UINT32 FieldSize, Q_UINT8 *pData){
 | 
					bool CEntry::ReadEntryField(Q_UINT16 FieldType, Q_UINT32 FieldSize, Q_UINT8 *pData){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -586,9 +595,13 @@ switch(FieldType)
 | 
				
			||||||
bool PwDatabase::closeDatabase(){
 | 
					bool PwDatabase::closeDatabase(){
 | 
				
			||||||
Groups.clear();
 | 
					Groups.clear();
 | 
				
			||||||
Entries.clear();
 | 
					Entries.clear();
 | 
				
			||||||
 | 
					file->close();
 | 
				
			||||||
 | 
					delete file;
 | 
				
			||||||
 | 
					file=NULL;
 | 
				
			||||||
return true;
 | 
					return true;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool PwDatabase::saveDatabase(){
 | 
					bool PwDatabase::saveDatabase(){
 | 
				
			||||||
CGroup SearchGroup;
 | 
					CGroup SearchGroup;
 | 
				
			||||||
Q_UINT32 NumGroups,NumEntries,Signature1,Signature2,Flags,Version;
 | 
					Q_UINT32 NumGroups,NumEntries,Signature1,Signature2,Flags,Version;
 | 
				
			||||||
| 
						 | 
					@ -597,10 +610,18 @@ Q_UINT8 FinalRandomSeed[16];
 | 
				
			||||||
Q_UINT8 ContentsHash[32];
 | 
					Q_UINT8 ContentsHash[32];
 | 
				
			||||||
Q_UINT8 EncryptionIV[16];
 | 
					Q_UINT8 EncryptionIV[16];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if(filename==QString::null)return false;
 | 
					Q_ASSERT(file);
 | 
				
			||||||
QFile file(filename);
 | 
					if(!(file->openMode() & QIODevice::WriteOnly)){
 | 
				
			||||||
unsigned int FileSize;
 | 
						file->close();
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					if(!file->isOpen()){
 | 
				
			||||||
 | 
						if(!file->open(QIODevice::ReadWrite)){
 | 
				
			||||||
 | 
							Errors << tr("Could not open file for writing.");
 | 
				
			||||||
 | 
							return false;
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					unsigned int FileSize;
 | 
				
			||||||
Entries+=UnkownMetaStreams; ///@FIXME ID conflicts???
 | 
					Entries+=UnkownMetaStreams; ///@FIXME ID conflicts???
 | 
				
			||||||
 | 
					
 | 
				
			||||||
FileSize=DB_HEADER_SIZE;
 | 
					FileSize=DB_HEADER_SIZE;
 | 
				
			||||||
| 
						 | 
					@ -806,7 +827,7 @@ if(CryptoAlgorithmus == ALGO_AES){
 | 
				
			||||||
Rijndael aes;
 | 
					Rijndael aes;
 | 
				
			||||||
// Initialize Rijndael/AES
 | 
					// Initialize Rijndael/AES
 | 
				
			||||||
  if(aes.init(Rijndael::CBC, Rijndael::Encrypt, FinalKey,Rijndael::Key32Bytes, EncryptionIV) != RIJNDAEL_SUCCESS){
 | 
					  if(aes.init(Rijndael::CBC, Rijndael::Encrypt, FinalKey,Rijndael::Key32Bytes, EncryptionIV) != RIJNDAEL_SUCCESS){
 | 
				
			||||||
	//TODO:ERR_MSG
 | 
						_ERROR
 | 
				
			||||||
	delete [] buffer;
 | 
						delete [] buffer;
 | 
				
			||||||
	return false;}
 | 
						return false;}
 | 
				
			||||||
EncryptedPartSize = (unsigned long)aes.padEncrypt((Q_UINT8*)buffer+DB_HEADER_SIZE,
 | 
					EncryptedPartSize = (unsigned long)aes.padEncrypt((Q_UINT8*)buffer+DB_HEADER_SIZE,
 | 
				
			||||||
| 
						 | 
					@ -815,7 +836,7 @@ EncryptedPartSize = (unsigned long)aes.padEncrypt((Q_UINT8*)buffer+DB_HEADER_SIZ
 | 
				
			||||||
}else if(CryptoAlgorithmus == ALGO_TWOFISH){
 | 
					}else if(CryptoAlgorithmus == ALGO_TWOFISH){
 | 
				
			||||||
CTwofish twofish;
 | 
					CTwofish twofish;
 | 
				
			||||||
if(twofish.init(FinalKey, 32, EncryptionIV) == false){
 | 
					if(twofish.init(FinalKey, 32, EncryptionIV) == false){
 | 
				
			||||||
//TODO:ERR_MSG
 | 
					_ERROR
 | 
				
			||||||
delete [] buffer;
 | 
					delete [] buffer;
 | 
				
			||||||
return false;}
 | 
					return false;}
 | 
				
			||||||
EncryptedPartSize = (unsigned long)twofish.padEncrypt((Q_UINT8*)buffer+DB_HEADER_SIZE,
 | 
					EncryptedPartSize = (unsigned long)twofish.padEncrypt((Q_UINT8*)buffer+DB_HEADER_SIZE,
 | 
				
			||||||
| 
						 | 
					@ -823,27 +844,20 @@ EncryptedPartSize = (unsigned long)twofish.padEncrypt((Q_UINT8*)buffer+DB_HEADER
 | 
				
			||||||
						      (Q_UINT8*)buffer+DB_HEADER_SIZE);
 | 
											      (Q_UINT8*)buffer+DB_HEADER_SIZE);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
if((EncryptedPartSize > 2147483446) || (EncryptedPartSize == 0)){
 | 
					if((EncryptedPartSize > 2147483446) || (EncryptedPartSize == 0)){
 | 
				
			||||||
//TODO:ERR_MSG
 | 
					_ERROR
 | 
				
			||||||
delete [] buffer;
 | 
					delete [] buffer;
 | 
				
			||||||
return false;
 | 
					return false;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if(file.open(QIODevice::ReadWrite | QIODevice::Truncate)==false){
 | 
					file->resize(0); //truncate
 | 
				
			||||||
//TODO:ERR_MSG
 | 
					if(file->writeBlock(buffer,EncryptedPartSize+DB_HEADER_SIZE)!=EncryptedPartSize+DB_HEADER_SIZE){
 | 
				
			||||||
delete [] buffer;
 | 
					delete [] buffer;
 | 
				
			||||||
return false;
 | 
					return false;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					file->flush();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if(file.writeBlock(buffer,EncryptedPartSize+DB_HEADER_SIZE)!=EncryptedPartSize+DB_HEADER_SIZE){
 | 
					 | 
				
			||||||
//TODO:ERR_MSG
 | 
					 | 
				
			||||||
file.close();
 | 
					 | 
				
			||||||
delete [] buffer;
 | 
					delete [] buffer;
 | 
				
			||||||
return false;
 | 
					//if(SearchGroupID!=-1)Groups.push_back(SearchGroup);
 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
file.close();
 | 
					 | 
				
			||||||
delete [] buffer;
 | 
					 | 
				
			||||||
if(SearchGroupID!=-1)Groups.push_back(SearchGroup);
 | 
					 | 
				
			||||||
return true;
 | 
					return true;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -990,6 +1004,7 @@ for(int i=0; i<64; i+=2){
 | 
				
			||||||
		return false;}
 | 
							return false;}
 | 
				
			||||||
	memcpy(dst+(i/2),&bin,1);
 | 
						memcpy(dst+(i/2),&bin,1);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					return true;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void PwDatabase::moveGroup(CGroup* group, CGroup* DstGroup, int pos){
 | 
					void PwDatabase::moveGroup(CGroup* group, CGroup* DstGroup, int pos){
 | 
				
			||||||
| 
						 | 
					@ -1026,7 +1041,7 @@ else{
 | 
				
			||||||
	NumParentSubGroups=Groups.size();}
 | 
						NumParentSubGroups=Groups.size();}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
if(pos==-1)DstIndex+=(NumParentSubGroups+1);
 | 
					if(pos==-1)DstIndex+=(NumParentSubGroups+1);
 | 
				
			||||||
else{	int n=0; //Counter for direct (first-level) childs
 | 
					else{	int n=0; //counter for direct (first-level) childs
 | 
				
			||||||
	for(i=0; i<NumParentSubGroups;i++){
 | 
						for(i=0; i<NumParentSubGroups;i++){
 | 
				
			||||||
		if(n==pos)break;
 | 
							if(n==pos)break;
 | 
				
			||||||
		if(Groups[DstIndex+1+i].Level==DstGroup->Level+1)n++;
 | 
							if(Groups[DstIndex+1+i].Level==DstGroup->Level+1)n++;
 | 
				
			||||||
| 
						 | 
					@ -1311,8 +1326,8 @@ bool testDatabase(){
 | 
				
			||||||
        /* create a test database */
 | 
					        /* create a test database */
 | 
				
			||||||
        PwDatabase database;
 | 
					        PwDatabase database;
 | 
				
			||||||
        kp_assert(results, database.CalcMasterKeyByPassword(dbPassword));
 | 
					        kp_assert(results, database.CalcMasterKeyByPassword(dbPassword));
 | 
				
			||||||
        database.filename = dbPath;
 | 
					        database.file = new QFile(dbPath);
 | 
				
			||||||
	database.CryptoAlgorithmus = ALGO_TWOFISH;
 | 
							database.CryptoAlgorithmus = ALGO_TWOFISH;
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
        CGroup* main = database.addGroup(NULL);
 | 
					        CGroup* main = database.addGroup(NULL);
 | 
				
			||||||
        CGroup* child = database.addGroup(main);
 | 
					        CGroup* child = database.addGroup(main);
 | 
				
			||||||
| 
						 | 
					@ -1345,7 +1360,7 @@ bool testDatabase(){
 | 
				
			||||||
        PwDatabase cloneDatabase;
 | 
					        PwDatabase cloneDatabase;
 | 
				
			||||||
        kp_assert(results, cloneDatabase.CalcMasterKeyByPassword(dbPassword));
 | 
					        kp_assert(results, cloneDatabase.CalcMasterKeyByPassword(dbPassword));
 | 
				
			||||||
        QString err;
 | 
					        QString err;
 | 
				
			||||||
        bool loadedDB = cloneDatabase.loadDatabase(dbPath, err);
 | 
					        bool loadedDB = cloneDatabase.openDatabase(dbPath, err);
 | 
				
			||||||
        if (!loadedDB){
 | 
					        if (!loadedDB){
 | 
				
			||||||
                kp_assert(results, loadedDB);
 | 
					                kp_assert(results, loadedDB);
 | 
				
			||||||
                cout << err.ascii() << endl;
 | 
					                cout << err.ascii() << endl;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,8 +29,6 @@
 | 
				
			||||||
 #define PWM_FLAG_ARCFOUR		4
 | 
					 #define PWM_FLAG_ARCFOUR		4
 | 
				
			||||||
 #define PWM_FLAG_TWOFISH		8
 | 
					 #define PWM_FLAG_TWOFISH		8
 | 
				
			||||||
 #define PWM_STD_KEYENCROUNDS 	6000
 | 
					 #define PWM_STD_KEYENCROUNDS 	6000
 | 
				
			||||||
 #define ALGO_AES         		0
 | 
					 | 
				
			||||||
 #define ALGO_TWOFISH			1
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <qcolor.h>
 | 
					#include <qcolor.h>
 | 
				
			||||||
#include <qobject.h>
 | 
					#include <qobject.h>
 | 
				
			||||||
| 
						 | 
					@ -47,9 +45,10 @@ class PwDatabase:QObject,public Database{
 | 
				
			||||||
public:
 | 
					public:
 | 
				
			||||||
 PwDatabase();
 | 
					 PwDatabase();
 | 
				
			||||||
 ~ PwDatabase();
 | 
					 ~ PwDatabase();
 | 
				
			||||||
 bool loadDatabase(QString filename, QString& err);
 | 
					 bool openDatabase(QString filename, QString& err);
 | 
				
			||||||
 bool saveDatabase();
 | 
					 bool saveDatabase();
 | 
				
			||||||
 bool closeDatabase();
 | 
					 bool closeDatabase();
 | 
				
			||||||
 | 
					 void newDatabase();
 | 
				
			||||||
 bool CalcMasterKeyByPassword(QString& password);
 | 
					 bool CalcMasterKeyByPassword(QString& password);
 | 
				
			||||||
 bool CalcMasterKeyByFile(QString filename);
 | 
					 bool CalcMasterKeyByFile(QString filename);
 | 
				
			||||||
 bool CalcMasterKeyByFileAndPw(QString filename, QString& password);
 | 
					 bool CalcMasterKeyByFileAndPw(QString filename, QString& password);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -32,6 +32,24 @@ CAboutDialog::CAboutDialog(QWidget* parent, const char* name, bool modal, Qt::WF
 | 
				
			||||||
setupUi(this);
 | 
					setupUi(this);
 | 
				
			||||||
createBanner(Banner,Icon_Key32x32,tr("KeePassX %1").arg(KEEPASS_VERSION));
 | 
					createBanner(Banner,Icon_Key32x32,tr("KeePassX %1").arg(KEEPASS_VERSION));
 | 
				
			||||||
loadLicFromFile();
 | 
					loadLicFromFile();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QString AboutTr=tr("<b>Current Translation: None</b><br><br>","Please replace 'None' with the language of your translation");
 | 
				
			||||||
 | 
					if(TrActive){
 | 
				
			||||||
 | 
						AboutTr+=tr("<b>Author:</b> %1<br>").arg(tr("$TRANSALTION_AUTHOR"));
 | 
				
			||||||
 | 
						QString mail=tr("$TRANSLATION_AUTHOR_EMAIL","Here you can enter your email or homepage if you want.");
 | 
				
			||||||
 | 
						if(mail!=QString()){
 | 
				
			||||||
 | 
							AboutTr+=mail+"<br>";
 | 
				
			||||||
 | 
						}
 | 
				
			||||||
 | 
						AboutTr+="<br>";
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					Edit_Translation->setText(AboutTr+tr("\
 | 
				
			||||||
 | 
					Information on how to translate KeePassX can be found under:\n\
 | 
				
			||||||
 | 
					http://keepass.berlios.de/translation-howto.html"));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					QString ThanksTemplate=QString("<div style='margin-left:0px;'><b>%1</b></div><div style='margin-left:10px;'>%2</div><br><br>");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					Edit_Thanks->setText(ThanksTemplate.arg(tr("Matthias Miller")).arg(tr("http://www.outofhanwell.com/<br>Mac OS X Support")));
 | 
				
			||||||
 | 
					//Edit_Thanks->setText(Edit_Thanks->text()+ThanksTemplate.arg(tr("  ")).arg(tr("  ")));
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CAboutDialog::~CAboutDialog()
 | 
					CAboutDialog::~CAboutDialog()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -24,6 +24,8 @@
 | 
				
			||||||
#include <qspinbox.h>
 | 
					#include <qspinbox.h>
 | 
				
			||||||
#include <qcolordialog.h>
 | 
					#include <qcolordialog.h>
 | 
				
			||||||
#include <qlineedit.h>
 | 
					#include <qlineedit.h>
 | 
				
			||||||
 | 
					#include <QFileDialog>
 | 
				
			||||||
 | 
					#include <QDir>
 | 
				
			||||||
#include "SettingsDlg.h"
 | 
					#include "SettingsDlg.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -37,6 +39,7 @@ connect(ButtonColor1, SIGNAL( clicked() ), this, SLOT( OnColor1() ) );
 | 
				
			||||||
connect(ButtonColor2, SIGNAL( clicked() ), this, SLOT( OnColor2() ) );
 | 
					connect(ButtonColor2, SIGNAL( clicked() ), this, SLOT( OnColor2() ) );
 | 
				
			||||||
connect(ButtonTextColor, SIGNAL( clicked() ), this, SLOT( OnTextColor() ) );
 | 
					connect(ButtonTextColor, SIGNAL( clicked() ), this, SLOT( OnTextColor() ) );
 | 
				
			||||||
connect(CheckBox_OpenLast,SIGNAL(stateChanged(int)),this,SLOT(OnCeckBoxOpenLastChanged(int)));
 | 
					connect(CheckBox_OpenLast,SIGNAL(stateChanged(int)),this,SLOT(OnCeckBoxOpenLastChanged(int)));
 | 
				
			||||||
 | 
					connect(Button_MountDirBrowse,SIGNAL(clicked()),this,SLOT(OnMountDirBrowse()));
 | 
				
			||||||
createBanner(Banner,Icon_Settings32x32,tr("Settings"));
 | 
					createBanner(Banner,Icon_Settings32x32,tr("Settings"));
 | 
				
			||||||
CheckBox_OpenLast->setChecked(config.OpenLast);
 | 
					CheckBox_OpenLast->setChecked(config.OpenLast);
 | 
				
			||||||
SpinBox_ClipboardTime->setValue(config.ClipboardTimeOut);
 | 
					SpinBox_ClipboardTime->setValue(config.ClipboardTimeOut);
 | 
				
			||||||
| 
						 | 
					@ -142,9 +145,9 @@ if(state==Qt::Checked){
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void CSettingsDlg::OnMountDirBrowse(){
 | 
				
			||||||
/*$SPECIALIZATION$*/
 | 
					QString dir=QFileDialog::getExistingDirectory(this,tr("Select a directory..."),"/");
 | 
				
			||||||
 | 
					if(dir!=QString()){
 | 
				
			||||||
 | 
						Edit_MountDir->setText(dir);
 | 
				
			||||||
//#include "settingsdlg.moc"
 | 
					}
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -38,6 +38,7 @@ public slots:
 | 
				
			||||||
    virtual void OnColor2();
 | 
					    virtual void OnColor2();
 | 
				
			||||||
    virtual void OnColor1();
 | 
					    virtual void OnColor1();
 | 
				
			||||||
	void OnCeckBoxOpenLastChanged(int state);
 | 
						void OnCeckBoxOpenLastChanged(int state);
 | 
				
			||||||
 | 
						void OnMountDirBrowse();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
private:
 | 
					private:
 | 
				
			||||||
 QColor color1,color2,textcolor;
 | 
					 QColor color1,color2,textcolor;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -124,14 +124,14 @@
 | 
				
			||||||
    <widget class="QTextEdit" name="Edit_Thanks" >
 | 
					    <widget class="QTextEdit" name="Edit_Thanks" >
 | 
				
			||||||
     <property name="geometry" >
 | 
					     <property name="geometry" >
 | 
				
			||||||
      <rect>
 | 
					      <rect>
 | 
				
			||||||
       <x>0</x>
 | 
					       <x>3</x>
 | 
				
			||||||
       <y>0</y>
 | 
					       <y>3</y>
 | 
				
			||||||
       <width>401</width>
 | 
					       <width>390</width>
 | 
				
			||||||
       <height>171</height>
 | 
					       <height>166</height>
 | 
				
			||||||
      </rect>
 | 
					      </rect>
 | 
				
			||||||
     </property>
 | 
					     </property>
 | 
				
			||||||
     <property name="html" >
 | 
					     <property name="readOnly" >
 | 
				
			||||||
      <string><html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></string>
 | 
					      <bool>true</bool>
 | 
				
			||||||
     </property>
 | 
					     </property>
 | 
				
			||||||
    </widget>
 | 
					    </widget>
 | 
				
			||||||
   </widget>
 | 
					   </widget>
 | 
				
			||||||
| 
						 | 
					@ -142,12 +142,15 @@
 | 
				
			||||||
    <widget class="QTextEdit" name="Edit_Translation" >
 | 
					    <widget class="QTextEdit" name="Edit_Translation" >
 | 
				
			||||||
     <property name="geometry" >
 | 
					     <property name="geometry" >
 | 
				
			||||||
      <rect>
 | 
					      <rect>
 | 
				
			||||||
       <x>0</x>
 | 
					       <x>3</x>
 | 
				
			||||||
       <y>0</y>
 | 
					       <y>3</y>
 | 
				
			||||||
       <width>401</width>
 | 
					       <width>390</width>
 | 
				
			||||||
       <height>171</height>
 | 
					       <height>167</height>
 | 
				
			||||||
      </rect>
 | 
					      </rect>
 | 
				
			||||||
     </property>
 | 
					     </property>
 | 
				
			||||||
 | 
					     <property name="readOnly" >
 | 
				
			||||||
 | 
					      <bool>true</bool>
 | 
				
			||||||
 | 
					     </property>
 | 
				
			||||||
    </widget>
 | 
					    </widget>
 | 
				
			||||||
   </widget>
 | 
					   </widget>
 | 
				
			||||||
   <widget class="QWidget" name="tab_3" >
 | 
					   <widget class="QWidget" name="tab_3" >
 | 
				
			||||||
| 
						 | 
					@ -157,12 +160,15 @@
 | 
				
			||||||
    <widget class="QTextEdit" name="Edit_License" >
 | 
					    <widget class="QTextEdit" name="Edit_License" >
 | 
				
			||||||
     <property name="geometry" >
 | 
					     <property name="geometry" >
 | 
				
			||||||
      <rect>
 | 
					      <rect>
 | 
				
			||||||
       <x>0</x>
 | 
					       <x>3</x>
 | 
				
			||||||
       <y>0</y>
 | 
					       <y>3</y>
 | 
				
			||||||
       <width>401</width>
 | 
					       <width>391</width>
 | 
				
			||||||
       <height>171</height>
 | 
					       <height>167</height>
 | 
				
			||||||
      </rect>
 | 
					      </rect>
 | 
				
			||||||
     </property>
 | 
					     </property>
 | 
				
			||||||
 | 
					     <property name="readOnly" >
 | 
				
			||||||
 | 
					      <bool>true</bool>
 | 
				
			||||||
 | 
					     </property>
 | 
				
			||||||
    </widget>
 | 
					    </widget>
 | 
				
			||||||
   </widget>
 | 
					   </widget>
 | 
				
			||||||
  </widget>
 | 
					  </widget>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -104,6 +104,9 @@
 | 
				
			||||||
        <height>60</height>
 | 
					        <height>60</height>
 | 
				
			||||||
       </size>
 | 
					       </size>
 | 
				
			||||||
      </property>
 | 
					      </property>
 | 
				
			||||||
 | 
					      <property name="readOnly" >
 | 
				
			||||||
 | 
					       <bool>true</bool>
 | 
				
			||||||
 | 
					      </property>
 | 
				
			||||||
     </widget>
 | 
					     </widget>
 | 
				
			||||||
    </item>
 | 
					    </item>
 | 
				
			||||||
   </layout>
 | 
					   </layout>
 | 
				
			||||||
| 
						 | 
					@ -219,40 +222,6 @@
 | 
				
			||||||
   <addaction name="menuExtras" />
 | 
					   <addaction name="menuExtras" />
 | 
				
			||||||
   <addaction name="menuHilfe" />
 | 
					   <addaction name="menuHilfe" />
 | 
				
			||||||
  </widget>
 | 
					  </widget>
 | 
				
			||||||
  <widget class="QToolBar" name="toolBar" >
 | 
					 | 
				
			||||||
   <property name="sizePolicy" >
 | 
					 | 
				
			||||||
    <sizepolicy>
 | 
					 | 
				
			||||||
     <hsizetype>1</hsizetype>
 | 
					 | 
				
			||||||
     <vsizetype>7</vsizetype>
 | 
					 | 
				
			||||||
     <horstretch>0</horstretch>
 | 
					 | 
				
			||||||
     <verstretch>0</verstretch>
 | 
					 | 
				
			||||||
    </sizepolicy>
 | 
					 | 
				
			||||||
   </property>
 | 
					 | 
				
			||||||
   <property name="minimumSize" >
 | 
					 | 
				
			||||||
    <size>
 | 
					 | 
				
			||||||
     <width>15</width>
 | 
					 | 
				
			||||||
     <height>6</height>
 | 
					 | 
				
			||||||
    </size>
 | 
					 | 
				
			||||||
   </property>
 | 
					 | 
				
			||||||
   <property name="maximumSize" >
 | 
					 | 
				
			||||||
    <size>
 | 
					 | 
				
			||||||
     <width>16777215</width>
 | 
					 | 
				
			||||||
     <height>22</height>
 | 
					 | 
				
			||||||
    </size>
 | 
					 | 
				
			||||||
   </property>
 | 
					 | 
				
			||||||
   <property name="orientation" >
 | 
					 | 
				
			||||||
    <enum>Qt::Horizontal</enum>
 | 
					 | 
				
			||||||
   </property>
 | 
					 | 
				
			||||||
   <property name="iconSize" >
 | 
					 | 
				
			||||||
    <size>
 | 
					 | 
				
			||||||
     <width>16</width>
 | 
					 | 
				
			||||||
     <height>16</height>
 | 
					 | 
				
			||||||
    </size>
 | 
					 | 
				
			||||||
   </property>
 | 
					 | 
				
			||||||
   <attribute name="toolBarArea" >
 | 
					 | 
				
			||||||
    <number>4</number>
 | 
					 | 
				
			||||||
   </attribute>
 | 
					 | 
				
			||||||
  </widget>
 | 
					 | 
				
			||||||
  <action name="FileNewAction" >
 | 
					  <action name="FileNewAction" >
 | 
				
			||||||
   <property name="text" >
 | 
					   <property name="text" >
 | 
				
			||||||
    <string>New Database...</string>
 | 
					    <string>New Database...</string>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -72,7 +72,7 @@ for(int i=0;i<groups.length();i++){
 | 
				
			||||||
		NewEntry->Password.setString(pw,true);
 | 
							NewEntry->Password.setString(pw,true);
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
pwm->filename="";
 | 
					pwm->file=NULL;
 | 
				
			||||||
pwm->SearchGroupID=-1;
 | 
					pwm->SearchGroupID=-1;
 | 
				
			||||||
pwm->CryptoAlgorithmus=ALGO_AES;
 | 
					pwm->CryptoAlgorithmus=ALGO_AES;
 | 
				
			||||||
pwm->KeyEncRounds=6000;
 | 
					pwm->KeyEncRounds=6000;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										22
									
								
								src/main.cpp
								
								
								
								
							
							
						
						
									
										22
									
								
								src/main.cpp
								
								
								
								
							| 
						 | 
					@ -38,6 +38,7 @@ using namespace std;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CConfig config;
 | 
					CConfig config;
 | 
				
			||||||
QString  AppDir;
 | 
					QString  AppDir;
 | 
				
			||||||
 | 
					bool TrActive;
 | 
				
			||||||
QPixmap *Icon_Key32x32;
 | 
					QPixmap *Icon_Key32x32;
 | 
				
			||||||
QPixmap *Icon_Settings32x32;
 | 
					QPixmap *Icon_Settings32x32;
 | 
				
			||||||
QPixmap *Icon_Search32x32;
 | 
					QPixmap *Icon_Search32x32;
 | 
				
			||||||
| 
						 | 
					@ -62,6 +63,7 @@ QIcon *Icon_EditSearch;
 | 
				
			||||||
QIcon *Icon_Configure;
 | 
					QIcon *Icon_Configure;
 | 
				
			||||||
QIcon *Icon_Help;
 | 
					QIcon *Icon_Help;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
inline void loadImages();
 | 
					inline void loadImages();
 | 
				
			||||||
inline void parseCmdLineArgs(int argc, char** argv,QString &ArgFile,QString& ArgCfg);
 | 
					inline void parseCmdLineArgs(int argc, char** argv,QString &ArgFile,QString& ArgCfg);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -107,6 +109,7 @@ if(TrFound)
 | 
				
			||||||
else 
 | 
					else 
 | 
				
			||||||
	delete translator;
 | 
						delete translator;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TrActive=TrFound;
 | 
				
			||||||
loadImages();
 | 
					loadImages();
 | 
				
			||||||
SecString::generateSessionKey();
 | 
					SecString::generateSessionKey();
 | 
				
			||||||
int r=0;
 | 
					int r=0;
 | 
				
			||||||
| 
						 | 
					@ -196,21 +199,10 @@ if(Img.load(AppDir+"/../share/keepass/icons/"+name)==false){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifndef Q_WS_X11
 | 
					
 | 
				
			||||||
#define _loadIcon(Icon,PATH)\
 | 
					#define _loadIcon(Icon,PATH)\
 | 
				
			||||||
	{QImage img(ThemeDir+PATH);\
 | 
						Icon=new QIcon(ThemeDir+PATH);
 | 
				
			||||||
	 Icon=new QIcon();\
 | 
					
 | 
				
			||||||
	 /*Icon->addPixmap(QPixmap::fromImage(img));*/\
 | 
					 | 
				
			||||||
	 Icon->addPixmap(QPixmap::fromImage(img.scaled(16,16,Qt::IgnoreAspectRatio,Qt::SmoothTransformation)));\
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
#else
 | 
					 | 
				
			||||||
#define _loadIcon(Icon,PATH)\
 | 
					 | 
				
			||||||
	{QImage img(ThemeDir+PATH);\
 | 
					 | 
				
			||||||
	 Icon=new QIcon();\
 | 
					 | 
				
			||||||
	 Icon->addPixmap(QPixmap::fromImage(img));\
 | 
					 | 
				
			||||||
	 Icon->addPixmap(QPixmap::fromImage(img.scaled(16,16,Qt::IgnoreAspectRatio,Qt::SmoothTransformation)));\
 | 
					 | 
				
			||||||
	}
 | 
					 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
void loadImages(){
 | 
					void loadImages(){
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -246,6 +238,7 @@ Icon_Search32x32=new QPixmap;
 | 
				
			||||||
*Icon_Search32x32=tmpImg;
 | 
					*Icon_Search32x32=tmpImg;
 | 
				
			||||||
//--------------------------
 | 
					//--------------------------
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
_loadIcon(Icon_FileNew,"/actions/filenew.png");
 | 
					_loadIcon(Icon_FileNew,"/actions/filenew.png");
 | 
				
			||||||
_loadIcon(Icon_FileOpen,"/actions/fileopen.png");
 | 
					_loadIcon(Icon_FileOpen,"/actions/fileopen.png");
 | 
				
			||||||
_loadIcon(Icon_FileSave,"/actions/filesave.png");
 | 
					_loadIcon(Icon_FileSave,"/actions/filesave.png");
 | 
				
			||||||
| 
						 | 
					@ -262,6 +255,7 @@ _loadIcon(Icon_EditOpenUrl,"/actions/run.png");
 | 
				
			||||||
_loadIcon(Icon_EditSearch,"/actions/find.png");
 | 
					_loadIcon(Icon_EditSearch,"/actions/find.png");
 | 
				
			||||||
_loadIcon(Icon_Configure,"/actions/configure.png");
 | 
					_loadIcon(Icon_Configure,"/actions/configure.png");
 | 
				
			||||||
_loadIcon(Icon_Help,"/actions/help.png");
 | 
					_loadIcon(Icon_Help,"/actions/help.png");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -39,6 +39,7 @@ void showErrMsg(const QString& msg,QWidget* parent=NULL);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
extern CConfig  config;
 | 
					extern CConfig  config;
 | 
				
			||||||
extern QString  AppDir;
 | 
					extern QString  AppDir;
 | 
				
			||||||
 | 
					extern bool TrActive;
 | 
				
			||||||
extern QPixmap *EntryIcons;
 | 
					extern QPixmap *EntryIcons;
 | 
				
			||||||
extern QPixmap *Icon_Key32x32;
 | 
					extern QPixmap *Icon_Key32x32;
 | 
				
			||||||
extern QPixmap *Icon_Settings32x32;
 | 
					extern QPixmap *Icon_Settings32x32;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -63,8 +63,6 @@ KeepassMainWindow::KeepassMainWindow(QWidget *parent, Qt::WFlags flags):QMainWin
 | 
				
			||||||
  setupUi(this);
 | 
					  setupUi(this);
 | 
				
			||||||
  setGeometry(geometry().x(),geometry().y(),config.MainWinWidth,config.MainWinHeight);
 | 
					  setGeometry(geometry().x(),geometry().y(),config.MainWinWidth,config.MainWinHeight);
 | 
				
			||||||
  splitter->setSizes(QList<int>() << config.MainWinSplit1 << config.MainWinSplit2);
 | 
					  splitter->setSizes(QList<int>() << config.MainWinSplit1 << config.MainWinSplit2);
 | 
				
			||||||
  QuickSearchEdit=new QLineEdit(toolBar);
 | 
					 | 
				
			||||||
  QuickSearchEdit->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
 | 
					 | 
				
			||||||
  setupIcons();
 | 
					  setupIcons();
 | 
				
			||||||
  setupToolbar();
 | 
					  setupToolbar();
 | 
				
			||||||
  setStateFileOpen(false);
 | 
					  setStateFileOpen(false);
 | 
				
			||||||
| 
						 | 
					@ -75,6 +73,7 @@ KeepassMainWindow::KeepassMainWindow(QWidget *parent, Qt::WFlags flags):QMainWin
 | 
				
			||||||
  statusBar()->addWidget(StatusBarGeneral,15);
 | 
					  statusBar()->addWidget(StatusBarGeneral,15);
 | 
				
			||||||
  statusBar()->addWidget(StatusBarSelection,85);
 | 
					  statusBar()->addWidget(StatusBarSelection,85);
 | 
				
			||||||
  statusBar()->setVisible(config.ShowStatusbar);
 | 
					  statusBar()->setVisible(config.ShowStatusbar);
 | 
				
			||||||
 | 
					  CGroup::UI_ExpandByDefault=config.ExpandGroupTree;
 | 
				
			||||||
  setupConnections();
 | 
					  setupConnections();
 | 
				
			||||||
  FileOpen=false;
 | 
					  FileOpen=false;
 | 
				
			||||||
  Clipboard=QApplication::clipboard();
 | 
					  Clipboard=QApplication::clipboard();
 | 
				
			||||||
| 
						 | 
					@ -138,6 +137,8 @@ void KeepassMainWindow::setupConnections(){
 | 
				
			||||||
   connect(&ClipboardTimer, SIGNAL(timeout()), this, SLOT(OnClipboardTimeOut()));
 | 
					   connect(&ClipboardTimer, SIGNAL(timeout()), this, SLOT(OnClipboardTimeOut()));
 | 
				
			||||||
   connect(GroupView,SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),this,
 | 
					   connect(GroupView,SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),this,
 | 
				
			||||||
		   SLOT(OnCurrentGroupChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
 | 
							   SLOT(OnCurrentGroupChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
 | 
				
			||||||
 | 
					   connect(GroupView,SIGNAL(itemExpanded(QTreeWidgetItem*)),this,SLOT(OnItemExpanded(QTreeWidgetItem*)));
 | 
				
			||||||
 | 
					   connect(GroupView,SIGNAL(itemCollapsed(QTreeWidgetItem*)),this,SLOT(OnItemCollaped(QTreeWidgetItem*)));
 | 
				
			||||||
   connect(EntryView,SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),this,
 | 
					   connect(EntryView,SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),this,
 | 
				
			||||||
		   SLOT(OnEntryItemDoubleClicked(QTreeWidgetItem*,int)));
 | 
							   SLOT(OnEntryItemDoubleClicked(QTreeWidgetItem*,int)));
 | 
				
			||||||
   connect(EntryView,SIGNAL(itemSelectionChanged()), this, SLOT(OnEntrySelectionChanged()));
 | 
					   connect(EntryView,SIGNAL(itemSelectionChanged()), this, SLOT(OnEntrySelectionChanged()));
 | 
				
			||||||
| 
						 | 
					@ -148,6 +149,9 @@ void KeepassMainWindow::setupConnections(){
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void KeepassMainWindow::setupToolbar(){
 | 
					void KeepassMainWindow::setupToolbar(){
 | 
				
			||||||
 | 
					  toolBar=new QToolBar(this);
 | 
				
			||||||
 | 
					  addToolBar(toolBar);
 | 
				
			||||||
 | 
					  toolBar->setIconSize(QSize(16,16));
 | 
				
			||||||
  toolBar->addAction(FileNewAction);
 | 
					  toolBar->addAction(FileNewAction);
 | 
				
			||||||
  toolBar->addAction(FileOpenAction);
 | 
					  toolBar->addAction(FileOpenAction);
 | 
				
			||||||
  toolBar->addAction(FileSaveAction);
 | 
					  toolBar->addAction(FileSaveAction);
 | 
				
			||||||
| 
						 | 
					@ -159,6 +163,8 @@ void KeepassMainWindow::setupToolbar(){
 | 
				
			||||||
  toolBar->addAction(EditPasswordToClipboardAction);
 | 
					  toolBar->addAction(EditPasswordToClipboardAction);
 | 
				
			||||||
  toolBar->addAction(EditUsernameToClipboardAction);
 | 
					  toolBar->addAction(EditUsernameToClipboardAction);
 | 
				
			||||||
  toolBar->addSeparator();
 | 
					  toolBar->addSeparator();
 | 
				
			||||||
 | 
					  QuickSearchEdit=new QLineEdit(toolBar);
 | 
				
			||||||
 | 
					  QuickSearchEdit->setSizePolicy(QSizePolicy::Fixed,QSizePolicy::Fixed);
 | 
				
			||||||
  toolBar->addWidget(QuickSearchEdit);
 | 
					  toolBar->addWidget(QuickSearchEdit);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -261,7 +267,7 @@ if(PasswordDlg.password!="" && PasswordDlg.keyfile!="")
 | 
				
			||||||
	db->CalcMasterKeyByFileAndPw(PasswordDlg.keyfile,PasswordDlg.password);
 | 
						db->CalcMasterKeyByFileAndPw(PasswordDlg.keyfile,PasswordDlg.password);
 | 
				
			||||||
QString err;
 | 
					QString err;
 | 
				
			||||||
StatusBarGeneral->setText(tr("Loading Database..."));
 | 
					StatusBarGeneral->setText(tr("Loading Database..."));
 | 
				
			||||||
if(db->loadDatabase(filename,err)==true){
 | 
					if(db->openDatabase(filename,err)==true){
 | 
				
			||||||
//SUCCESS
 | 
					//SUCCESS
 | 
				
			||||||
if(config.OpenLast)config.LastFile=filename;
 | 
					if(config.OpenLast)config.LastFile=filename;
 | 
				
			||||||
setCaption(tr("Keepass - %1").arg(filename));
 | 
					setCaption(tr("Keepass - %1").arg(filename));
 | 
				
			||||||
| 
						 | 
					@ -274,7 +280,7 @@ else{
 | 
				
			||||||
//ERROR
 | 
					//ERROR
 | 
				
			||||||
delete db;
 | 
					delete db;
 | 
				
			||||||
StatusBarGeneral->setText(tr("Loading Failed"));
 | 
					StatusBarGeneral->setText(tr("Loading Failed"));
 | 
				
			||||||
if(err=="")err=tr("Unknown error in PwDatabase::loadDatabase()");
 | 
					if(err=="")err=tr("Unknown error in PwDatabase::openDatabase()");
 | 
				
			||||||
QMessageBox::critical(this,tr("Error")
 | 
					QMessageBox::critical(this,tr("Error")
 | 
				
			||||||
						  ,tr("The following error occured while opening the database:\n%1")
 | 
											  ,tr("The following error occured while opening the database:\n%1")
 | 
				
			||||||
				 		  .arg(err),tr("OK"));
 | 
									 		  .arg(err),tr("OK"));
 | 
				
			||||||
| 
						 | 
					@ -315,6 +321,7 @@ CPasswordDialog dlg(this,"PasswordDlg",true,false,true);
 | 
				
			||||||
dlg.setCaption("New Database");
 | 
					dlg.setCaption("New Database");
 | 
				
			||||||
db=new PwDatabase();
 | 
					db=new PwDatabase();
 | 
				
			||||||
if(dlg.exec()==1){
 | 
					if(dlg.exec()==1){
 | 
				
			||||||
 | 
						db->newDatabase();
 | 
				
			||||||
	if(dlg.KeyType==BOTH || dlg.KeyType==KEYFILE){
 | 
						if(dlg.KeyType==BOTH || dlg.KeyType==KEYFILE){
 | 
				
			||||||
		if(!db->createKeyFile(dlg.keyfile)){
 | 
							if(!db->createKeyFile(dlg.keyfile)){
 | 
				
			||||||
			QMessageBox::warning(this,tr("Error"),tr("Could not create key file. The following error occured:\n%1").arg(db->getError()),tr("OK"),"","",0,0);
 | 
								QMessageBox::warning(this,tr("Error"),tr("Could not create key file. The following error occured:\n%1").arg(db->getError()),tr("OK"),"","",0,0);
 | 
				
			||||||
| 
						 | 
					@ -344,7 +351,7 @@ void KeepassMainWindow::OnFileOpen(){
 | 
				
			||||||
if(FileOpen)
 | 
					if(FileOpen)
 | 
				
			||||||
 if(!closeDatabase())return;
 | 
					 if(!closeDatabase())return;
 | 
				
			||||||
QString filename=QFileDialog::getOpenFileName(this,tr("Open Database..."),QDir::homePath(),"*.kdb");
 | 
					QString filename=QFileDialog::getOpenFileName(this,tr("Open Database..."),QDir::homePath(),"*.kdb");
 | 
				
			||||||
if(filename!=QString::null){
 | 
					if(filename!=QString()){
 | 
				
			||||||
 openDatabase(filename);
 | 
					 openDatabase(filename);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -540,7 +547,7 @@ else Q_ASSERT(false);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
bool KeepassMainWindow::OnFileSave(){
 | 
					bool KeepassMainWindow::OnFileSave(){
 | 
				
			||||||
if(db->filename==QString())
 | 
					if(db->file->fileName()==QString())
 | 
				
			||||||
 return OnFileSaveAs();
 | 
					 return OnFileSaveAs();
 | 
				
			||||||
if(db->saveDatabase())
 | 
					if(db->saveDatabase())
 | 
				
			||||||
  setStateFileModified(false);
 | 
					  setStateFileModified(false);
 | 
				
			||||||
| 
						 | 
					@ -554,8 +561,11 @@ return true;
 | 
				
			||||||
bool KeepassMainWindow::OnFileSaveAs(){
 | 
					bool KeepassMainWindow::OnFileSaveAs(){
 | 
				
			||||||
QString filename=QFileDialog::getSaveFileName(this,tr("Save Database As..."),QDir::homePath(),"*.kdb"); 
 | 
					QString filename=QFileDialog::getSaveFileName(this,tr("Save Database As..."),QDir::homePath(),"*.kdb"); 
 | 
				
			||||||
if(filename==QString()) return false;
 | 
					if(filename==QString()) return false;
 | 
				
			||||||
db->filename=filename;
 | 
					Q_ASSERT(db->file);
 | 
				
			||||||
setCaption(tr("KeePassX - %1").arg(db->filename));
 | 
					if(db->file->isOpen()) db->file->close();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					db->file->setFileName(filename);
 | 
				
			||||||
 | 
					setCaption(tr("KeePassX - %1").arg(filename));
 | 
				
			||||||
return OnFileSave();
 | 
					return OnFileSave();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -566,7 +576,7 @@ if(dlg.exec())setStateFileModified(true);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void KeepassMainWindow::OnFileChangeKey(){
 | 
					void KeepassMainWindow::OnFileChangeKey(){
 | 
				
			||||||
CPasswordDialog dlg(this,"PasswordDlg",true,false,true);
 | 
					CPasswordDialog dlg(this,"PasswordDlg",true,false,true);
 | 
				
			||||||
dlg.setCaption(db->filename);
 | 
					dlg.setCaption(db->file->fileName());
 | 
				
			||||||
if(dlg.exec()==1){
 | 
					if(dlg.exec()==1){
 | 
				
			||||||
	if(dlg.KeyType==BOTH || dlg.KeyType==KEYFILE){
 | 
						if(dlg.KeyType==BOTH || dlg.KeyType==KEYFILE){
 | 
				
			||||||
		if(!db->createKeyFile(dlg.keyfile)){
 | 
							if(!db->createKeyFile(dlg.keyfile)){
 | 
				
			||||||
| 
						 | 
					@ -810,10 +820,8 @@ for(int i=0; i<SearchResults.size();i++){
 | 
				
			||||||
	return;
 | 
						return;
 | 
				
			||||||
 }
 | 
					 }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 | 
				
			||||||
void KeepassMainWindow::OnEditUsernameToClipboard(){
 | 
					void KeepassMainWindow::OnEditUsernameToClipboard(){
 | 
				
			||||||
Clipboard->setText(currentEntry()->UserName,  QClipboard::Clipboard);
 | 
					Clipboard->setText(currentEntry()->UserName,  QClipboard::Clipboard);
 | 
				
			||||||
ClipboardTimer.start(config.ClipboardTimeOut*1000,true);
 | 
					ClipboardTimer.start(config.ClipboardTimeOut*1000,true);
 | 
				
			||||||
| 
						 | 
					@ -932,6 +940,7 @@ void KeepassMainWindow::OnExtrasSettings(){
 | 
				
			||||||
CSettingsDlg dlg(this,"SettingsDlg");
 | 
					CSettingsDlg dlg(this,"SettingsDlg");
 | 
				
			||||||
dlg.exec();
 | 
					dlg.exec();
 | 
				
			||||||
EntryView->setAlternatingRowColors(config.AlternatingRowColors);
 | 
					EntryView->setAlternatingRowColors(config.AlternatingRowColors);
 | 
				
			||||||
 | 
					CGroup::UI_ExpandByDefault=config.ExpandGroupTree;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void KeepassMainWindow::OnHelpAbout(){
 | 
					void KeepassMainWindow::OnHelpAbout(){
 | 
				
			||||||
| 
						 | 
					@ -948,3 +957,12 @@ void KeepassMainWindow::OnViewShowEntryDetails(bool show){
 | 
				
			||||||
config.EntryDetails=show;
 | 
					config.EntryDetails=show;
 | 
				
			||||||
DetailView->setVisible(config.EntryDetails);
 | 
					DetailView->setVisible(config.EntryDetails);
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void KeepassMainWindow::OnItemExpanded(QTreeWidgetItem* item){
 | 
				
			||||||
 | 
					((GroupViewItem*)item)->pGroup->UI_ItemIsExpanded=true;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					void KeepassMainWindow::OnItemCollaped(QTreeWidgetItem* item){
 | 
				
			||||||
 | 
					((GroupViewItem*)item)->pGroup->UI_ItemIsExpanded=false;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -90,6 +90,8 @@ private slots:
 | 
				
			||||||
   void OnFileModified();
 | 
					   void OnFileModified();
 | 
				
			||||||
   void OnExtrasSettings();
 | 
					   void OnExtrasSettings();
 | 
				
			||||||
   void OnHelpAbout();
 | 
					   void OnHelpAbout();
 | 
				
			||||||
 | 
					   void OnItemExpanded(QTreeWidgetItem*);
 | 
				
			||||||
 | 
					   void OnItemCollaped(QTreeWidgetItem*);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
private:
 | 
					private:
 | 
				
			||||||
 enum SelectionState{NONE,SINGLE,MULTIPLE,SEARCHGROUP};
 | 
					 enum SelectionState{NONE,SINGLE,MULTIPLE,SEARCHGROUP};
 | 
				
			||||||
| 
						 | 
					@ -118,6 +120,7 @@ private:
 | 
				
			||||||
 QLineEdit* QuickSearchEdit;
 | 
					 QLineEdit* QuickSearchEdit;
 | 
				
			||||||
 QLabel* StatusBarGeneral;
 | 
					 QLabel* StatusBarGeneral;
 | 
				
			||||||
 QLabel* StatusBarSelection;
 | 
					 QLabel* StatusBarSelection;
 | 
				
			||||||
 | 
					 QToolBar* toolBar;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
protected:
 | 
					protected:
 | 
				
			||||||
 void closeEvent(QCloseEvent* event);
 | 
					 void closeEvent(QCloseEvent* event);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,11 @@
 | 
				
			||||||
<!DOCTYPE TS><TS>
 | 
					<!DOCTYPE TS><TS>
 | 
				
			||||||
 | 
					<context>
 | 
				
			||||||
 | 
					    <name></name>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Could not open file (FileError=%1)</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>AboutDlg</name>
 | 
					    <name>AboutDlg</name>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
| 
						 | 
					@ -31,7 +38,7 @@
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source><html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></source>
 | 
					        <source><html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></source>
 | 
				
			||||||
        <translation><html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></translation>
 | 
					        <translation type="obsolete"><html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Translation</source>
 | 
					        <source>Translation</source>
 | 
				
			||||||
| 
						 | 
					@ -74,62 +81,40 @@
 | 
				
			||||||
        <source>http://keepass.berlios.de/index.php</source>
 | 
					        <source>http://keepass.berlios.de/index.php</source>
 | 
				
			||||||
        <translation>http://keepass.berlios.de/index.php</translation>
 | 
					        <translation>http://keepass.berlios.de/index.php</translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source><b>Current Translation: None</b><br><br></source>
 | 
				
			||||||
 | 
					        <comment>Please replace 'None' with the language of your translation</comment>
 | 
				
			||||||
 | 
					        <translation><b>Aktuelle Übersetzung: Deutsch</b><br><br></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source><b>Author:</b> %1<br></source>
 | 
				
			||||||
 | 
					        <translation><b>Autor:</b> %1<br></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>$TRANSALTION_AUTHOR</source>
 | 
				
			||||||
 | 
					        <translation>Tarek Saidi</translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>$TRANSLATION_AUTHOR_EMAIL</source>
 | 
				
			||||||
 | 
					        <comment>Here you can enter your email or homepage if you want.</comment>
 | 
				
			||||||
 | 
					        <translation>tarek.saidi@arcor.de</translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Information on how to translate KeePassX can be found under:
 | 
				
			||||||
 | 
					http://keepass.berlios.de/translation-howto.html</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished">Informationen wie Sie eine Übersetztung für KeePassX machen können finden Sie unter:
 | 
				
			||||||
 | 
					http://keepass.berlios.de/translation-howto.html</translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>CChangeKeyDlg</name>
 | 
					    <name>CChangeKeyDlg</name>
 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Change Master Key</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Error</source>
 | 
					        <source>Error</source>
 | 
				
			||||||
        <translation type="unfinished">Fehler</translation>
 | 
					        <translation type="obsolete">Fehler</translation>
 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Please enter a password.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>OK</source>
 | 
					        <source>OK</source>
 | 
				
			||||||
        <translation type="unfinished">OK</translation>
 | 
					        <translation type="obsolete">OK</translation>
 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Please choose a key file.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Please select a key file or enter a password.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Overwrite?</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>A file with this name already exists.
 | 
					 | 
				
			||||||
Do you want to replace it?</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Could not open key file for writing.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Key file could not be written.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Password and password repetition are not equal.
 | 
					 | 
				
			||||||
Please check your input.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Open key file</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Choose Directory</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
| 
						 | 
					@ -266,28 +251,10 @@ Are you sure?</source>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>CPasswordDialog</name>
 | 
					    <name>CPasswordDialog</name>
 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>No key file found</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>No key file could be found in the chosen directory.
 | 
					 | 
				
			||||||
Make sure that the volume is mounted correctly.
 | 
					 | 
				
			||||||
Please use the manual file selection for key files with a filename other than 'pwsafe.key'.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>OK</source>
 | 
					        <source>OK</source>
 | 
				
			||||||
        <translation type="unfinished">OK</translation>
 | 
					        <translation type="unfinished">OK</translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Browse...</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Open Key File</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Error</source>
 | 
					        <source>Error</source>
 | 
				
			||||||
        <translation type="unfinished">Fehler</translation>
 | 
					        <translation type="unfinished">Fehler</translation>
 | 
				
			||||||
| 
						 | 
					@ -305,15 +272,86 @@ Please use the manual file selection for key files with a filename other than &a
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Open Database</source>
 | 
					        <source>Database Key</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Select File Manually...</source>
 | 
					        <source>Select a Key File</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>< none ></source>
 | 
					        <source>*.key</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Unexpected Error: File does not exist.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The selected key file or directory does not exist.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The selected key file or directory is not readable
 | 
				
			||||||
 | 
					.Please check your permissions.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The given directory does not contain any key files.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The given directory contains more then one key file.
 | 
				
			||||||
 | 
					Please specify the key file directly.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The key file found in the given directory is not readable.
 | 
				
			||||||
 | 
					Please check your permissions.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Key file could not be found.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Key file is not readable.
 | 
				
			||||||
 | 
					Please check your permissions.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Warning</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Password an password repetition are not equal.
 | 
				
			||||||
 | 
					Please check your input.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Please enter a password or select a key file.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>A file with the name 'pwsafe.key' already exisits in the given directory.
 | 
				
			||||||
 | 
					Do you want to replace it?</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Yes</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>No</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The exisiting file is not writable.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>A file with the this name already exisits.
 | 
				
			||||||
 | 
					Do you want to replace it?</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
| 
						 | 
					@ -342,63 +380,8 @@ Please use the manual file selection for key files with a filename other than &a
 | 
				
			||||||
        <source>Settings</source>
 | 
					        <source>Settings</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					 | 
				
			||||||
<context>
 | 
					 | 
				
			||||||
    <name>ChangeKeyDialog</name>
 | 
					 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Change Master Key</source>
 | 
					        <source>Select a directory...</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Key</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Use password AND key file</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Key file or directory:</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Password Repetition:</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Password:</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>...</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>&Browse...</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Alt+B</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Enter a Password and/or choose a key file.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>&Cancel</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Alt+C</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>O&K</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Alt+K</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
| 
						 | 
					@ -673,6 +656,10 @@ Please use the manual file selection for key files with a filename other than &a
 | 
				
			||||||
        <source>Attachment</source>
 | 
					        <source>Attachment</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>%1 items</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>KeepassGroupView</name>
 | 
					    <name>KeepassGroupView</name>
 | 
				
			||||||
| 
						 | 
					@ -834,6 +821,35 @@ to save the changes?</source>
 | 
				
			||||||
        <source>Open Database...</source>
 | 
					        <source>Open Database...</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Loading Database...</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Loading Failed</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Could not create key file. The following error occured:
 | 
				
			||||||
 | 
					%1</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Export To...</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>KeePassX [new]</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Unknown error in Import_PwManager::importFile()()</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Unknown error in Import_KWalletXml::importFile()</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>MainWindow</name>
 | 
					    <name>MainWindow</name>
 | 
				
			||||||
| 
						 | 
					@ -1029,6 +1045,18 @@ to save the changes?</source>
 | 
				
			||||||
        <source>Show Statusbar</source>
 | 
					        <source>Show Statusbar</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Export to...</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>KeePassX Handbook...</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Plain Text (*.txt)</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>PasswordDlg</name>
 | 
					    <name>PasswordDlg</name>
 | 
				
			||||||
| 
						 | 
					@ -1076,6 +1104,14 @@ to save the changes?</source>
 | 
				
			||||||
        <source>Use Password AND Key File</source>
 | 
					        <source>Use Password AND Key File</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Exit</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Password Repet.:</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>PwDatabase</name>
 | 
					    <name>PwDatabase</name>
 | 
				
			||||||
| 
						 | 
					@ -1105,11 +1141,6 @@ to save the changes?</source>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Decryption failed.
 | 
					        <source>Decryption failed.
 | 
				
			||||||
The key is wrong or the file is damaged</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Hash test failed.
 | 
					 | 
				
			||||||
The key is wrong or the file is damaged</source>
 | 
					The key is wrong or the file is damaged</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
| 
						 | 
					@ -1133,6 +1164,19 @@ The key is wrong or the file is damaged</source>
 | 
				
			||||||
        <source>Unexpected error: Offset is out of range. [E3]</source>
 | 
					        <source>Unexpected error: Offset is out of range. [E3]</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Hash test failed.
 | 
				
			||||||
 | 
					The key is wrong or the file is damaged.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Could not open key file.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Key file could not be written.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>QObject</name>
 | 
					    <name>QObject</name>
 | 
				
			||||||
| 
						 | 
					@ -1348,10 +1392,6 @@ Make sure you have write access to '~/.keepass'.</source>
 | 
				
			||||||
        <source>&Cancel</source>
 | 
					        <source>&Cancel</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Securi&try</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Clear clipboard after:</source>
 | 
					        <source>Clear clipboard after:</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
| 
						 | 
					@ -1416,6 +1456,26 @@ Make sure you have write access to '~/.keepass'.</source>
 | 
				
			||||||
        <source>Browser Command:</source>
 | 
					        <source>Browser Command:</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Securi&ty</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Alternating Row Colors</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Browse...</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Media Directory:</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Remember last key type and location</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>SimplePasswordDialog</name>
 | 
					    <name>SimplePasswordDialog</name>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,4 +1,11 @@
 | 
				
			||||||
<!DOCTYPE TS><TS>
 | 
					<!DOCTYPE TS><TS>
 | 
				
			||||||
 | 
					<context>
 | 
				
			||||||
 | 
					    <name></name>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Could not open file (FileError=%1)</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>AboutDlg</name>
 | 
					    <name>AboutDlg</name>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
| 
						 | 
					@ -29,10 +36,6 @@
 | 
				
			||||||
        <source>License</source>
 | 
					        <source>License</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source><html><head><meta name="qrichtext" content="1" /></head><body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"><p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html></source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Translation</source>
 | 
					        <source>Translation</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
| 
						 | 
					@ -73,63 +76,32 @@
 | 
				
			||||||
        <source>http://keepass.berlios.de/index.php</source>
 | 
					        <source>http://keepass.berlios.de/index.php</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source><b>Current Translation: None</b><br><br></source>
 | 
				
			||||||
 | 
					        <comment>Please replace 'None' with the language of your translation</comment>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source><b>Author:</b> %1<br></source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>$TRANSALTION_AUTHOR</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>$TRANSLATION_AUTHOR_EMAIL</source>
 | 
				
			||||||
 | 
					        <comment>Here you can enter your email or homepage if you want.</comment>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Information on how to translate KeePassX can be found under:
 | 
				
			||||||
 | 
					http://keepass.berlios.de/translation-howto.html</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>CChangeKeyDlg</name>
 | 
					    <name>CChangeKeyDlg</name>
 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Change Master Key</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Error</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Please enter a password.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>OK</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Please choose a key file.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Please select a key file or enter a password.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Overwrite?</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>A file with this name already exists.
 | 
					 | 
				
			||||||
Do you want to replace it?</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Could not open key file for writing.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Key file could not be written.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Password and password repetition are not equal.
 | 
					 | 
				
			||||||
Please check your input.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Open key file</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Choose Directory</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>CDbSettingsDlg</name>
 | 
					    <name>CDbSettingsDlg</name>
 | 
				
			||||||
| 
						 | 
					@ -265,28 +237,10 @@ Are you sure?</source>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>CPasswordDialog</name>
 | 
					    <name>CPasswordDialog</name>
 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>No key file found</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>No key file could be found in the chosen directory.
 | 
					 | 
				
			||||||
Make sure that the volume is mounted correctly.
 | 
					 | 
				
			||||||
Please use the manual file selection for key files with a filename other than 'pwsafe.key'.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>OK</source>
 | 
					        <source>OK</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Browse...</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Open Key File</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Error</source>
 | 
					        <source>Error</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
| 
						 | 
					@ -304,15 +258,86 @@ Please use the manual file selection for key files with a filename other than &a
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Open Database</source>
 | 
					        <source>Database Key</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Select File Manually...</source>
 | 
					        <source>Select a Key File</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>< none ></source>
 | 
					        <source>*.key</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Unexpected Error: File does not exist.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The selected key file or directory does not exist.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The selected key file or directory is not readable
 | 
				
			||||||
 | 
					.Please check your permissions.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The given directory does not contain any key files.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The given directory contains more then one key file.
 | 
				
			||||||
 | 
					Please specify the key file directly.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The key file found in the given directory is not readable.
 | 
				
			||||||
 | 
					Please check your permissions.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Key file could not be found.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Key file is not readable.
 | 
				
			||||||
 | 
					Please check your permissions.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Warning</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Password an password repetition are not equal.
 | 
				
			||||||
 | 
					Please check your input.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Please enter a password or select a key file.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>A file with the name 'pwsafe.key' already exisits in the given directory.
 | 
				
			||||||
 | 
					Do you want to replace it?</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Yes</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>No</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>The exisiting file is not writable.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>A file with the this name already exisits.
 | 
				
			||||||
 | 
					Do you want to replace it?</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
| 
						 | 
					@ -341,65 +366,13 @@ Please use the manual file selection for key files with a filename other than &a
 | 
				
			||||||
        <source>Settings</source>
 | 
					        <source>Settings</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Select a directory...</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>ChangeKeyDialog</name>
 | 
					    <name>ChangeKeyDialog</name>
 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Change Master Key</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Key</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Use password AND key file</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Key file or directory:</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Password Repetition:</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Password:</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>...</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>&Browse...</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Alt+B</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Enter a Password and/or choose a key file.</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>&Cancel</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Alt+C</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>O&K</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Alt+K</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>EditEntryDialog</name>
 | 
					    <name>EditEntryDialog</name>
 | 
				
			||||||
| 
						 | 
					@ -672,6 +645,10 @@ Please use the manual file selection for key files with a filename other than &a
 | 
				
			||||||
        <source>Attachment</source>
 | 
					        <source>Attachment</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>%1 items</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>KeepassGroupView</name>
 | 
					    <name>KeepassGroupView</name>
 | 
				
			||||||
| 
						 | 
					@ -833,6 +810,35 @@ to save the changes?</source>
 | 
				
			||||||
        <source>Open Database...</source>
 | 
					        <source>Open Database...</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Loading Database...</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Loading Failed</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Could not create key file. The following error occured:
 | 
				
			||||||
 | 
					%1</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Export To...</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>KeePassX [new]</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Unknown error in Import_PwManager::importFile()()</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Unknown error in Import_KWalletXml::importFile()</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>MainWindow</name>
 | 
					    <name>MainWindow</name>
 | 
				
			||||||
| 
						 | 
					@ -1028,6 +1034,18 @@ to save the changes?</source>
 | 
				
			||||||
        <source>Show Statusbar</source>
 | 
					        <source>Show Statusbar</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Export to...</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>KeePassX Handbook...</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Plain Text (*.txt)</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>PasswordDlg</name>
 | 
					    <name>PasswordDlg</name>
 | 
				
			||||||
| 
						 | 
					@ -1075,6 +1093,14 @@ to save the changes?</source>
 | 
				
			||||||
        <source>Use Password AND Key File</source>
 | 
					        <source>Use Password AND Key File</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Exit</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Password Repet.:</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>PwDatabase</name>
 | 
					    <name>PwDatabase</name>
 | 
				
			||||||
| 
						 | 
					@ -1104,11 +1130,6 @@ to save the changes?</source>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Decryption failed.
 | 
					        <source>Decryption failed.
 | 
				
			||||||
The key is wrong or the file is damaged</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Hash test failed.
 | 
					 | 
				
			||||||
The key is wrong or the file is damaged</source>
 | 
					The key is wrong or the file is damaged</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
| 
						 | 
					@ -1132,6 +1153,19 @@ The key is wrong or the file is damaged</source>
 | 
				
			||||||
        <source>Unexpected error: Offset is out of range. [E3]</source>
 | 
					        <source>Unexpected error: Offset is out of range. [E3]</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Hash test failed.
 | 
				
			||||||
 | 
					The key is wrong or the file is damaged.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Could not open key file.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Key file could not be written.</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>QObject</name>
 | 
					    <name>QObject</name>
 | 
				
			||||||
| 
						 | 
					@ -1347,10 +1381,6 @@ Make sure you have write access to '~/.keepass'.</source>
 | 
				
			||||||
        <source>&Cancel</source>
 | 
					        <source>&Cancel</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
    <message>
 | 
					 | 
				
			||||||
        <source>Securi&try</source>
 | 
					 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					 | 
				
			||||||
    </message>
 | 
					 | 
				
			||||||
    <message>
 | 
					    <message>
 | 
				
			||||||
        <source>Clear clipboard after:</source>
 | 
					        <source>Clear clipboard after:</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
| 
						 | 
					@ -1415,6 +1445,26 @@ Make sure you have write access to '~/.keepass'.</source>
 | 
				
			||||||
        <source>Browser Command:</source>
 | 
					        <source>Browser Command:</source>
 | 
				
			||||||
        <translation type="unfinished"></translation>
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
    </message>
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Securi&ty</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Alternating Row Colors</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Browse...</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Media Directory:</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
 | 
					    <message>
 | 
				
			||||||
 | 
					        <source>Remember last key type and location</source>
 | 
				
			||||||
 | 
					        <translation type="unfinished"></translation>
 | 
				
			||||||
 | 
					    </message>
 | 
				
			||||||
</context>
 | 
					</context>
 | 
				
			||||||
<context>
 | 
					<context>
 | 
				
			||||||
    <name>SimplePasswordDialog</name>
 | 
					    <name>SimplePasswordDialog</name>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue