Changed Src Language to English

git-svn-id: https://svn.code.sf.net/p/keepassx/code/trunk@52 b624d157-de02-0410-bad0-e51aec6abb33

share/keepass/license.html

@@ -0,0 +1,339 @@
+<pre>&nbsp;                        GNU GENERAL PUBLIC LICENSE
+                           Version 2, June 1991
+
+     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+                           51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     Everyone is permitted to copy and distribute verbatim copies
+     of this license document, but changing it is not allowed.
+
+                                Preamble
+
+      The licenses for most software are designed to take away your
+    freedom to share and change it. By contrast, the GNU General Public
+    License is intended to guarantee your freedom to share and change free
+    software--to make sure the software is free for all its users. This
+    General Public License applies to most of the Free Software
+    Foundation's software and to any other program whose authors commit to
+    using it. (Some other Free Software Foundation software is covered by
+    the GNU Library General Public License instead.)  You can apply it to
+    your programs, too.
+
+      When we speak of free software, we are referring to freedom, not
+    price. Our General Public Licenses are designed to make sure that you
+    have the freedom to distribute copies of free software (and charge for
+    this service if you wish), that you receive source code or can get it
+    if you want it, that you can change the software or use pieces of it
+    in new free programs; and that you know you can do these things.
+
+      To protect your rights, we need to make restrictions that forbid
+    anyone to deny you these rights or to ask you to surrender the rights.
+    These restrictions translate to certain responsibilities for you if you
+    distribute copies of the software, or if you modify it.
+
+      For example, if you distribute copies of such a program, whether
+    gratis or for a fee, you must give the recipients all the rights that
+    you have. You must make sure that they, too, receive or can get the
+    source code. And you must show them these terms so they know their
+    rights.
+
+      We protect your rights with two steps: (1) copyright the software, and
+    (2) offer you this license which gives you legal permission to copy,
+    distribute and/or modify the software.
+
+      Also, for each author's protection and ours, we want to make certain
+    that everyone understands that there is no warranty for this free
+    software. If the software is modified by someone else and passed on, we
+    want its recipients to know that what they have is not the original, so
+    that any problems introduced by others will not reflect on the original
+    authors' reputations.
+
+      Finally, any free program is threatened constantly by software
+    patents. We wish to avoid the danger that redistributors of a free
+    program will individually obtain patent licenses, in effect making the
+    program proprietary. To prevent this, we have made it clear that any
+    patent must be licensed for everyone's free use or not licensed at all.
+
+      The precise terms and conditions for copying, distribution and
+    modification follow.
+
+                        GNU GENERAL PUBLIC LICENSE
+       TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+      0. This License applies to any program or other work which contains
+    a notice placed by the copyright holder saying it may be distributed
+    under the terms of this General Public License. The &quot;Program&quot;, below,
+    refers to any such program or work, and a &quot;work based on the Program&quot;
+    means either the Program or any derivative work under copyright law:
+    that is to say, a work containing the Program or a portion of it,
+    either verbatim or with modifications and/or translated into another
+    language. (Hereinafter, translation is included without limitation in
+    the term &quot;modification&quot;.)  Each licensee is addressed as &quot;you&quot;.
+
+    Activities other than copying, distribution and modification are not
+    covered by this License; they are outside its scope. The act of
+    running the Program is not restricted, and the output from the Program
+    is covered only if its contents constitute a work based on the
+    Program (independent of having been made by running the Program).
+    Whether that is true depends on what the Program does.
+
+      1. You may copy and distribute verbatim copies of the Program's
+    source code as you receive it, in any medium, provided that you
+    conspicuously and appropriately publish on each copy an appropriate
+    copyright notice and disclaimer of warranty; keep intact all the
+    notices that refer to this License and to the absence of any warranty;
+    and give any other recipients of the Program a copy of this License
+    along with the Program.
+
+    You may charge a fee for the physical act of transferring a copy, and
+    you may at your option offer warranty protection in exchange for a fee.
+
+      2. You may modify your copy or copies of the Program or any portion
+    of it, thus forming a work based on the Program, and copy and
+    distribute such modifications or work under the terms of Section 1
+    above, provided that you also meet all of these conditions:
+
+        a) You must cause the modified files to carry prominent notices
+        stating that you changed the files and the date of any change.
+
+        b) You must cause any work that you distribute or publish, that in
+        whole or in part contains or is derived from the Program or any
+        part thereof, to be licensed as a whole at no charge to all third
+        parties under the terms of this License.
+
+        c) If the modified program normally reads commands interactively
+        when run, you must cause it, when started running for such
+        interactive use in the most ordinary way, to print or display an
+        announcement including an appropriate copyright notice and a
+        notice that there is no warranty (or else, saying that you provide
+        a warranty) and that users may redistribute the program under
+        these conditions, and telling the user how to view a copy of this
+        License. (Exception: if the Program itself is interactive but
+        does not normally print such an announcement, your work based on
+        the Program is not required to print an announcement.)
+
+    These requirements apply to the modified work as a whole. If
+    identifiable sections of that work are not derived from the Program,
+    and can be reasonably considered independent and separate works in
+    themselves, then this License, and its terms, do not apply to those
+    sections when you distribute them as separate works. But when you
+    distribute the same sections as part of a whole which is a work based
+    on the Program, the distribution of the whole must be on the terms of
+    this License, whose permissions for other licensees extend to the
+    entire whole, and thus to each and every part regardless of who wrote it.
+
+    Thus, it is not the intent of this section to claim rights or contest
+    your rights to work written entirely by you; rather, the intent is to
+    exercise the right to control the distribution of derivative or
+    collective works based on the Program.
+
+    In addition, mere aggregation of another work not based on the Program
+    with the Program (or with a work based on the Program) on a volume of
+    a storage or distribution medium does not bring the other work under
+    the scope of this License.
+
+      3. You may copy and distribute the Program (or a work based on it,
+    under Section 2) in object code or executable form under the terms of
+    Sections 1 and 2 above provided that you also do one of the following:
+
+        a) Accompany it with the complete corresponding machine-readable
+        source code, which must be distributed under the terms of Sections
+        1 and 2 above on a medium customarily used for software interchange; or,
+
+        b) Accompany it with a written offer, valid for at least three
+        years, to give any third party, for a charge no more than your
+        cost of physically performing source distribution, a complete
+        machine-readable copy of the corresponding source code, to be
+        distributed under the terms of Sections 1 and 2 above on a medium
+        customarily used for software interchange; or,
+
+        c) Accompany it with the information you received as to the offer
+        to distribute corresponding source code. (This alternative is
+        allowed only for noncommercial distribution and only if you
+        received the program in object code or executable form with such
+        an offer, in accord with Subsection b above.)
+
+    The source code for a work means the preferred form of the work for
+    making modifications to it. For an executable work, complete source
+    code means all the source code for all modules it contains, plus any
+    associated interface definition files, plus the scripts used to
+    control compilation and installation of the executable. However, as a
+    special exception, the source code distributed need not include
+    anything that is normally distributed (in either source or binary
+    form) with the major components (compiler, kernel, and so on) of the
+    operating system on which the executable runs, unless that component
+    itself accompanies the executable.
+
+    If distribution of executable or object code is made by offering
+    access to copy from a designated place, then offering equivalent
+    access to copy the source code from the same place counts as
+    distribution of the source code, even though third parties are not
+    compelled to copy the source along with the object code.
+
+      4. You may not copy, modify, sublicense, or distribute the Program
+    except as expressly provided under this License. Any attempt
+    otherwise to copy, modify, sublicense or distribute the Program is
+    void, and will automatically terminate your rights under this License.
+    However, parties who have received copies, or rights, from you under
+    this License will not have their licenses terminated so long as such
+    parties remain in full compliance.
+
+      5. You are not required to accept this License, since you have not
+    signed it. However, nothing else grants you permission to modify or
+    distribute the Program or its derivative works. These actions are
+    prohibited by law if you do not accept this License. Therefore, by
+    modifying or distributing the Program (or any work based on the
+    Program), you indicate your acceptance of this License to do so, and
+    all its terms and conditions for copying, distributing or modifying
+    the Program or works based on it.
+
+      6. Each time you redistribute the Program (or any work based on the
+    Program), the recipient automatically receives a license from the
+    original licensor to copy, distribute or modify the Program subject to
+    these terms and conditions. You may not impose any further
+    restrictions on the recipients' exercise of the rights granted herein.
+    You are not responsible for enforcing compliance by third parties to
+    this License.
+
+      7. If, as a consequence of a court judgment or allegation of patent
+    infringement or for any other reason (not limited to patent issues),
+    conditions are imposed on you (whether by court order, agreement or
+    otherwise) that contradict the conditions of this License, they do not
+    excuse you from the conditions of this License. If you cannot
+    distribute so as to satisfy simultaneously your obligations under this
+    License and any other pertinent obligations, then as a consequence you
+    may not distribute the Program at all. For example, if a patent
+    license would not permit royalty-free redistribution of the Program by
+    all those who receive copies directly or indirectly through you, then
+    the only way you could satisfy both it and this License would be to
+    refrain entirely from distribution of the Program.
+
+    If any portion of this section is held invalid or unenforceable under
+    any particular circumstance, the balance of the section is intended to
+    apply and the section as a whole is intended to apply in other
+    circumstances.
+
+    It is not the purpose of this section to induce you to infringe any
+    patents or other property right claims or to contest validity of any
+    such claims; this section has the sole purpose of protecting the
+    integrity of the free software distribution system, which is
+    implemented by public license practices. Many people have made
+    generous contributions to the wide range of software distributed
+    through that system in reliance on consistent application of that
+    system; it is up to the author/donor to decide if he or she is willing
+    to distribute software through any other system and a licensee cannot
+    impose that choice.
+
+    This section is intended to make thoroughly clear what is believed to
+    be a consequence of the rest of this License.
+
+      8. If the distribution and/or use of the Program is restricted in
+    certain countries either by patents or by copyrighted interfaces, the
+    original copyright holder who places the Program under this License
+    may add an explicit geographical distribution limitation excluding
+    those countries, so that distribution is permitted only in or among
+    countries not thus excluded. In such case, this License incorporates
+    the limitation as if written in the body of this License.
+
+      9. The Free Software Foundation may publish revised and/or new versions
+    of the General Public License from time to time. Such new versions will
+    be similar in spirit to the present version, but may differ in detail to
+    address new problems or concerns.
+
+    Each version is given a distinguishing version number. If the Program
+    specifies a version number of this License which applies to it and &quot;any
+    later version&quot;, you have the option of following the terms and conditions
+    either of that version or of any later version published by the Free
+    Software Foundation. If the Program does not specify a version number of
+    this License, you may choose any version ever published by the Free Software
+    Foundation.
+
+      10. If you wish to incorporate parts of the Program into other free
+    programs whose distribution conditions are different, write to the author
+    to ask for permission. For software which is copyrighted by the Free
+    Software Foundation, write to the Free Software Foundation; we sometimes
+    make exceptions for this. Our decision will be guided by the two goals
+    of preserving the free status of all derivatives of our free software and
+    of promoting the sharing and reuse of software generally.
+
+                                NO WARRANTY
+
+      11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+    FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+    OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+    PROVIDE THE PROGRAM &quot;AS IS&quot; WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+    OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+    MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+    TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+    PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+    REPAIR OR CORRECTION.
+
+      12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+    WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+    REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+    INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+    OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+    TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+    YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+    PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGES.
+
+                         END OF TERMS AND CONDITIONS
+
+            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
+    possible use to the public, the best way to achieve this is to make it
+    free software which everyone can redistribute and change under these terms.
+
+      To do so, attach the following notices to the program. It is safest
+    to attach them to the start of each source file to most effectively
+    convey the exclusion of warranty; and each file should have at least
+    the &quot;copyright&quot; line and a pointer to where the full notice is found.
+
+        &lt;one line to give the program's name and a brief idea of what it does.&gt;
+        Copyright (C) 19yy  &lt;name of author&gt;
+
+        This program is free software; you can redistribute it and/or modify
+        it under the terms of the GNU General Public License as published by
+        the Free Software Foundation; either version 2 of the License, or
+        (at your option) any later version.
+
+        This program is distributed in the hope that it will be useful,
+        but WITHOUT ANY WARRANTY; without even the implied warranty of
+        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+        GNU General Public License for more details.
+
+        You should have received a copy of the GNU General Public License
+        along with this program; if not, write to the Free Software
+        Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Also add information on how to contact you by electronic and paper mail.
+
+    If the program is interactive, make it output a short notice like this
+    when it starts in an interactive mode:
+
+        Gnomovision version 69, Copyright (C) 19yy name of author
+        Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+        This is free software, and you are welcome to redistribute it
+        under certain conditions; type `show c' for details.
+
+    The hypothetical commands `show w' and `show c' should show the appropriate
+    parts of the General Public License. Of course, the commands you use may
+    be called something other than `show w' and `show c'; they could even be
+    mouse-clicks or menu items--whatever suits your program.
+
+    You should also get your employer (if you work as a programmer) or your
+    school, if any, to sign a &quot;copyright disclaimer&quot; for the program, if
+    necessary. Here is a sample; alter the names:
+
+      Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+      `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+      &lt;signature of Ty Coon&gt;, 1 April 1989
+      Ty Coon, President of Vice
+
+    This General Public License does not permit incorporating your program into
+    proprietary programs. If your program is a subroutine library, you may
+    consider it more useful to permit linking proprietary applications with the
+    library. If this is what you want to do, use the GNU Library General
+    Public License instead of this License.</pre>

share/keepass/license.txt

@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

src/PwManager.cpp

@@ -39,7 +39,7 @@ QString r=Errors.front();
 Errors.pop_front();
 return r;
 }
-else return QString(trUtf8("unbekannter Fehler"));
+else return QString(tr("Unknown Error"));
 }
 
 QString PwDatabase::getErrors(){
@@ -81,7 +81,7 @@ file.readBlock(buffer,total_size);
 file.close();
 
 if(total_size < DB_HEADER_SIZE){
-err=trUtf8("Unerwartete Dateigröße (Dateigröße < DB_HEADER_SIZE)");
+err=tr("Unexpected file size (DB_TOTAL_SIZE < DB_HEADER_SIZE)");
 return false; }
 
 memcpyFromLEnd32(&Signature1,buffer);
@@ -97,18 +97,18 @@ memcpy(TrafoRandomSeed,buffer+88,32);
 memcpyFromLEnd32(&KeyEncRounds,buffer+120);
 
 if((Signature1!=PWM_DBSIG_1) || (Signature2!=PWM_DBSIG_2)){
-err=trUtf8("Falsche Signatur");
+err=tr("Wrong Signature");
 return false;}
 
 
 if((Version & 0xFFFFFF00) != (PWM_DBVER_DW & 0xFFFFFF00)){
-	err=trUtf8("Nicht unterstüzte Dateiversion");
+	err=tr("Unsupported File Version");
 	return false;}
 
 if(Flags & PWM_FLAG_RIJNDAEL) CryptoAlgorithmus = ALGO_AES;
 else if(Flags & PWM_FLAG_TWOFISH) CryptoAlgorithmus = ALGO_TWOFISH;
 else {
- err=trUtf8("Unbekannter Verschlüsselungsalgorithmus");
+ err=tr("Unknown Encryption Algorithm");
  return false;
  }
 
@@ -126,7 +126,7 @@ if(CryptoAlgorithmus == ALGO_AES)
 		// Initialize Rijndael algorithm
 		if(aes.init(Rijndael::CBC, Rijndael::Decrypt, FinalKey,
 			Rijndael::Key32Bytes, EncryptionIV) != RIJNDAEL_SUCCESS)
-			{err=trUtf8("AES-Initialisierung fehlgeschlagen");
+			{err=tr("AES-Init Failed");
 			 return false;}
 		// Decrypt! The first bytes aren't encrypted (that's the header)
 		crypto_size = (unsigned long)aes.padDecrypt((Q_UINT8 *)buffer + DB_HEADER_SIZE,
@@ -140,7 +140,7 @@ else if(CryptoAlgorithmus == ALGO_TWOFISH)
 			total_size - DB_HEADER_SIZE, (Q_UINT8 *)buffer + DB_HEADER_SIZE);
 	}
 
-if((crypto_size > 2147483446) || (crypto_size == 0)){err=trUtf8("Entschlüsselung nicht möglich - der Schlüssel ist falsch oder die Datei beschädigt."); return false;}
+if((crypto_size > 2147483446) || (crypto_size == 0)){err=tr("Decryption failed.\nThe key is wrong or the file is damaged"); return false;}
 
 sha256_starts(&sha32);
 sha256_update(&sha32,(unsigned char *)buffer + DB_HEADER_SIZE,crypto_size);
@@ -148,7 +148,7 @@ sha256_finish(&sha32,(unsigned char *)FinalKey);
 
 if(memcmp(ContentsHash, FinalKey, 32) != 0)
 {
-err=trUtf8("Hash-Test fehlgeschlage: der Schlüssl ist falsch oder die Datei ist beschädigt.");
+err=tr("Hash test failed.\nThe key is wrong or the file is damaged");
 return false;}
 
 
@@ -167,11 +167,13 @@ CGroup group;
 		memcpyFromLEnd16(&FieldType, pField);
 		pField += 2; pos += 2;
 		if(pos >= total_size) {
+		 err=tr("Unexpected error: Offset is out of range. [G1]");
 		 return false; }
 
 		memcpyFromLEnd32(&FieldSize, pField);
 		pField += 4; pos += 4;
-		if(pos >= (total_size + FieldSize)) {
+		if(pos >= (total_size + FieldSize)){
+		 err=tr("Unexpected error: Offset is out of range. [G2]");
 		return false;}
 
 		bRet = group.ReadGroupField(FieldType, FieldSize, (Q_UINT8 *)pField);
@@ -181,7 +183,9 @@ CGroup group;
 
 		pField += FieldSize;
 		pos += FieldSize;
-		if(pos >= total_size) { return false;}
+		if(pos >= total_size) {
+		 err=tr("Unexpected error: Offset is out of range. [G1]");
+		 return false;}
 	}
 
 CEntry entry;
@@ -193,11 +197,13 @@ CEntry entry;
 		memcpyFromLEnd16(&FieldType, pField);
 		pField += 2; pos += 2;
 		if(pos >= total_size){
+		 err=tr("Unexpected error: Offset is out of range. [E1]");
 		 return false;}
 
 		memcpyFromLEnd32(&FieldSize, pField);
 		pField += 4; pos += 4;
 		if(pos >= (total_size + FieldSize)) {
+		 err=tr("Unexpected error: Offset is out of range. [E2]");
 		 return false; }
 
 		bRet = entry.ReadEntryField(FieldType,FieldSize,(Q_UINT8*)pField);
@@ -210,6 +216,7 @@ CEntry entry;
 		pField += FieldSize;
 		pos += FieldSize;
 		if(pos >= total_size) {
+		 err=tr("Unexpected error: Offset is out of range. [E3]");
 		 return false; }
 	}
 

src/PwmConfig.cpp

@@ -111,14 +111,14 @@ return str;
 QColor CConfig::ParseColorString(QString str){
 QStringList lst=QStringList::split(',',str);
 if(lst.size()!=3){
-  qWarning(QObject::trUtf8("Warnung:")+" CConfig::ParseColorString(QString):"+QObject::trUtf8("ungültiger RGB-Farbwert.\n"));
+  qWarning(QObject::tr("Warnung:")+" CConfig::ParseColorString(QString):"+QObject::tr("ungültiger RGB-Farbwert.\n"));
   return QColor(0,0,0);}
 bool err[3];
 int r=lst[0].toUInt(err);
 int g=lst[1].toUInt(err+1);
 int b=lst[2].toUInt(err+2);
 if(!err[0] || !err[1] || !err[2]){
-  qWarning(QObject::trUtf8("Warnung:")+" CConfig::ParseColorString(QString):"+QObject::trUtf8("ungültiger RGB-Farbwert.\n"));
+  qWarning(QObject::tr("Warnung:")+" CConfig::ParseColorString(QString):"+QObject::tr("ungültiger RGB-Farbwert.\n"));
   return QColor(0,0,0);}
 return QColor(r,g,b);
 }

src/dialogs/AboutDlg.cpp

@@ -1,6 +1,6 @@
 /***************************************************************************
- *   Copyright (C) 2005 by Tarek Saidi                                     *
+ *   Copyright (C) 2005-2006 by Tarek Saidi                                *
- *   tarek@linux                                                           *
+ *   tarek.saidi@arcor.de                                                  *
  *                                                                         *
  *   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  *
@@ -19,7 +19,6 @@
  ***************************************************************************/
 
 #include <qmessagebox.h>
-#include <q3scrollview.h>
 #include <qlabel.h>
 #include <qdialog.h>
 #include <qfile.h>
@@ -31,22 +30,13 @@ CAboutDialog::CAboutDialog(QWidget* parent, const char* name, bool modal, Qt::WF
 : QDialog(parent,name, modal,fl)
 {
 setupUi(this);
-createBanner(Banner,Icon_Key32x32,trUtf8("Keepass für Linux"));
+createBanner(Banner,Icon_Key32x32,tr("KeePassX %1").arg(KEEPASS_VERSION));
-Link_Homepage=new LinkLabel(this,"Link_Homepage",trUtf8("http://keepass.de.vu"),80,143);
+loadLicFromFile();
-Link_EMail=new LinkLabel(this,"Link_EMail",trUtf8("tarek.saidi@arcor.de"),80,163);
-Link_License=new LinkLabel(this,"Link_License",trUtf8("Lizenz"),80,183);
-connect(Link_License,SIGNAL(clicked()),this,SLOT(OnLicenseClicked()));
-connect(Link_EMail,SIGNAL(clicked()),this,SLOT(OnEMailClicked()));
-connect(Link_Homepage,SIGNAL(clicked()),this,SLOT(OnHomepageClicked()));
-Label0->setText(Label0->text().arg(KEEPASS_VERSION));
-
 }
 
 CAboutDialog::~CAboutDialog()
 {
-delete Link_Homepage;
+
-delete Link_EMail;
-delete Link_License;
 }
 
 void CAboutDialog::OnClose()
@@ -54,38 +44,28 @@ void CAboutDialog::OnClose()
 close();
 }
 
-void CAboutDialog::OnLicenseClicked(){
+void CAboutDialog::loadLicFromFile(){
 
-QDialog dlg(this,NULL,true);
+QFile gpl(AppDir+"/../share/keepass/license.html");
-Q3ScrollView scroll(&dlg);
-QLabel label(&scroll,"License-Scroll");
-scroll.addChild(&label);
-QFile gpl(AppDir+"/../share/keepass/license.txt");
 if(!gpl.exists()){
-QMessageBox::critical(this,trUtf8("Fehler"),trUtf8("Die Datei '%1' konnte nicht gefunden werden.")
+QMessageBox::critical(this,tr("Error"),tr("File '%1' could not be found.")
-			  .arg("'license.txt'")+"\n"+trUtf8("Die Anwendung wurde möglicherweiße nicht korrekt installiert.")
+			  .arg("'license.html'")+"\n"+tr("Make sure that the program is installed correctly.")
-			  ,trUtf8("OK"),0,0,2,1);
+			  ,tr("OK"),0,0,2,1);
 return;
 }
 
 if(!gpl.open(QIODevice::ReadOnly)){
-QMessageBox::critical(this,trUtf8("Fehler"),trUtf8("Die Datei '%1' konnte nicht geöffnet werden.")
+QMessageBox::critical(this,tr("Fehler"),tr("Could not open file '%1'")
-			  .arg("'license.txt'")+trUtf8("Es trat folgender Fehler auf:\n%1").arg(gpl.errorString())			 
+			  .arg("'license.txt'")+tr("The following error occured:\n%1").arg(gpl.errorString())			 
-			  ,trUtf8("OK"),0,0,2,1);
+			  ,tr("OK"),0,0,2,1);
 return;
 }
+
 char* buffer=new char[gpl.size()];
 long l=gpl.readBlock(buffer,gpl.size());
 gpl.close();
-label.setText(QString::fromUtf8(buffer,l));
+Edit_License->setText(QString::fromUtf8(buffer,l));
-label.setGeometry(0,0,500,800);
-dlg.setFixedWidth(500);
-dlg.setFixedHeight(400);
-dlg.setCaption(trUtf8("Lizenz"));
-scroll.setGeometry(0,0,500,400);
-dlg.exec();
 delete buffer;
-
 }
 
 void CAboutDialog::OnHomepageClicked(){

src/dialogs/AboutDlg.h

@@ -28,28 +28,16 @@
 class CAboutDialog : public QDialog, public Ui_AboutDlg
 {
   Q_OBJECT
-
-  LinkLabel *Link_Homepage,*Link_EMail,*Link_License;
 public:
   CAboutDialog(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, Qt::WFlags fl = 0 );
   ~CAboutDialog();
 
-  /*$PUBLIC_FUNCTIONS$*/
-
-public slots:
-  /*$PUBLIC_SLOTS$*/
-
-protected:
-  /*$PROTECTED_FUNCTIONS$*/
-
-protected slots:
-  /*$PROTECTED_SLOTS$*/
-
 public slots:
     virtual void OnClose();
     void OnHomepageClicked();
     void OnEMailClicked();
-    void OnLicenseClicked();
+private:
+	inline void loadLicFromFile();
 };
 
 #endif

src/dialogs/ChangeKeyDlg.cpp

@@ -46,7 +46,7 @@ connect( CheckBox_Both, SIGNAL( stateChanged(int) ), this, SLOT( OnCheckBoxChang
 connect( ButtonChangeEchoMode, SIGNAL( clicked() ), this, SLOT( ChangeEchoMode() ) );
 
 db=_db;
-createBanner(Banner,Icon_Key32x32,trUtf8("Hauptschlüssel ändern"));
+createBanner(Banner,Icon_Key32x32,tr("Change Master Key"));
 if(!config.ShowPasswords)ChangeEchoMode();
 ///@PlatformSpecific
 QDir media("/media");
@@ -73,17 +73,17 @@ CChangeKeyDlg::~CChangeKeyDlg()
 void CChangeKeyDlg::OnOK()
 {
 if(CheckBox_Both->isChecked()){
- if(password==""){QMessageBox::warning(this,trUtf8("Fehler"),trUtf8("Bitte geben Sie ein Passwort ein.")
+ if(password==""){QMessageBox::warning(this,tr("Error"),tr("Please enter a password.")
-                                      ,trUtf8("OK"),"","",0,0);
+                                      ,tr("OK"),"","",0,0);
 			return;}
- if(keyfile==""){QMessageBox::warning(this,trUtf8("Fehler"),trUtf8("Bitte wählen Sie eine Schlüsseldatei.")
+ if(keyfile==""){QMessageBox::warning(this,tr("Error"),tr("Please choose a key file.")
-                                      ,trUtf8("OK"),"","",0,0);
+                                      ,tr("OK"),"","",0,0);
 			return;}
 }
 else
 {
- if(password=="" && keyfile==""){QMessageBox::warning(this,trUtf8("Fehler"),trUtf8("Geben Sie bitte ein Passwort ein oder wählen Sie eine Schlüsseldatei.")
+ if(password=="" && keyfile==""){QMessageBox::warning(this,tr("Error"),tr("Please select a key file or enter a password.")
-                                      ,trUtf8("OK"),"","",0,0);
+                                      ,tr("OK"),"","",0,0);
 			return;}
 }
 
@@ -93,16 +93,16 @@ Q_UINT8 pw_key[32]={0};
 if(keyfile!=""){
 QFile file(keyfile);
 if(file.exists()){
-int r=QMessageBox::warning(this,trUtf8("Vorhandene Datei überschreiben?"),trUtf8("Unter dem gewählten Dateinamen existiert bereits eine Datei.\nSoll sie überschrieben werden?"),"Ja","Nein",NULL,1,1);
+int r=QMessageBox::warning(this,tr("Overwrite?"),tr("A file with this name already exists.\nDo you want to replace it?"),"Yes","No",NULL,1,1);
 if(r==1)return;}
 getRandomBytes(file_key,1,32,true);
 if(file.open(QIODevice::WriteOnly | QIODevice::Truncate)==false){
-QMessageBox::critical(this,trUtf8("Fehler"),trUtf8("Schlüsseldatei konnte nicht geöffnet werden."),"OK",0,0,2,1);
+QMessageBox::critical(this,tr("Error"),tr("Could not open key file for writing."),"OK",0,0,2,1);
 return;
 }
 if(file.writeBlock((char*)file_key,32)!=32){
 file.close();
-QMessageBox::critical(this,trUtf8("Fehler"),trUtf8("Das Schreiben der Schlüsseldatei ist fehlgeschlagen."),"OK",0,0,2,1);
+QMessageBox::critical(this,tr("Error"),tr("Key file could not be written."),"OK",0,0,2,1);
 return;
 }
 file.close();
@@ -110,7 +110,7 @@ file.close();
 
 if(CheckBox_Both->isChecked() || keyfile==""){
 	if(password!=Edit_Password_2->text()){
-		QMessageBox::critical(this,trUtf8("Fehler"),trUtf8("Passwort und Passwortwiederholung stimmen nicht überein.\nBitte prüfen Sie Ihre Eingabe."),"OK",0,0,2,1);
+		QMessageBox::critical(this,tr("Error"),tr("Password and password repetition are not equal.\nPlease check your input."));
 		return;}}
 
 if(CheckBox_Both->isChecked())db->CalcMasterKeyByFileAndPw(keyfile, password);
@@ -123,7 +123,7 @@ done(1);
 void CChangeKeyDlg::OnSelect()
 {
 if(Button_Browse->isEnabled()){
-keyfile=Q3FileDialog::getSaveFileName(QDir::homeDirPath(),"",this,trUtf8("Schlüsseldatei öffnen"));
+keyfile=Q3FileDialog::getSaveFileName(QDir::homeDirPath(),"",this,tr("Open key file"));
 if(keyfile=="")return;
 Combo_Dirs->insertItem(keyfile);
 Combo_Dirs->setCurrentItem(Combo_Dirs->count()-1);
@@ -140,7 +140,7 @@ IsFile.append(true);
 
 void CChangeKeyDlg::OnBrowse()
 {
-QString dir=Q3FileDialog::getExistingDirectory(QDir::homeDirPath(),NULL,trUtf8("Verzeichnis wählen"));
+QString dir=Q3FileDialog::getExistingDirectory(QDir::homeDirPath(),NULL,tr("Choose Directory"));
 if(dir=="")return;
 keyfile=dir+"/pwsafe.key";
 Combo_Dirs->insertItem(dir);

src/dialogs/DatabaseSettingsDlg.cpp

@@ -41,9 +41,9 @@ CDbSettingsDlg::~CDbSettingsDlg()
 
 void CDbSettingsDlg::showEvent(QShowEvent *event){
 if(event->spontaneous()==false){
-createBanner(Banner,Icon_Settings32x32,"Einstellungen");
+createBanner(Banner,Icon_Settings32x32,"Settings");
-ComboAlgo->insertItem(trUtf8("AES(Rijndael):  256 Bit   (Standard)"),0);
+ComboAlgo->insertItem(tr("AES(Rijndael):  256 Bit   (default)"),0);
-ComboAlgo->insertItem(trUtf8("Twofish:  256 Bit"),1);
+ComboAlgo->insertItem(tr("Twofish:  256 Bit"),1);
 ComboAlgo->setCurrentItem(database->CryptoAlgorithmus); //Achtung: AlgoID muss gleich dem ComboBox Index sein!
 EditRounds->setText(QString::number(database->KeyEncRounds));
 
@@ -59,17 +59,17 @@ done(0);
 void CDbSettingsDlg::OnOK()
 {
 if(EditRounds->text()==""){
-QMessageBox::warning(NULL,trUtf8("Fehler"),trUtf8("Geben Sie bitte die Anzahl der Verschlüsselungsrunden an."),trUtf8("OK"));
+QMessageBox::warning(NULL,tr("Warning"),tr("Please determine the number of encryption rounds."),tr("OK"));
 return;
 }
 bool valid;
 int rounds=EditRounds->text().toUInt(&valid,10);
 if(valid==false){
-QMessageBox::warning(NULL,trUtf8("Fehler"),EditRounds->text()+trUtf8(" ist kein gültiger Zahlenwert"),trUtf8("OK"));
+QMessageBox::warning(NULL,tr("Error"),tr("'%1' is not valid integer value.").arg(EditRounds->text()),tr("OK"));
 return;
 }
 if(rounds==0){
-QMessageBox::warning(NULL,trUtf8("Fehler"),trUtf8("Die Anzahl an Verschlüsselungsrunden muss mindestens 1 betragen."),trUtf8("OK"));
+QMessageBox::warning(NULL,tr("Error"),tr("The number of encryption rounds have to be greater than 0."),tr("OK"));
 return;
 }
 database->KeyEncRounds=rounds;

src/dialogs/EditEntryDlg.cpp

@@ -51,7 +51,7 @@ Q_ASSERT(_entry);
 entry=_entry;
 db=_db;
 setupUi(this);
-createBanner(Banner,Icon_Key32x32,trUtf8("Eintrag bearbeiten"));
+createBanner(Banner,Icon_Key32x32,tr("Eintrag bearbeiten"));
 ModFlag=false;
 connect(Edit_Password_w, SIGNAL(editingFinished()), this, SLOT(OnPasswordwLostFocus()));
 connect(Edit_Password_w, SIGNAL(textChanged(const QString&)), this, SLOT( OnPasswordwTextChanged(const QString&)));
@@ -155,7 +155,7 @@ Combo_Group->setCurrentItem(db->getGroupIndex(entry->GroupID));
 void CEditEntryDlg::OnButtonOK()
 {
 if(QString::compare(Edit_Password->text(),Edit_Password_w->text())!=0){
-QMessageBox::warning(NULL,"Stopp",QString::fromUtf8("Passwort und Passwortwiederholung stimmen\nnicht überein."),"OK");
+QMessageBox::warning(NULL,tr("Warning"),tr("Password and password repetition are not equal.\nPlease check your input."),tr("OK"));
 return;
 }
 
@@ -257,7 +257,7 @@ if(filename=="")return;
 QFile file(filename);
 if(file.open(QIODevice::ReadOnly)==false){
 file.close();
-QMessageBox::warning(NULL,trUtf8("Fehler"),trUtf8("Datei konnte nicht geöffnet werden."),"OK");
+QMessageBox::warning(NULL,tr("Fehler"),tr("Datei konnte nicht geöffnet werden."),"OK");
 return;
 }
 ModFlag=true;
@@ -286,30 +286,30 @@ saveAttachment(entry,this);
 
 void CEditEntryDlg::saveAttachment(CEntry* pEntry, QWidget* ParentWidget)
 {
-QString filename=Q3FileDialog::getSaveFileName(QDir::homeDirPath(),"",ParentWidget,trUtf8("Anhang speichern..."));
+QString filename=Q3FileDialog::getSaveFileName(QDir::homeDirPath(),"",ParentWidget,tr("Save Attachment..."));
 if(filename=="")return;
 QFile file(filename);
 if(file.exists()){
-int r=QMessageBox::warning(ParentWidget,QString::fromUtf8("Vorhandene Datei überschreiben?"),QString::fromUtf8("Unter dem gewählten Dateinamen existiert bereits eine Datei.\nSoll sie überschrieben werden?"),"Ja","Nein",NULL,1,1);
+int r=QMessageBox::warning(ParentWidget,tr("Overwrite?"),tr("A file with this name already exists.\nDo you want to replace it?"),tr("Yes"),tr("No"),NULL,1,1);
 if(r==1)return;
 if(file.remove()==false){
-QMessageBox::critical(NULL,"Fehler",QString::fromUtf8("Datei konnte nicht überschrieben werden."),"OK");
+QMessageBox::critical(NULL,tr("Error"),tr("Could not remove old file."),tr("OK"));
 return;}
 }
 if(file.open(QIODevice::WriteOnly)==false){
-QMessageBox::critical(NULL,"Fehler",QString::fromUtf8("Datei konnte nicht erstellt werden."),"OK");
+QMessageBox::critical(NULL,tr("Error"),tr("Could not create new file."),tr("OK"));
 return;
 }
 
 int r=file.write(pEntry->BinaryData);
 if(r==-1){
 file.close();
-QMessageBox::critical(NULL,"Fehler",QString::fromUtf8("Beim schreiben in der Datei ist ein Fehler aufgetreten."),"OK");
+QMessageBox::critical(NULL,tr("Error"),tr("Error while writing the file."),"OK");
 return;
 }
 if(r!=pEntry->BinaryData.length()){
 file.close();
-QMessageBox::critical(NULL,"Fehler",QString::fromUtf8("Die Datei konnte nicht vollständig geschrieben werden."),"OK");
+QMessageBox::critical(NULL,tr("Error"),tr("Error while writing the file."),tr("OK"));
 return;
 }
 file.close();
@@ -317,7 +317,7 @@ file.close();
 
 void CEditEntryDlg::OnDeleteAttachment()
 {
-int r=QMessageBox::warning(this,trUtf8("Anhang löschen?"),trUtf8("Sie sind dabei den Anhang zu löschen.\nSind Sie sicher, dass Sie dies tun wollen?"),trUtf8("Ja"),trUtf8("Nein"),NULL,1,1);
+int r=QMessageBox::warning(this,tr("Delete Attachment?"),tr("You are about to delete the attachment of this entry.\nAre you sure?"),tr("Yes"),tr("No, Cancel"),NULL,1,1);
 if(r==0){
 ModFlag=true;
 entry->BinaryData.clear();

src/dialogs/LanguageDlg.cpp

@@ -1,153 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005 by Tarek Saidi   *
- *   mail@tarek-saidi.de   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-#include "main.h"
-#include "LanguageDlg.h"
-#include <qtranslator.h>
-#include <qdir.h>
-#include <qstringlist.h>
-#include <q3listview.h>
-#include <qmessagebox.h>
-//Added by qt3to4:
-#include <QShowEvent>
-#include <iostream>
-using namespace std;
-
-const char* infostrings[]={
-QT_TRANSLATE_NOOP("_INFO","$TRANSL_AUTHOR"),
-QT_TRANSLATE_NOOP("_INFO","$TRANSL_AUTHOR_CONTACT"),
-QT_TRANSLATE_NOOP("_INFO","$TRANSL_LANGUAGE"),
-QT_TRANSLATE_NOOP("_INFO","$TRANSL_VERSION")};
-const char* msg[]={QT_TRANSLATE_NOOP("_MSG","Die Änderung der Sprache wird erst nach einem Neustart von Keepass wirksam."),
-		   QT_TRANSLATE_NOOP("_MSG","OK"),
-		   QT_TRANSLATE_NOOP("_MSG","Hinweis")};
-
-CLanguageDlg::CLanguageDlg(QWidget* parent, const char* name, Qt::WFlags fl)
-: QDialog(parent,name,fl)
-{
-setupUi(this);
-
-createBanner(Banner,Icon_I18n32x32,trUtf8("Spracheinstellungen"));
-
-Q3ListViewItem* item;
-QString& config_lang=config.Language;
-QStringList files;
-
-QString langdir=AppDir+"/../share/keepass/i18n/";
-QDir dir(langdir);
-if(dir.exists()){
-files=dir.entryList("*.qm",QDir::Files);
-}
-
-List->insertItem(item=new Q3ListViewItem(List,"","Deutsch","-","-"));
-if(config_lang=="_DEUTSCH_")item->setPixmap(0,*Icon_Ok16x16);
-pItems.push_back(item);
-filenames.push_back("_DEUTSCH_");
-
-
-for(int i=0;i<files.count();i++){
-QTranslator translator;
- if(!translator.load(langdir+files[i])){
-  QMessageBox::warning(this,tr("Warnung"),tr("Die Datei '%1' konnte nicht geladen werden.").arg(files[i]),tr("OK"),0,0,2,1);
-  continue;}
-List->insertItem(item=new Q3ListViewItem(List,"",translator.translate("_INFO","$TRANSL_LANGUAGE")
-				       ,translator.translate("_INFO","$TRANSL_VERSION")
-				       ,translator.translate("_INFO","$TRANSL_AUTHOR")));
-if(config_lang==files[i])item->setPixmap(0,*Icon_Ok16x16);
-pItems.push_back(item);
-filenames.push_back(files[i]);
-}
-}
-
-CLanguageDlg::~CLanguageDlg()
-{
-}
-
-void CLanguageDlg::showEvent(QShowEvent *event){
-if(event->spontaneous()==false){
-List->setColumnWidth(0,20);
-int width=(List->width()-4-20)/3;
-List->setColumnWidth(1,width);
-List->setColumnWidth(2,width);
-List->setColumnWidth(3,width);
-}
-}
-
-void CLanguageDlg::OnItemRightClick(Q3ListViewItem* item)
-{
-//CTX-MENU
-
-}
-
-void CLanguageDlg::OnItemDoubleClicked(Q3ListViewItem* item) // == Slot für Button "wählen"
-{
-int i;
-QString langdir=AppDir+"/../share/keepass/i18n/";
-
-for(i=0;i<pItems.size();i++){
- if(item==pItems[i])break;
- if(i==pItems.size()-1){
-	qWarning(QString("unexpected error in %1, line %2").arg(__FILE__).arg(__LINE__)+"\n");
-	exit(-1);}
-}
-if(filenames[i]!="_DEUTSCH_"){
-QTranslator translator;
-if(!translator.load(langdir+filenames[i])){
- QMessageBox::warning(this,tr("Warnung"),tr("Die Datei '%1' konnte nicht geladen werden.").arg(filenames[i]),tr("OK"),0,0,2,1);
- return;
-}
-QMessageBox::information(this,translator.translate("_MSG",msg[2])
-			     ,translator.translate("_MSG",msg[0])
-			     ,translator.translate("_MSG",msg[1])
-			     ,0,0,0);
-}
-else QMessageBox::information(this,QString::fromUtf8(msg[2]),QString::fromUtf8(msg[0]),QString::fromUtf8(msg[1]),0,0,2,1);
-config.Language=filenames[i];
-
-for(int j=0;j<pItems.size();j++){
-if(j==i)pItems[j]->setPixmap(0,*Icon_Ok16x16);
-else pItems[j]->setPixmap(0,0);}
-
-List->setColumnWidth(0,20);
-int width=(List->width()-4-20)/3;
-List->setColumnWidth(1,width);
-List->setColumnWidth(2,width);
-List->setColumnWidth(3,width);
-
-}
-
-void CLanguageDlg::OnApplyButtonClicked()
-{
-Q3ListViewItem* item=List->selectedItem();
-if(item)OnItemDoubleClicked(item);
-else QMessageBox::information(this,tr("Hinweis"),trUtf8("Es ist keine Übersetzung aufsgewählt."),tr("OK"),0,0,2,1);
-}
-
-void CLanguageDlg::OnButtonCloseClicked()
-{
-done(0);
-}
-
-
-
-
-
-/*$SPECIALIZATION$*/
-
-

src/dialogs/LanguageDlg.h

@@ -1,60 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005 by Tarek Saidi   *
- *   mail@tarek-saidi.de   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
- ***************************************************************************/
-#include "main.h"
-#ifndef _LANGUAGEDLG_H_
-#define _LANGUAGEDLG_H_
-#include "ui_LanguageDlg.h"
-#include <qpixmap.h>
-//Added by qt3to4:
-#include <QShowEvent>
-
-
-
-class CLanguageDlg : public QDialog, public Ui_LanguageDlg
-{
-  Q_OBJECT
-
-public:
-  CLanguageDlg(QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0 );
-  ~CLanguageDlg();
-  vector<QString> filenames;
-  vector<Q3ListViewItem*> pItems;
-  /*$PUBLIC_FUNCTIONS$*/
-
-public slots:
-  /*$PUBLIC_SLOTS$*/
-
-
-protected:
-  /*$PROTECTED_FUNCTIONS$*/
-
-
-protected slots:
-  /*$PROTECTED_SLOTS$*/
-  virtual void showEvent(QShowEvent *e);
-    virtual void OnItemDoubleClicked(Q3ListViewItem* item);
-    virtual void OnItemRightClick(Q3ListViewItem* item);
-    virtual void OnButtonCloseClicked();
-    virtual void OnApplyButtonClicked();
-
-};
-
-#endif
-

src/dialogs/PasswordDlg.cpp

@@ -37,8 +37,8 @@ CPasswordDialog::CPasswordDialog(QWidget* parent, const char* name, bool modal,
 : QDialog(parent,name, modal,fl)
 {
 setupUi(this);
-createBanner(Banner,Icon_Key32x32,trUtf8("Datenbank öffnen"));
+createBanner(Banner,Icon_Key32x32,tr("Datenbank öffnen"));
-Label_select=new LinkLabel((QWidget*)groupframe,"Select",trUtf8("Datei manuell wählen..."),410,100);
+Label_select=new LinkLabel((QWidget*)groupframe,"Select",tr("Datei manuell wählen..."),410,100);
 connect( Combo_Dirs, SIGNAL( activated(int) ), this, SLOT( OnComboSelectionChanged(int) ) );
 connect( ButtonBrowse, SIGNAL( clicked() ), this, SLOT( OnButtonBrowse() ) );
 connect( ButtonOK, SIGNAL( clicked() ), this, SLOT( OnOK() ) );
@@ -48,7 +48,7 @@ connect( CheckBox_Both, SIGNAL( stateChanged(int) ), this, SLOT( OnCheckBox_Both
 connect( ButtonChangeEchoMode, SIGNAL( clicked() ), this, SLOT( ChangeEchoMode() ) );
 connect( Edit_Password, SIGNAL( returnPressed() ), this, SLOT( OnOK() ) );
 
-///@PlatformSpecific
+
 QDir media("/media");
 if(media.exists()){
 Paths=media.entryList("*",QDir::Dirs);
@@ -58,7 +58,7 @@ Paths.erase(Paths.begin()); // delete ".."
 for(int i=0;i<Paths.count();i++){
 Paths[i]="/media/"+Paths[i];
 }
-Paths.prepend(trUtf8("< keiner >"));
+Paths.prepend(tr("< keiner >"));
 }
 for(int i=0;i<Paths.count();i++){
 Combo_Dirs->insertItem(0,Paths[i]);
@@ -92,20 +92,21 @@ Edit_Password->setText("");
 Edit_Password->setDisabled(true);}
 return;
 }
-QMessageBox::warning(this,"Datei nicht gefunden",QString::fromUtf8("Im gewählten Verzeichnis konnte keine Schlüsseldatei gefunden werden.\nStellen Sie sicher, dass der Schlüssel-Datenträger ordnungsgemäß eingehängt (mounted) ist.\nSollte die Schlüsseldatei nicht den Dateinamen 'pwsafe.key' haben, nutzen Sie bitte die manuelle Dateiauswahl."),"OK","","",0,0);
+QMessageBox::warning(this,tr("No key file found"),tr(
+"No key file could be found in the chosen directory.\n\
+Make sure that the volume is mounted correctly.\n\
+Please use the manual file selection for key files with a filename other than 'pwsafe.key'.")
+,tr("OK"),"","",0,0);
 Edit_Password->setEnabled(true);
 Combo_Dirs->setCurrentItem(0);
-
 return;
 }
 
 
 void CPasswordDialog::OnButtonBrowse()
 {
-///@PlatformSpecific
+QString dir=Q3FileDialog::getExistingDirectory(QDir::homeDirPath(),NULL,tr("Browse..."));
-QString dir=Q3FileDialog::getExistingDirectory(QDir::homeDirPath(),NULL,QString::fromUtf8("Verzeichnis wählen"));
 if(dir=="")return;
-
 QFile file(dir+"/pwsafe.key");
 if(file.exists()){
 keyfile=dir+"/pwsafe.key";
@@ -119,13 +120,17 @@ if(!CheckBox_Both->isChecked()){
 Paths.append(dir);
 IsFile.append(false);
 return;}
-QMessageBox::warning(this,"Datei nicht gefunden",QString::fromUtf8("Im gewählten Verzeichnis konnte keine Schlüsseldatei gefunden werden.\nStellen Sie sicher, dass der Schlüssel-Datenträger ordnungsgemäß eingehängt (mounted) ist.\nSollte die Schlüsseldatei nicht den Dateinamen 'pwsafe.key' haben, nutzen Sie bitte die manuelle Dateiauswahl."),"OK","","",0,0);
+QMessageBox::warning(this,tr("No key file found"),tr(
+"No key file could be found in the chosen directory.\n\
+Make sure that the volume is mounted correctly.\n\
+Please use the manual file selection for key files with a filename other than 'pwsafe.key'.")
+,tr("OK"),"","",0,0);
 }
 
 void CPasswordDialog::OnSelectClicked()
 {
 if(ButtonBrowse->isEnabled()){
-keyfile=Q3FileDialog::getOpenFileName(QDir::homeDirPath(),"",this,QString::fromUtf8("Schlüsseldatei öffnen"));
+keyfile=Q3FileDialog::getOpenFileName(QDir::homeDirPath(),"",this,tr("Open Key File"));
 if(keyfile=="")return;
 Combo_Dirs->insertItem(keyfile);
 Combo_Dirs->setCurrentItem(Combo_Dirs->count()-1);
@@ -148,17 +153,18 @@ void CPasswordDialog::OnOK()
 {
 
 if(CheckBox_Both->isChecked()){
- if(password==""){QMessageBox::warning(this,trUtf8("Fehler"),trUtf8("Bitte geben Sie ein Passwort ein.")
+ if(password==""){QMessageBox::warning(this,tr("Error"),tr("Please enter a Password.")
-                                      ,trUtf8("OK"),"","",0,0);
+                                      ,tr("OK"),"","",0,0);
 			return;}
- if(keyfile==""){QMessageBox::warning(this,trUtf8("Fehler"),trUtf8("Bitte wählen Sie eine Schlüsseldatei.")
+ if(keyfile==""){QMessageBox::warning(this,tr("Error"),tr("Please choose a key file.")
-                                      ,trUtf8("OK"),"","",0,0);
+                                      ,tr("OK"),"","",0,0);
 			return;}
 }
 else
 {
- if(password=="" && keyfile==""){QMessageBox::warning(this,trUtf8("Fehler"),trUtf8("Geben Sie bitte ein Passwort ein oder wählen Sie eine Schlüsseldatei.")
+ if(password=="" && keyfile==""){QMessageBox::warning(this,tr("Error")
-                                      ,trUtf8("OK"),"","",0,0);
+									,tr("Please enter a Password or select a key file.")
+                                    ,tr("OK"),"","",0,0);
 			return;}
 }
 done(1);

src/dialogs/PasswordGenDlg.cpp

@@ -87,12 +87,15 @@ else{
 void CGenPwDialog::OnGeneratePw()
 {
 /*
-Großbuchstaben 65...90
+-------
-Kleinbuchstaben 97...122
+ ASCII
-Zahlen 48...57
+-------
-Sonderzeichen 33...47;58...64;91...96;123...126
+"A...Z" 65...90
-Minus 45
+"a...z" 97...122
-Unterstrich 95
+"0...9" 48...57
+Special Charakters 33...47;58...64;91...96;123...126
+"-" 45
+"_" 95
 ANSI >127
 */
 
@@ -147,8 +150,8 @@ num++;
 }
 }
 if(num==0){
-if(Radio_2->isChecked())QMessageBox::information(this,"Hinweis",QString::fromUtf8("Es wird mindestens ein Zeichen benötigt"),"OK");
+if(Radio_2->isChecked())QMessageBox::information(this,tr("Notice"),tr("You need to enter at least one character"),tr("OK"));
-else QMessageBox::information(this,"Hinweis",QString::fromUtf8("Es muss mindestens ein Gruppe von Zeichen gewählt werden"),"OK");
+else QMessageBox::information(this,tr("Notice"),QString::fromUtf8("You need to select at least one character group."),"OK");
 return;
 }
 int length=Spin_Num->value();
@@ -161,7 +164,7 @@ else
 {dev_random = fopen("/dev/urandom","r");}
 
 if (dev_random==NULL){
-QMessageBox::critical(this,"Fehler",QString::fromUtf8("'/dev/random' bzw. '/dev/urandom' konnte nicht zum lesen geöffnet werden."),"OK");
+QMessageBox::critical(this,tr("Error"),tr("Could not open '/dev/random' or '/dev/urandom'."),tr("OK"));
 return;
 }
 unsigned char tmp;

src/dialogs/SearchDlg.cpp

@@ -33,7 +33,7 @@ setupUi(this);
 connect( Button_Search, SIGNAL( clicked() ), this, SLOT( OnButtonSearch() ) );
 connect( Button_Close, SIGNAL( clicked() ), this, SLOT( OnButtonClose() ) );
 
-createBanner(Banner,Icon_Search32x32,tr("Suchen"));
+createBanner(Banner,Icon_Search32x32,tr("Search"));
 checkBox_Cs->setChecked(config.SearchOptions[0]);
 checkBox_regExp->setChecked(config.SearchOptions[1]);
 checkBox_Title->setChecked(config.SearchOptions[2]);
@@ -76,7 +76,7 @@ Hits.clear();
 txt=Edit_Search->text();
 regexp=checkBox_regExp->isChecked();
 if(txt==""){
-QMessageBox::information(this,trUtf8("Hinweis"),trUtf8("Bitte geben Sie einen Suchbegriff ein."),"OK",0,0);
+QMessageBox::information(this,tr("Notice"),tr("Please enter a search string."),tr("OK"));
 return;}
 
 for(int i=0;i<db->Entries.size();i++){

src/dialogs/SettingsDlg.cpp

@@ -35,7 +35,7 @@ connect( ButtonCancel, SIGNAL( clicked() ), this, SLOT( OnCancel() ) );
 connect( ButtonColor1, SIGNAL( clicked() ), this, SLOT( OnColor1() ) );
 connect( ButtonColor2, SIGNAL( clicked() ), this, SLOT( OnColor2() ) );
 connect( ButtonTextColor, SIGNAL( clicked() ), this, SLOT( OnTextColor() ) );
-createBanner(Banner,Icon_Settings32x32,trUtf8("Einstellungen"));
+createBanner(Banner,Icon_Settings32x32,tr("Settings"));
 CheckBox_OpenLast->setChecked(config.OpenLast);
 SpinBox_ClipboardTime->setValue(config.ClipboardTimeOut);
 
@@ -95,7 +95,7 @@ QPixmap *px=new QPixmap(pixmTextColor->width(),pixmTextColor->height());
 px->fill(c);
 pixmTextColor->clear();
 pixmTextColor->setPixmap(*px);
-createBanner(Banner,Icon_Settings32x32,trUtf8("Einstellungen"),color1,color2,textcolor);}
+createBanner(Banner,Icon_Settings32x32,tr("Settings"),color1,color2,textcolor);}
 }
 
 
@@ -108,7 +108,7 @@ QPixmap *px=new QPixmap(pixmColor2->width(),pixmColor2->height());
 px->fill(c);
 pixmColor2->clear();
 pixmColor2->setPixmap(*px);
-createBanner(Banner,Icon_Settings32x32,trUtf8("Einstellungen"),color1,color2,textcolor);}
+createBanner(Banner,Icon_Settings32x32,tr("Settings"),color1,color2,textcolor);}
 }
 
 
@@ -121,7 +121,7 @@ QPixmap *px=new QPixmap(pixmColor1->width(),pixmColor1->height());
 px->fill(c);
 pixmColor1->clear();
 pixmColor1->setPixmap(*px);
-createBanner(Banner,Icon_Settings32x32,trUtf8("Einstellungen"),color1,color2,textcolor);
+createBanner(Banner,Icon_Settings32x32,tr("Settings"),color1,color2,textcolor);
 }
 }
 

src/forms/AboutDlg.ui

@@ -1,4 +1,4 @@
-<ui version="4.0" stdsetdef="1" >
+<ui version="4.0" >
  <author></author>
  <comment></comment>
  <exportmacro></exportmacro>
@@ -9,7 +9,7 @@
     <x>0</x>
     <y>0</y>
     <width>419</width>
-        <height>211</height>
+    <height>268</height>
    </rect>
   </property>
   <property name="sizePolicy" >
@@ -33,30 +33,43 @@
    </size>
   </property>
   <property name="windowTitle" >
-      <string>Über...</string>
+   <string>About</string>
   </property>
-    <widget class="Line" name="line1" >
+  <widget class="QLabel" name="Banner" >
    <property name="geometry" >
     <rect>
-          <x>10</x>
+     <x>0</x>
-          <y>120</y>
+     <y>0</y>
-          <width>400</width>
+     <width>420</width>
-          <height>20</height>
+     <height>50</height>
     </rect>
    </property>
-      <property name="frameShape" >
+   <property name="pixmap" >
-        <enum>QFrame::HLine</enum>
+    <pixmap/>
    </property>
-      <property name="frameShadow" >
+   <property name="scaledContents" >
-        <enum>QFrame::Sunken</enum>
+    <bool>true</bool>
    </property>
   </widget>
-    <widget class="QLabel" name="Label3" >
+  <widget class="QTabWidget" name="tabWidget" >
    <property name="geometry" >
     <rect>
      <x>10</x>
-          <y>140</y>
+     <y>60</y>
-          <width>60</width>
+     <width>401</width>
+     <height>201</height>
+    </rect>
+   </property>
+   <widget class="QWidget" name="tab" >
+    <attribute name="title" >
+     <string>About</string>
+    </attribute>
+    <widget class="QLabel" name="Label3" >
+     <property name="geometry" >
+      <rect>
+       <x>20</x>
+       <y>40</y>
+       <width>81</width>
        <height>20</height>
       </rect>
      </property>
@@ -64,96 +77,98 @@
       <string>Homepage:</string>
      </property>
     </widget>
-    <widget class="QLabel" name="Banner" >
+    <widget class="QLabel" name="Label0" >
      <property name="geometry" >
       <rect>
-          <x>0</x>
+       <x>20</x>
-          <y>0</y>
+       <y>10</y>
-          <width>420</width>
+       <width>281</width>
-          <height>50</height>
+       <height>20</height>
       </rect>
      </property>
-      <property name="pixmap" >
+     <property name="text" >
-        <pixmap>image0</pixmap>
+      <string>KeePassX - Cross Platform Password Manager</string>
-      </property>
-      <property name="scaledContents" >
-        <bool>true</bool>
      </property>
     </widget>
     <widget class="QLabel" name="Label4" >
      <property name="geometry" >
       <rect>
-          <x>10</x>
+       <x>20</x>
-          <y>160</y>
+       <y>70</y>
-          <width>54</width>
+       <width>111</width>
        <height>20</height>
       </rect>
      </property>
      <property name="text" >
-        <string>EMail:</string>
+      <string>Email:</string>
      </property>
     </widget>
-    <widget class="QPushButton" name="ButtonClose" >
+    <widget class="QLabel" name="Label1" >
      <property name="geometry" >
       <rect>
-          <x>326</x>
+       <x>20</x>
-          <y>183</y>
+       <y>100</y>
-          <width>80</width>
+       <width>301</width>
        <height>20</height>
       </rect>
      </property>
      <property name="text" >
-        <string>Schlie&amp;ßen</string>
+      <string>Copyright (C) 2005-2006 Tarek Saidi</string>
-      </property>
-      <property name="shortcut" >
-        <string>Alt+ß</string>
      </property>
     </widget>
-    <widget class="QLabel" name="Label2" >
+   </widget>
+   <widget class="QWidget" name="tab_2" >
+    <attribute name="title" >
+     <string>Thanks To</string>
+    </attribute>
+    <widget class="QTextEdit" name="Edit_Thanks" >
      <property name="geometry" >
       <rect>
-          <x>10</x>
+       <x>0</x>
-          <y>100</y>
+       <y>0</y>
-          <width>400</width>
+       <width>401</width>
-          <height>20</height>
+       <height>171</height>
       </rect>
      </property>
-      <property name="text" >
+     <property name="html" >
-        <string>Keepass/L steht unter der General Public License.</string>
+      <string>&lt;html>&lt;head>&lt;meta name="qrichtext" content="1" />&lt;/head>&lt;body style=" white-space: pre-wrap; font-family:Sans Serif; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;">&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&lt;span style=" font-weight:600;">Mattias Miller&lt;/span> (www.outofhanwell.com)&lt;/p>&lt;p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">  Mac OS X Support&lt;/p>&lt;/body>&lt;/html></string>
      </property>
     </widget>
-    <widget class="QLabel" name="Label1" >
+   </widget>
+   <widget class="QWidget" name="tab_4" >
+    <attribute name="title" >
+     <string>Übersetzung</string>
+    </attribute>
+    <widget class="QTextEdit" name="Edit_Translation" >
      <property name="geometry" >
       <rect>
-          <x>10</x>
+       <x>0</x>
-          <y>80</y>
+       <y>0</y>
-          <width>240</width>
+       <width>401</width>
-          <height>20</height>
+       <height>171</height>
       </rect>
      </property>
-      <property name="text" >
-        <string>Copyright (c) Tarek Saidi 2005</string>
-      </property>
     </widget>
-    <widget class="QLabel" name="Label0" >
+   </widget>
+   <widget class="QWidget" name="tab_3" >
+    <attribute name="title" >
+     <string>License</string>
+    </attribute>
+    <widget class="QTextEdit" name="Edit_License" >
      <property name="geometry" >
       <rect>
-          <x>10</x>
+       <x>0</x>
-          <y>60</y>
+       <y>0</y>
-          <width>220</width>
+       <width>401</width>
-          <height>20</height>
+       <height>171</height>
       </rect>
      </property>
-      <property name="text" >
+    </widget>
-        <string>Keepass/L  Version %1</string>
+   </widget>
-      </property>
   </widget>
  </widget>
  <layoutdefault spacing="6" margin="11" />
  <pixmapfunction></pixmapfunction>
-  <images>
+ <resources/>
-    <image name="image0" >
+ <connections/>
-      <data format="XPM.GZ" length="4833" >789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8</data>
-    </image>
-  </images>
 </ui>

src/forms/ChangeKeyDlg.ui

@@ -33,7 +33,7 @@
    </size>
   </property>
   <property name="windowTitle" >
-   <string>Hauptschlüssel ändern</string>
+   <string>Change Master Key</string>
   </property>
   <widget class="QLabel" name="Banner" >
    <property name="geometry" >
@@ -69,7 +69,7 @@
     </rect>
    </property>
    <property name="title" >
-    <string>Schlüssel</string>
+    <string>Key</string>
    </property>
    <property name="orientation" >
     <enum>Qt::Vertical</enum>
@@ -104,7 +104,7 @@
      </rect>
     </property>
     <property name="text" >
-     <string>Passwort UND Schlüsseldatei verwenden</string>
+     <string>Use password AND key file</string>
     </property>
    </widget>
    <widget class="QLabel" name="textLabel3" >
@@ -117,7 +117,7 @@
      </rect>
     </property>
     <property name="text" >
-     <string>Schlüsseldatei oder Datenträger:</string>
+     <string>Key file or directory:</string>
     </property>
    </widget>
    <widget class="QLabel" name="textLabel1_3" >
@@ -130,7 +130,7 @@
      </rect>
     </property>
     <property name="text" >
-     <string>Passwortwiederholung:</string>
+     <string>Password Repetition:</string>
     </property>
    </widget>
    <widget class="QLabel" name="textLabel2" >
@@ -143,7 +143,7 @@
      </rect>
     </property>
     <property name="text" >
-     <string>Passwort:</string>
+     <string>Password:</string>
     </property>
    </widget>
    <widget class="QPushButton" name="ButtonChangeEchoMode" >
@@ -169,10 +169,10 @@
      </rect>
     </property>
     <property name="text" >
-     <string>W&amp;ählen...</string>
+	  <string>&amp;Browse...</string>
     </property>
     <property name="shortcut" >
-     <string>Alt+Ä</string>
+     <string>Alt+B</string>
     </property>
    </widget>
    <widget class="QComboBox" name="Combo_Dirs" >
@@ -202,7 +202,7 @@
     <enum>QFrame::Plain</enum>
    </property>
    <property name="text" >
-    <string>Geben Sie das Passwort ein und/oder wählen Sie eine Schlüsseldatei.</string>
+    <string>Enter a Password and/or choose a key file.</string>
    </property>
   </widget>
   <widget class="QPushButton" name="ButtonCancel" >
@@ -215,10 +215,10 @@
     </rect>
    </property>
    <property name="text" >
-    <string>Abb&amp;rechen</string>
+    <string>&amp;Cancel</string>
    </property>
    <property name="shortcut" >
-    <string>Alt+R</string>
+    <string>Alt+C</string>
    </property>
   </widget>
   <widget class="QPushButton" name="ButtonOK" >

src/forms/DatabaseSettingsDlg.ui

@@ -33,7 +33,7 @@
       </size>
     </property>
     <property name="windowTitle" >
-      <string>Datenbankeinstellungen</string>
+      <string>Database Settings</string>
     </property>
     <widget class="Q3GroupBox" name="groupBox1" >
       <property name="geometry" >
@@ -45,7 +45,7 @@
         </rect>
       </property>
       <property name="title" >
-        <string>Verschlüsselung</string>
+        <string>Encryption</string>
       </property>
       <widget class="QLabel" name="textLabel2" >
         <property name="geometry" >
@@ -57,7 +57,7 @@
           </rect>
         </property>
         <property name="text" >
-          <string>Algorithmus:</string>
+          <string>Algorithm:</string>
         </property>
       </widget>
       <widget class="QPushButton" name="pushButton1" >
@@ -106,7 +106,7 @@
           </rect>
         </property>
         <property name="text" >
-          <string>Verschlüsselungsrunden:</string>
+          <string>Encryption Rounds:</string>
         </property>
       </widget>
     </widget>
@@ -139,7 +139,7 @@
         <string>O&amp;K</string>
       </property>
       <property name="shortcut" >
-        <string>Alt+K</string>
+        <string>Ctrl+K</string>
       </property>
     </widget>
     <widget class="QPushButton" name="ButtonCancel" >
@@ -152,10 +152,10 @@
         </rect>
       </property>
       <property name="text" >
-        <string>Abbre&amp;chen</string>
+        <string>&amp;Cancel</string>
       </property>
       <property name="shortcut" >
-        <string>Alt+C</string>
+        <string>Ctrl+C</string>
       </property>
     </widget>
   </widget>
@@ -168,9 +168,4 @@
     <tabstop>ButtonCancel</tabstop>
     <tabstop>pushButton1</tabstop>
   </tabstops>
-  <images>
-    <image name="image0" >
-      <data format="XPM.GZ" length="4833" >789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8</data>
-    </image>
-  </images>
 </ui>

src/forms/EditEntryDlg.ui

@@ -1,5 +1,5 @@
 <ui version="4.0" >
- <author></author>
+ <author>Tarek Saidi</author>
  <comment></comment>
  <exportmacro></exportmacro>
  <class>EditEntryDialog</class>
@@ -33,7 +33,7 @@
    </size>
   </property>
   <property name="windowTitle" >
-   <string>Eintrag bearbeiten</string>
+   <string>Edit Entry</string>
   </property>
   <property name="modal" >
    <bool>true</bool>
@@ -108,7 +108,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>Benutzername:</string>
+    <string>Username:</string>
    </property>
   </widget>
   <widget class="QLabel" name="textLabel8" >
@@ -121,7 +121,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>Passwort Wdhlg.:</string>
+    <string>Password Repet.:</string>
    </property>
   </widget>
   <widget class="QLabel" name="textLabel4" >
@@ -134,7 +134,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>Titel:</string>
+    <string>Title:</string>
    </property>
   </widget>
   <widget class="QLabel" name="textLabel7" >
@@ -160,7 +160,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>Passwort:</string>
+    <string>Password:</string>
    </property>
   </widget>
   <widget class="QLabel" name="textLabel9" >
@@ -173,7 +173,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>Qualität:</string>
+    <string>Quality:</string>
    </property>
   </widget>
   <widget class="QLabel" name="textLabel10" >
@@ -186,7 +186,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>Kommentar:</string>
+    <string>Comment:</string>
    </property>
   </widget>
   <widget class="QLabel" name="textLabel11" >
@@ -199,7 +199,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>gültig bis:</string>
+    <string>Expires:</string>
    </property>
   </widget>
   <widget class="QLineEdit" name="Edit_URL" >
@@ -222,7 +222,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>Gruppe:</string>
+    <string>Group:</string>
    </property>
   </widget>
   <widget class="QPushButton" name="ButtonCancel" >
@@ -235,7 +235,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>Abbre&amp;chen</string>
+    <string>&amp;Cancel</string>
    </property>
    <property name="shortcut" >
     <string>Alt+C</string>
@@ -251,7 +251,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>5,30 MB</string>
+    <string>%1</string>
    </property>
   </widget>
   <widget class="QLabel" name="Banner" >
@@ -298,7 +298,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>120 Bits</string>
+    <string>% Bit</string>
    </property>
   </widget>
   <widget class="QToolButton" name="ButtonGenPw" >
@@ -373,7 +373,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>läuft nicht ab</string>
+    <string>Never</string>
    </property>
   </widget>
   <widget class="QProgressBar" name="Progress_Quali" >
@@ -405,7 +405,7 @@
     </rect>
    </property>
    <property name="text" >
-    <string>Anhang:</string>
+    <string>Attachment:</string>
    </property>
   </widget>
   <widget class="QLineEdit" name="Edit_Attachment" >

src/forms/EditGroupDlg.ui

@@ -1,5 +1,5 @@
 <ui version="4.0" stdsetdef="1" >
-  <author></author>
+  <author>Tarek Saidi</author>
   <comment></comment>
   <exportmacro></exportmacro>
   <class>EditGroupDialog</class>
@@ -25,7 +25,7 @@
       </size>
     </property>
     <property name="windowTitle" >
-      <string>Gruppeneigenschaften</string>
+      <string>Group Properties</string>
     </property>
     <widget class="Line" name="line1" >
       <property name="geometry" >
@@ -63,7 +63,7 @@
         </rect>
       </property>
       <property name="text" >
-        <string>Titel:</string>
+        <string>Title:</string>
       </property>
     </widget>
     <widget class="QLabel" name="Label2" >
@@ -76,7 +76,7 @@
         </rect>
       </property>
       <property name="text" >
-        <string>Symbol:</string>
+        <string>Icon:</string>
       </property>
     </widget>
     <widget class="QComboBox" name="ComboIconPicker" >
@@ -99,7 +99,7 @@
         </rect>
       </property>
       <property name="text" >
-        <string>Abbre&amp;chen</string>
+        <string>&amp;Cancel</string>
       </property>
       <property name="shortcut" >
         <string>Alt+C</string>

src/forms/LanguageDlg.ui

@@ -1,172 +0,0 @@
-<ui version="4.0" stdsetdef="1" >
-  <author></author>
-  <comment></comment>
-  <exportmacro></exportmacro>
-  <class>LanguageDlg</class>
-  <widget class="QDialog" name="LanguageDlg" >
-    <property name="geometry" >
-      <rect>
-        <x>0</x>
-        <y>0</y>
-        <width>500</width>
-        <height>252</height>
-      </rect>
-    </property>
-    <property name="sizePolicy" >
-      <sizepolicy>
-        <hsizetype>0</hsizetype>
-        <vsizetype>0</vsizetype>
-        <horstretch>0</horstretch>
-        <verstretch>0</verstretch>
-      </sizepolicy>
-    </property>
-    <property name="minimumSize" >
-      <size>
-        <width>500</width>
-        <height>252</height>
-      </size>
-    </property>
-    <property name="maximumSize" >
-      <size>
-        <width>500</width>
-        <height>252</height>
-      </size>
-    </property>
-    <property name="windowTitle" >
-      <string>Keepass</string>
-    </property>
-    <property name="sizeGripEnabled" >
-      <bool>false</bool>
-    </property>
-    <widget class="QLabel" name="Banner" >
-      <property name="geometry" >
-        <rect>
-          <x>0</x>
-          <y>0</y>
-          <width>500</width>
-          <height>50</height>
-        </rect>
-      </property>
-      <property name="pixmap" >
-        <pixmap>image0</pixmap>
-      </property>
-      <property name="scaledContents" >
-        <bool>true</bool>
-      </property>
-    </widget>
-    <widget class="QPushButton" name="ButtonClose" >
-      <property name="geometry" >
-        <rect>
-          <x>407</x>
-          <y>220</y>
-          <width>80</width>
-          <height>23</height>
-        </rect>
-      </property>
-      <property name="text" >
-        <string>Schlie&amp;ßen</string>
-      </property>
-      <property name="shortcut" >
-        <string>Alt+ß</string>
-      </property>
-    </widget>
-    <widget class="Q3ListView" name="List" >
-      <property name="geometry" >
-        <rect>
-          <x>10</x>
-          <y>60</y>
-          <width>480</width>
-          <height>150</height>
-        </rect>
-      </property>
-      <property name="allColumnsShowFocus" >
-        <bool>true</bool>
-      </property>
-      <property name="showSortIndicator" >
-        <bool>true</bool>
-      </property>
-      <property name="resizeMode" >
-        <enum>Q3ListView::NoColumn</enum>
-      </property>
-      <column>
-        <property name="text" >
-          <string>*</string>
-        </property>
-        <property name="clickable" >
-          <bool>true</bool>
-        </property>
-        <property name="resizable" >
-          <bool>true</bool>
-        </property>
-      </column>
-      <column>
-        <property name="text" >
-          <string>Sprache</string>
-        </property>
-        <property name="clickable" >
-          <bool>true</bool>
-        </property>
-        <property name="resizable" >
-          <bool>true</bool>
-        </property>
-      </column>
-      <column>
-        <property name="text" >
-          <string>Version</string>
-        </property>
-        <property name="clickable" >
-          <bool>true</bool>
-        </property>
-        <property name="resizable" >
-          <bool>true</bool>
-        </property>
-      </column>
-      <column>
-        <property name="text" >
-          <string>Autor</string>
-        </property>
-        <property name="clickable" >
-          <bool>true</bool>
-        </property>
-        <property name="resizable" >
-          <bool>true</bool>
-        </property>
-      </column>
-    </widget>
-    <widget class="QPushButton" name="ButtonApply" >
-      <property name="geometry" >
-        <rect>
-          <x>20</x>
-          <y>220</y>
-          <width>80</width>
-          <height>23</height>
-        </rect>
-      </property>
-      <property name="text" >
-        <string>Fes&amp;tlegen</string>
-      </property>
-      <property name="shortcut" >
-        <string>Alt+T</string>
-      </property>
-      <property name="toolTip" stdset="0" >
-        <string/>
-      </property>
-      <property name="whatsThis" stdset="0" >
-        <string>Legt die aktuell markierte Sprache
-als Übersetzung für Keepass fest.</string>
-      </property>
-    </widget>
-  </widget>
-  <layoutdefault spacing="6" margin="11" />
-  <pixmapfunction></pixmapfunction>
-  <tabstops>
-    <tabstop>List</tabstop>
-    <tabstop>ButtonApply</tabstop>
-    <tabstop>ButtonClose</tabstop>
-  </tabstops>
-  <images>
-    <image name="image0" >
-      <data format="XPM.GZ" length="4833" >789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8</data>
-    </image>
-  </images>
-</ui>

src/forms/MainWindow.ui

@@ -1,5 +1,5 @@
 <ui version="4.0" >
- <author></author>
+ <author>Tarek Saidi</author>
  <comment></comment>
  <exportmacro></exportmacro>
  <class>MainWindow</class>
@@ -16,7 +16,7 @@
    <bool>true</bool>
   </property>
   <property name="windowTitle" >
-   <string>Keepass Passwort-Manager</string>
+   <string>KeePassX</string>
   </property>
   <widget class="QWidget" name="centralWidget" >
    <layout class="QVBoxLayout" >
@@ -114,18 +114,13 @@
      <height>29</height>
     </rect>
    </property>
-   <widget class="QMenu" name="menuHilfe" >
-    <property name="title" >
-     <string>Hilfe</string>
-    </property>
-   </widget>
    <widget class="QMenu" name="menuDatei" >
     <property name="title" >
-     <string>Datei</string>
+     <string>File</string>
     </property>
     <widget class="QMenu" name="menuImportieren_aus" >
      <property name="title" >
-      <string>Importieren aus</string>
+      <string>Import from...</string>
      </property>
      <addaction name="FileImpPwmAction" />
      <addaction name="FileImpKWalletXmlAction" />
@@ -146,7 +141,7 @@
    </widget>
    <widget class="QMenu" name="menuBearbeiten" >
     <property name="title" >
-     <string>Bearbeiten</string>
+     <string>Edit</string>
     </property>
     <addaction name="EditNewGroupAction" />
     <addaction name="EditEditGroupAction" />
@@ -167,11 +162,11 @@
    </widget>
    <widget class="QMenu" name="menuAnsicht" >
     <property name="title" >
-     <string>Ansicht</string>
+     <string>View</string>
     </property>
     <widget class="QMenu" name="menuSpalten" >
      <property name="title" >
-      <string>Spalten</string>
+      <string>Columns</string>
      </property>
      <addaction name="ViewColumnsTitleAction" />
      <addaction name="ViewColumnsUsernameAction" />
@@ -199,6 +194,12 @@
     </property>
     <addaction name="ExtrasSettingsAction" />
    </widget>
+   <widget class="QMenu" name="menuHilfe" >
+    <property name="title" >
+     <string>Help</string>
+    </property>
+    <addaction name="HelpAboutAction" />
+   </widget>
    <addaction name="menuDatei" />
    <addaction name="menuBearbeiten" />
    <addaction name="menuAnsicht" />
@@ -241,117 +242,117 @@
   </widget>
   <action name="FileNewAction" >
    <property name="text" >
-    <string>Neue Datenbank...</string>
+    <string>New Database...</string>
    </property>
   </action>
   <action name="FileOpenAction" >
    <property name="text" >
-    <string>Datenbank öffnen...</string>
+    <string>Open Database...</string>
    </property>
   </action>
   <action name="FileCloseAction" >
    <property name="text" >
-    <string>Datenbank schließen</string>
+    <string>Close Database</string>
    </property>
   </action>
   <action name="FileSaveAction" >
    <property name="text" >
-    <string>Datenbank speichern</string>
+    <string>Save Database</string>
    </property>
   </action>
   <action name="FileSaveAsAction" >
    <property name="text" >
-    <string>Datenbank speichern unter...</string>
+    <string>Save Database As...</string>
    </property>
   </action>
   <action name="FileSettingsAction" >
    <property name="text" >
-    <string>Datenbank-Einstellungen...</string>
+    <string>Database Settings...</string>
    </property>
   </action>
   <action name="FileChangeKeyAction" >
    <property name="text" >
-    <string>Hauptschlüssel ändern...</string>
+    <string>Change Master Key...</string>
    </property>
   </action>
   <action name="FileExitAction" >
    <property name="text" >
-    <string>Beenden</string>
+    <string>Exit</string>
    </property>
   </action>
   <action name="FileImpPwmAction" >
    <property name="text" >
-    <string>PwManager-Datei (*.pwm)</string>
+    <string>PwManager File (*.pwm)</string>
    </property>
   </action>
   <action name="FileImpKWalletXmlAction" >
    <property name="text" >
-    <string>KWallet XML-Datei (*.xml)</string>
+    <string>KWallet XML-File (*.xml)</string>
    </property>
   </action>
   <action name="EditNewGroupAction" >
    <property name="text" >
-    <string>Neue Gruppe hinzufügen...</string>
+    <string>Add New Group...</string>
    </property>
   </action>
   <action name="EditEditGroupAction" >
    <property name="text" >
-    <string>Gruppe bearbeiten...</string>
+    <string>Edit Group...</string>
    </property>
   </action>
   <action name="EditDeleteGroupAction" >
    <property name="text" >
-    <string>Gruppe löschen</string>
+    <string>Delete Group</string>
    </property>
   </action>
   <action name="EditPasswordToClipboardAction" >
    <property name="text" >
-    <string>Passwort in Zwischenablage kopieren</string>
+    <string>Copy Password to Clipboard</string>
    </property>
   </action>
   <action name="EditUsernameToClipboardAction" >
    <property name="text" >
-    <string>Benutzername in Zwischenablage kopieren</string>
+    <string>Copy Username to Clipboard</string>
    </property>
   </action>
   <action name="EditOpenUrlAction" >
    <property name="text" >
-    <string>URL öffnen</string>
+    <string>Open URL</string>
    </property>
   </action>
   <action name="EditSaveAttachmentAction" >
    <property name="text" >
-    <string>Anhang speichern unter...</string>
+    <string>Save Attachment As...</string>
    </property>
   </action>
   <action name="EditNewEntryAction" >
    <property name="text" >
-    <string>Neuen Eintrag hinzufügen...</string>
+    <string>Add New Entry...</string>
    </property>
   </action>
   <action name="EditEditEntryAction" >
    <property name="text" >
-    <string>Eintrag anzeigen/bearbeiten...</string>
+    <string>View/Edit Entry...</string>
    </property>
   </action>
   <action name="EditDeleteEntryAction" >
    <property name="text" >
-    <string>Eintrag löschen</string>
+    <string>Delete Entry</string>
    </property>
   </action>
   <action name="EditCloneEntryAction" >
    <property name="text" >
-    <string>Eintrag duplizieren</string>
+    <string>Clone Entry</string>
    </property>
   </action>
   <action name="EditSearchAction" >
    <property name="text" >
-    <string>In Datenbank suchen...</string>
+    <string>Search In Database...</string>
    </property>
   </action>
   <action name="EditGroupSearchAction" >
    <property name="text" >
-    <string>In dieser Gruppe suchen...</string>
+    <string>Search in this group...</string>
    </property>
   </action>
   <action name="ViewShowToolbarAction" >
@@ -359,7 +360,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Werkzeugleiste anzeigen</string>
+    <string>Show Toolbar</string>
    </property>
   </action>
   <action name="ViewShowEntryDetailsAction" >
@@ -367,7 +368,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Eintragsansicht anzeigen</string>
+    <string>Show Entry Details</string>
    </property>
   </action>
   <action name="ViewHideUsernamesAction" >
@@ -375,7 +376,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Benutzernamen verbergen</string>
+    <string>Hide Usernames</string>
    </property>
   </action>
   <action name="ViewHidePasswordsAction" >
@@ -383,7 +384,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Passwörter verbergen</string>
+    <string>Hide Passwords</string>
    </property>
   </action>
   <action name="ViewColumnsTitleAction" >
@@ -391,7 +392,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Titel</string>
+    <string>Title</string>
    </property>
   </action>
   <action name="ViewColumnsUsernameAction" >
@@ -399,7 +400,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Benutzername</string>
+    <string>Username</string>
    </property>
   </action>
   <action name="ViewColumnsUrlAction" >
@@ -415,7 +416,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Passwort</string>
+    <string>Password</string>
    </property>
   </action>
   <action name="ViewColumnsCommentAction" >
@@ -423,7 +424,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Kommentar</string>
+    <string>Comment</string>
    </property>
   </action>
   <action name="ViewColumnsExpireAction" >
@@ -431,7 +432,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Ablaufdatum</string>
+    <string>Expires</string>
    </property>
   </action>
   <action name="ViewColumnsCreationAction" >
@@ -439,7 +440,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Erstellungsdatum</string>
+    <string>Creation</string>
    </property>
   </action>
   <action name="ViewColumnsLastChangeAction" >
@@ -447,7 +448,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Letzte Änderung</string>
+    <string>Last Change</string>
    </property>
   </action>
   <action name="ViewColumnsLastAccessAction" >
@@ -455,7 +456,7 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Letzter Zugriff</string>
+    <string>Last Access</string>
    </property>
   </action>
   <action name="ViewColumnsAttachmentAction" >
@@ -463,28 +464,33 @@
     <bool>true</bool>
    </property>
    <property name="text" >
-    <string>Anhang</string>
+    <string>Attachment</string>
    </property>
   </action>
   <action name="ExtrasSettingsAction" >
    <property name="text" >
-    <string>Einstellungen...</string>
+    <string>Settings...</string>
+   </property>
+  </action>
+  <action name="HelpAboutAction" >
+   <property name="text" >
+    <string>About...</string>
    </property>
   </action>
  </widget>
  <pixmapfunction></pixmapfunction>
  <customwidgets>
   <customwidget>
-   <class>KeepassGroupView</class>
+   <class>KeepassEntryView</class>
    <extends>QTreeWidget</extends>
-   <header>../../src/lib/GroupView.h</header>
+   <header>../../src/lib/EntryView.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>
   <customwidget>
-   <class>KeepassEntryView</class>
+   <class>KeepassGroupView</class>
    <extends>QTreeWidget</extends>
-   <header>../../src/lib/EntryView.h</header>
+   <header>../../src/lib/GroupView.h</header>
    <container>0</container>
    <pixmap></pixmap>
   </customwidget>

src/forms/PasswordDlg.ui

@@ -101,7 +101,7 @@
     <item>
      <widget class="QPushButton" name="ButtonCancel" >
       <property name="text" >
-       <string>Abbrechen</string>
+       <string>Cancel</string>
       </property>
      </widget>
     </item>
@@ -125,7 +125,7 @@
     </sizepolicy>
    </property>
    <property name="text" >
-    <string>Geben Sie das Passwort ein oder wählen Sie eine Schlüsseldatei.</string>
+    <string>Enter a Password and/or choose a key file.</string>
    </property>
   </widget>
   <widget class="Q3GroupBox" name="groupframe" >
@@ -146,7 +146,7 @@
     </sizepolicy>
    </property>
    <property name="title" >
-    <string>Schlüssel</string>
+    <string>Key</string>
    </property>
    <property name="orientation" >
     <enum>Qt::Vertical</enum>
@@ -178,7 +178,7 @@
         </sizepolicy>
        </property>
        <property name="text" >
-        <string>Passwort:</string>
+        <string>Password:</string>
        </property>
       </widget>
      </item>
@@ -221,7 +221,7 @@
         </sizepolicy>
        </property>
        <property name="text" >
-        <string>Schlüsseldatei oder Datenträger:</string>
+        <string>Key file or directory:</string>
        </property>
       </widget>
      </item>
@@ -248,10 +248,10 @@
         </sizepolicy>
        </property>
        <property name="text" >
-        <string>W&amp;ählen...</string>
+        <string>&amp;Browse...</string>
        </property>
        <property name="shortcut" >
-        <string>Alt+Ä</string>
+        <string>Alt+B</string>
        </property>
       </widget>
      </item>
@@ -284,7 +284,7 @@
         </sizepolicy>
        </property>
        <property name="text" >
-        <string>Passwort UND Schlüsseldatei benutzen</string>
+        <string>Use Password AND Key File</string>
        </property>
       </widget>
      </item>

src/forms/PasswordGenDlg.ui

@@ -33,7 +33,7 @@
       </size>
     </property>
     <property name="windowTitle" >
-      <string>Passwort Generator</string>
+      <string>Password Generator</string>
     </property>
     <widget class="Q3ProgressBar" name="Progress_Quali" >
       <property name="geometry" >
@@ -94,7 +94,7 @@
         </rect>
       </property>
       <property name="text" >
-        <string>Akzep&amp;tieren</string>
+        <string>Accep&amp;t</string>
       </property>
     </widget>
     <widget class="QPushButton" name="Button_Cancel" >
@@ -107,7 +107,7 @@
         </rect>
       </property>
       <property name="text" >
-        <string>Abbre&amp;chen</string>
+        <string>&amp;Cancel</string>
       </property>
     </widget>
     <widget class="QPushButton" name="ButtonGenerate" >
@@ -120,7 +120,7 @@
         </rect>
       </property>
       <property name="text" >
-        <string>Generieren</string>
+        <string>Generate</string>
       </property>
     </widget>
     <widget class="QLabel" name="textLabel4" >
@@ -133,7 +133,7 @@
         </rect>
       </property>
       <property name="text" >
-        <string>Neues Passwort:</string>
+        <string>New Password:</string>
       </property>
     </widget>
     <widget class="QLabel" name="textLabel5" >
@@ -146,7 +146,7 @@
         </rect>
       </property>
       <property name="text" >
-        <string>Qualität:</string>
+        <string>Quality:</string>
       </property>
     </widget>
     <widget class="Line" name="line3" >
@@ -175,7 +175,7 @@
         </rect>
       </property>
       <property name="title" >
-        <string>Optionen</string>
+        <string>Options</string>
       </property>
       <widget class="QLineEdit" name="Edit_chars" >
         <property name="geometry" >
@@ -216,10 +216,10 @@
           </rect>
         </property>
         <property name="text" >
-          <string>Gro&amp;ßbuchstaben</string>
+          <string>&amp;Upper Letters</string>
         </property>
         <property name="shortcut" >
-          <string>Alt+ß</string>
+          <string>Alt+U</string>
         </property>
         <property name="checked" >
           <bool>true</bool>
@@ -235,10 +235,10 @@
           </rect>
         </property>
         <property name="text" >
-          <string>&amp;Kleinbuchstaben</string>
+          <string>&amp;Lower Letters</string>
         </property>
         <property name="shortcut" >
-          <string>Alt+K</string>
+          <string>Alt+L</string>
         </property>
         <property name="checked" >
           <bool>true</bool>
@@ -254,10 +254,10 @@
           </rect>
         </property>
         <property name="text" >
-          <string>&amp;Zahlen</string>
+          <string>&amp;Numbers</string>
         </property>
         <property name="shortcut" >
-          <string>Alt+Z</string>
+          <string>Alt+N</string>
         </property>
         <property name="checked" >
           <bool>true</bool>
@@ -273,7 +273,7 @@
           </rect>
         </property>
         <property name="text" >
-          <string>S&amp;onderzeichen</string>
+          <string>&amp;Special Characters</string>
         </property>
         <property name="checked" >
           <bool>true</bool>
@@ -289,7 +289,7 @@
           </rect>
         </property>
         <property name="text" >
-          <string>Bindestriche</string>
+          <string>Minus</string>
         </property>
       </widget>
       <widget class="QCheckBox" name="checkBox7" >
@@ -302,10 +302,10 @@
           </rect>
         </property>
         <property name="text" >
-          <string>&amp;Unterstriche</string>
+          <string>U&amp;nderline</string>
         </property>
         <property name="shortcut" >
-          <string>Alt+U</string>
+          <string>Alt+N</string>
         </property>
       </widget>
       <widget class="QCheckBox" name="checkBox8" >
@@ -318,10 +318,10 @@
           </rect>
         </property>
         <property name="text" >
-          <string>h&amp;öhere ANSI-Zeichen</string>
+          <string>h&amp;igher ANSI-Characters</string>
         </property>
         <property name="shortcut" >
-          <string>Alt+ö</string>
+          <string>Alt+H</string>
         </property>
       </widget>
       <widget class="QRadioButton" name="Radio_2" >
@@ -334,10 +334,10 @@
           </rect>
         </property>
         <property name="text" >
-          <string>&amp;nur folgende Zeichen benutzen:</string>
+	<string>Use &amp;only following characters:</string>
         </property>
         <property name="shortcut" >
-          <string>Alt+N</string>
+          <string>Alt+O</string>
         </property>
       </widget>
       <widget class="QLabel" name="textLabel1" >
@@ -350,7 +350,7 @@
           </rect>
         </property>
         <property name="text" >
-          <string>Zeichenanzahl:</string>
+          <string>Length:</string>
         </property>
       </widget>
       <widget class="QCheckBox" name="Check_strongrandom" >
@@ -363,7 +363,7 @@
           </rect>
         </property>
         <property name="text" >
-          <string>&quot;/dev/rando&amp;m&quot; nutzen (empfohlen)</string>
+          <string>Use &quot;/dev/rando&amp;m&quot;</string>
         </property>
         <property name="shortcut" >
           <string>Alt+M</string>
@@ -382,10 +382,10 @@
           </rect>
         </property>
         <property name="text" >
-          <string>folgende Zeichengruppen &amp;verwenden:</string>
+		<string>Use follo&amp;wing character groups:</string>
         </property>
         <property name="shortcut" >
-          <string>Alt+V</string>
+          <string>Alt+W</string>
         </property>
       </widget>
       <widget class="QCheckBox" name="checkBox5" >
@@ -398,10 +398,10 @@
           </rect>
         </property>
         <property name="text" >
-          <string>&amp;Leerzeichen</string>
+		<string>White &amp;Spaces</string>
         </property>
         <property name="shortcut" >
-          <string>Alt+L</string>
+          <string>Alt+S</string>
         </property>
       </widget>
     </widget>
@@ -427,9 +427,4 @@
     <tabstop>ButtonOK</tabstop>
     <tabstop>Button_Cancel</tabstop>
   </tabstops>
-  <images>
-    <image name="image0" >
-      <data format="XPM.GZ" length="4833" >789c8597596f23470e80dfe75718c3b7c182e9eabb11ec834fc9873cbeaf601fc86ec9966df994cfc5fef794483633934d10c836fcb9582cde55fee5dbd2d9de68e9db2f5f9ee7349fb64bed153d2d7deb5e66b38fdffef3efff7ef99aa64b8baf2c5b4abffeebcb57dc5c6a9720499290640b8613e110ff22eb941b07657e7256f90be742e4a7c6a9ed076791c7a1732efbd784d3f817615a71167db0e55c0a17ce95c88f8ced3c7e74d6f306cea29fd159f583b3e8a75367d18f5bce8df0b63389be67e3ccfcd97716fd78e22cfaf1d459edefedcbedbc63e75af4cf85b33edeb8616cfef1b5b39eb7e72cf6c28b7166fb53678df7b5b3fadf388b3d503a8b3d40c6b9eaa35767d9cf37c6a5e53f73d6f3769d55bedf5f2789ac6bfcf2de1fda33ce4cdfbb716eeb6fce1acf1de3c2f2bbe7acf573605cdafe2b67f5efd359f20bb97165febe38b3c453fd2bfa7cd0a67165fea97c9db416ff1de3b1e9d77a6d12567bf8c159ed9d1ab7969fc2b8d378e2ba304579c93769bd719457fd524f2184cae221f51bd250a8fd3c35ae4cfec1b8b6fa06e3c6eaffc859d651f215b2d0c7efdab8327b969d459e9e8d7bfd57c68df587c43be4c1e20b685c1b9f0b17c1e283cfce927f96f911ca40d63fcbce7afebd31eb3a91b3fa37376ead9e64dea5759606a94f546eb23499883d9bc69932bef4acf22cf594725c1f8bfca9b3c8d3aa711e82c82bb73de3817111a4fe2171d67e1a1b97ba8e87ce5a8f12bfb48b2cfae8ceb85206894f9666135bff2e5c45d6fae894a3393a3f5be13aaeb7729eca4ff2d6ce3f5b701ef2b1c95f0aa7715dfb4de657519675d0fc8d8c9ba0f527f12faab234fd8fc695f1ab716dfa3f84ebb2089dec5f779678d381711d74beae398b7f540b3751bfd6e39ab1c9033b6bbd07e326687dcb3c2da8ecf47cfa301e9bbe37e389c94b3c0a2edba0f5f361dc194b3c8b36eed77acf9c453fab7f6d95587e6e8d83c957c25dc9668fdc5fc538b2c6e3a6e754e7adcc836252b6a9d69bccffb2ad535d67e98fb2ab538befaab3e8439947e5b84e82f6ffa17165f1bd7096fcc1ccb8b67a981b375a0f20f92d2775b078493dd54c75aaef0de9dfba75167fea2eb2f683dc5771388d753fbe396b7fca7c6b52ea2c5e57ce621fcbfdd26464f1812767ed8f63e3ced665de34c464fe9e1bb3d5b3f45bc3dca67a7fc9fba7697b46a9bf66cc13cb8fcc8b66c2960f3832b6f3988dad1e2828b799c53371d6f9766b9c5b7f4afe286983f5c3aeb3be177ace6c1ecc9cb51f6a678def8a7169f351fca710f5a93d9db3d64febacf9981aa76a2f5e3b6b7d5d1af7f6df3aebfb67e4acf93f72d6f972675cd83c7d77d67cac3bebfdfce9acf7eb87b3c66b665cdabc5feed9f44bfd51caade59395dbc4fc3f33cecc9f9b9e35bf786fdccfffc459e7ffc059eb7fe2acefcfd459df13dbceda5f4367bddffed8affdf0665c243a6f769c351f6367f51f7ad6fcefcf9dd57e72567fd959e3dd3a6bbc3b677daf34ce6affadb3dadbdb57263a5f46ce7adf8e9dd5dededfbe5e2f9cb5de5b678df7bb71a5fa59f767dccf77cd57d6f7136c185b7e79d359f3159cf53df7e8acf19e19f7f57ee5acef9b0d67f5b733b6fa844b63f38f07ceea9fcc3fca5b9bef58199b3dbce5acefa53567bd6fee8c73d54f95b3fa3b34b6fcc3b3b3f6dba1b3f6afe6a788fb6bad9f1f3f08f19b90b18ddff0f3dafefc2fe4bb284948f1b7f1e2e73fca4ff012af708ad77883b77f2f8f33bc8b9aeff1011ff1099f718e2ff88a6ff88e1ff8196da33fc92fe30aaee21aaee3060e70889bb885dbb88323dc8d7a407df941be8dd2dfa3ec5e94dac7033cc4233cc6133cc5333cc78bffb327c18029669863812556d1ef1a9ba8168080a1850ec608daaf30814bb882296ec035dc486426700b33b8837b78c0213cc2133ce367af3f7a93c01c5e700b5ee10d6fe11d093ee01396610556f104d6601d36a2d77abf0da2f41036610bb6b1841d18c12e7c873dd887033884233886133885b318297d3fc558e114cee1021208d1e01432c8a180122aa8e3c5190f2322c63bb507995aea62bc37698c9f34a14bba822d9ad235ddd02dcde80e87744f0f7fc823d1233de1363d634d737aa1577aa3ebf8047ba70ffaa4655aa1555aa375b37f0c298e6923ca0fb0a1212cd3266dd136edd08876e93bedd13e1dd0211d997e88f6031dd3099d624e67744e17f15f8b40296594cb273ef61632aa5ff34515d5d43032707c19449fd6e993db283b8217ee62fc0630fa31bf1cdf037c493bb1724ef98a162d30e56bcae185467cc3b731dfa0f935f919dff13daef1033ff2133fc77d039e73d41da55ff90d268b8afba17ea27d30a18edff9833f7999577895d7a88421aff31b6fc0e04ff5c6314acc031ef2266cc4c7ce036ff12ca66a10ff75d95eacfd2ccf3b0bfd38e651ac93f7d83b77f84e47d1e6f1222e0bf9c5ef3ff7a3f690766f4ffd0490aa85affffbf5cbef985d44a8</data>
-    </image>
-  </images>
 </ui>

src/forms/SearchDlg.ui

@@ -1,7 +1,7 @@
 <ui version="4.0" >
- <author></author>
+  <author/>
- <comment></comment>
+  <comment/>
- <exportmacro></exportmacro>
+  <exportmacro/>
   <class>Search_Dlg</class>
   <widget class="QDialog" name="Search_Dlg" >
     <property name="geometry" >
@@ -33,7 +33,7 @@
       </size>
     </property>
     <property name="windowTitle" >
-   <string>Suche...</string>
+      <string>Search...</string>
     </property>
     <widget class="QLabel" name="textLabel1" >
       <property name="geometry" >
@@ -45,7 +45,7 @@
         </rect>
       </property>
       <property name="text" >
-    <string>Suchbegriff:</string>
+        <string>Search For:</string>
       </property>
     </widget>
     <widget class="QLineEdit" name="Edit_Search" >
@@ -68,10 +68,10 @@
         </rect>
       </property>
       <property name="text" >
-    <string>regul&amp;ärer Ausdruck</string>
+        <string>Regular E&amp;xpression</string>
       </property>
       <property name="shortcut" >
-    <string>Alt+Ä</string>
+        <string>Alt+X</string>
       </property>
     </widget>
     <widget class="QCheckBox" name="checkBox_Cs" >
@@ -84,10 +84,10 @@
         </rect>
       </property>
       <property name="text" >
-    <string>Gro&amp;ß- und Kleinschreibung beachten</string>
+        <string>&amp;Case Sensitive</string>
       </property>
       <property name="shortcut" >
-    <string>Alt+ß</string>
+        <string>Alt+C</string>
       </property>
     </widget>
     <widget class="QLabel" name="Banner" >
@@ -116,7 +116,7 @@
         </rect>
       </property>
       <property name="title" >
-    <string>Suche nach</string>
+        <string>Include:</string>
       </property>
       <property name="orientation" >
         <enum>Qt::Vertical</enum>
@@ -131,7 +131,7 @@
           </rect>
         </property>
         <property name="text" >
-     <string>&amp;Titel</string>
+          <string>&amp;Titles</string>
         </property>
         <property name="shortcut" >
           <string>Alt+T</string>
@@ -147,10 +147,10 @@
           </rect>
         </property>
         <property name="text" >
-     <string>Benut&amp;zername</string>
+          <string>&amp;Usernames</string>
         </property>
         <property name="shortcut" >
-     <string>Alt+Z</string>
+          <string>Alt+U</string>
         </property>
       </widget>
       <widget class="QCheckBox" name="checkBox_Comment" >
@@ -163,10 +163,10 @@
           </rect>
         </property>
         <property name="text" >
-     <string>&amp;Kommentar</string>
+          <string>C&amp;omments</string>
         </property>
         <property name="shortcut" >
-     <string>Alt+K</string>
+          <string>Alt+O</string>
         </property>
       </widget>
       <widget class="QCheckBox" name="checkBox_URL" >
@@ -179,10 +179,10 @@
           </rect>
         </property>
         <property name="text" >
-     <string>&amp;URL</string>
+          <string>U&amp;RLs</string>
         </property>
         <property name="shortcut" >
-     <string>Alt+U</string>
+          <string>Alt+R</string>
         </property>
       </widget>
       <widget class="QCheckBox" name="checkBox_Attachment" >
@@ -211,7 +211,7 @@
           </rect>
         </property>
         <property name="text" >
-     <string>Pass&amp;wort</string>
+          <string>Pass&amp;words</string>
         </property>
         <property name="shortcut" >
           <string>Alt+W</string>
@@ -236,7 +236,7 @@
         </sizepolicy>
       </property>
       <property name="text" >
-    <string>Suchen</string>
+        <string>Search</string>
       </property>
     </widget>
     <widget class="QPushButton" name="Button_Close" >
@@ -249,10 +249,10 @@
         </rect>
       </property>
       <property name="text" >
-    <string>S&amp;chließen</string>
+        <string>Clo&amp;se</string>
       </property>
       <property name="shortcut" >
-    <string>Alt+C</string>
+        <string>Alt+S</string>
       </property>
     </widget>
     <widget class="QCheckBox" name="checkBox_Recursive" >
@@ -265,19 +265,19 @@
         </rect>
       </property>
       <property name="text" >
-    <string>Untergruppen einbeziehen</string>
+        <string>Include Subgroups (recursive)</string>
       </property>
     </widget>
   </widget>
   <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
+  <pixmapfunction/>
   <customwidgets>
     <customwidget>
       <class>Q3GroupBox</class>
-   <extends></extends>
+      <extends/>
       <header>Qt3Support/Q3GroupBox</header>
       <container>1</container>
-   <pixmap></pixmap>
+      <pixmap/>
     </customwidget>
   </customwidgets>
   <tabstops>

src/forms/SettingsDlg.ui

@@ -1,7 +1,7 @@
 <ui version="4.0" >
- <author></author>
+  <author/>
- <comment></comment>
+  <comment/>
- <exportmacro></exportmacro>
+  <exportmacro/>
   <class>SettingsDialog</class>
   <widget class="QDialog" name="SettingsDialog" >
     <property name="geometry" >
@@ -25,7 +25,7 @@
       </size>
     </property>
     <property name="windowTitle" >
-   <string>Einstellungen</string>
+      <string>Settings</string>
     </property>
     <widget class="QLabel" name="Banner" >
       <property name="geometry" >
@@ -54,7 +54,7 @@
       </property>
       <widget class="QWidget" name="tab" >
         <attribute name="title" >
-     <string>Sicherhei&amp;t</string>
+          <string>Securi&amp;try</string>
         </attribute>
         <widget class="QLabel" name="textLabel1" >
           <property name="geometry" >
@@ -66,7 +66,7 @@
             </rect>
           </property>
           <property name="text" >
-      <string>Zwischenablage löschen nach:</string>
+            <string>Clear clipboard after:</string>
           </property>
         </widget>
         <widget class="QSpinBox" name="SpinBox_ClipboardTime" >
@@ -89,7 +89,7 @@
             </rect>
           </property>
           <property name="text" >
-      <string>Sekunden</string>
+            <string>Seconds</string>
           </property>
         </widget>
         <widget class="QCheckBox" name="CheckBox_ShowPasswords" >
@@ -102,16 +102,16 @@
             </rect>
           </property>
           <property name="text" >
-      <string>Passw&amp;örter standardmäßig in Klartext anzeigen</string>
+            <string>Sh&amp;ow passwords in plain text by default</string>
           </property>
           <property name="shortcut" >
-      <string>Alt+Ö</string>
+            <string>Alt+O</string>
           </property>
         </widget>
       </widget>
       <widget class="QWidget" name="TabPage" >
         <attribute name="title" >
-     <string>E&amp;rscheinungsbild</string>
+          <string>Appea&amp;rance</string>
         </attribute>
         <widget class="Q3GroupBox" name="groupBox1" >
           <property name="geometry" >
@@ -123,7 +123,7 @@
             </rect>
           </property>
           <property name="title" >
-      <string>Bannerfarbverlauf</string>
+            <string>Banner Color</string>
           </property>
           <widget class="QLabel" name="textLabel1_3" >
             <property name="geometry" >
@@ -135,7 +135,7 @@
               </rect>
             </property>
             <property name="text" >
-       <string>Farbe 1</string>
+              <string>Color 1</string>
             </property>
           </widget>
           <widget class="QLabel" name="pixmColor1" >
@@ -164,10 +164,10 @@
               </rect>
             </property>
             <property name="text" >
-       <string>&amp;ändern...</string>
+              <string>C&amp;hange...</string>
             </property>
             <property name="shortcut" >
-       <string>Alt+Ä</string>
+              <string>Alt+H</string>
             </property>
           </widget>
           <widget class="QLabel" name="textLabel3" >
@@ -180,7 +180,7 @@
               </rect>
             </property>
             <property name="text" >
-       <string>Farbe 2</string>
+              <string>Color 2</string>
             </property>
           </widget>
           <widget class="QLabel" name="pixmTextColor" >
@@ -209,7 +209,7 @@
               </rect>
             </property>
             <property name="text" >
-       <string>ändern...</string>
+              <string>Change...</string>
             </property>
             <property name="shortcut" >
               <string/>
@@ -225,7 +225,7 @@
               </rect>
             </property>
             <property name="text" >
-       <string>Textfarbe</string>
+              <string>Text Color</string>
             </property>
           </widget>
           <widget class="QLabel" name="pixmColor2" >
@@ -254,7 +254,7 @@
               </rect>
             </property>
             <property name="text" >
-       <string>ändern...</string>
+              <string>Change...</string>
             </property>
             <property name="shortcut" >
               <string/>
@@ -271,7 +271,7 @@
             </rect>
           </property>
           <property name="text" >
-      <string>Gruppenbaum beim &amp;Öffnen aufklappen</string>
+            <string>Expand group tree when opening a database</string>
           </property>
           <property name="shortcut" >
             <string>Alt+Ö</string>
@@ -280,7 +280,7 @@
       </widget>
       <widget class="QWidget" name="tab" >
         <attribute name="title" >
-     <string>S&amp;onstiges</string>
+          <string>&amp;Other</string>
         </attribute>
         <widget class="QCheckBox" name="CheckBox_OpenLast" >
           <property name="geometry" >
@@ -292,7 +292,7 @@
             </rect>
           </property>
           <property name="text" >
-      <string>zuletzt geöffnete Datei bei Programmstart &amp;öffnen</string>
+            <string>Remember last opend file</string>
           </property>
           <property name="shortcut" >
             <string>Alt+Ö</string>
@@ -308,7 +308,7 @@
             </rect>
           </property>
           <property name="text" >
-      <string>Browseraufruf:</string>
+            <string>Browser Command:</string>
           </property>
         </widget>
         <widget class="QLineEdit" name="Edit_BrowserCmd" >
@@ -349,7 +349,7 @@
         </rect>
       </property>
       <property name="text" >
-    <string>Abbre&amp;chen</string>
+        <string>&amp;Cancel</string>
       </property>
       <property name="shortcut" >
         <string>Alt+C</string>
@@ -357,14 +357,14 @@
     </widget>
   </widget>
   <layoutdefault spacing="6" margin="11" />
- <pixmapfunction></pixmapfunction>
+  <pixmapfunction/>
   <customwidgets>
     <customwidget>
       <class>Q3GroupBox</class>
-   <extends></extends>
+      <extends/>
       <header>Qt3Support/Q3GroupBox</header>
       <container>1</container>
-   <pixmap></pixmap>
+      <pixmap/>
     </customwidget>
   </customwidgets>
   <tabstops>

src/forms/SimplePasswordDlg.ui

@@ -1,7 +1,7 @@
-<ui version="4.0" stdsetdef="1" >
+<ui stdsetdef="1" version="4.0" >
-  <author></author>
+  <author/>
-  <comment></comment>
+  <comment/>
-  <exportmacro></exportmacro>
+  <exportmacro/>
   <class>SimplePasswordDialog</class>
   <widget class="QDialog" name="SimplePasswordDialog" >
     <property name="geometry" >
@@ -33,7 +33,7 @@
       </size>
     </property>
     <property name="windowTitle" >
-      <string>Passworteingabe</string>
+      <string>Enter your Password</string>
     </property>
     <widget class="QLabel" name="textLabel1" >
       <property name="geometry" >
@@ -45,7 +45,7 @@
         </rect>
       </property>
       <property name="text" >
-        <string>Passwort:</string>
+        <string>Password:</string>
       </property>
     </widget>
     <widget class="QLineEdit" name="EditPassword" >
@@ -84,7 +84,7 @@
         </rect>
       </property>
       <property name="text" >
-        <string>Abbre&amp;chen</string>
+        <string>&amp;Cancel</string>
       </property>
       <property name="shortcut" >
         <string>Alt+C</string>

src/import/Import_KWalletXml.cpp

@@ -28,14 +28,14 @@ using namespace std;
 bool Import_KWalletXml::importFile(QString FileName,PwDatabase* pwm,QString& err){
 QFile file(FileName);
 if(!file.exists()){
-	err+=QObject::trUtf8("Datei nicht gefunden");
+	err+=QObject::tr("File not found.");
 	return false;}
 if(!file.open(QIODevice::ReadOnly)){
-	err+=QObject::trUtf8("Datei konnte nicht geöffnet werden");
+	err+=QObject::tr("Could not open file.");
 	return false;}
 int len=file.size();
 if(len==0){
-	err+=QObject::trUtf8("Datei ist leer");
+	err+=QObject::tr("File is empty.");
 	return false;}
 Q_UINT8* buffer=new Q_UINT8[len];
 file.readBlock((char*)buffer,len);
@@ -46,25 +46,25 @@ int col,line;
 if(!doc.setContent(QString::fromUtf8((char*)buffer,len),false,&xmlerr,&line,&col)){
 	cout << "Import_PwManager::parseXmlContent():" << endl;
 	cout << (xmlerr+" (Line:%1 Column:%2)").arg(line).arg(col).ascii() << endl;
-	err+=QObject::trUtf8("Ungültiges XML-Dokument");
+	err+=QObject::tr("Invalid XML file (see stdout for details).");
 	delete [] buffer;
 	return false;}
 delete [] buffer;
 QDomElement root=doc.documentElement();
-if(root.tagName()!="wallet"){err+=QObject::trUtf8("Ungültiges XML-Dokument"); return false;}
+if(root.tagName()!="wallet"){err+=QObject::tr("Invalid XML file."); return false;}
 QDomNodeList groups=root.elementsByTagName("folder");
-if(!groups.length()){err+=QObject::trUtf8("Dokument enthält keine Daten"); return false;}
+if(!groups.length()){err+=QObject::tr("Document does not contain data."); return false;}
 for(int i=0;i<groups.length();i++){
-	if(!groups.item(i).isElement()){err+=QObject::trUtf8("Ungültiges XML-Dokument"); return false;}
+	if(!groups.item(i).isElement()){err+=QObject::tr("Invalid XML file."); return false;}
 	QDomElement CurrGroup=groups.item(i).toElement();
-	if(!CurrGroup.hasAttribute("name")){err+=QObject::trUtf8("Ungültiges XML-Dokument"); return false;}
+	if(!CurrGroup.hasAttribute("name")){err+=QObject::tr("Invalid XML file."); return false;}
  	CGroup* NewGroup=pwm->addGroup(NULL);
 	NewGroup->Name=CurrGroup.attribute("name");
 	QDomNodeList entries=CurrGroup.elementsByTagName("password");
 	for(int j=0;j<entries.length();j++){
-		if(!entries.item(j).isElement()){err+=QObject::trUtf8("Ungültiges XML-Dokument"); return false;}
+		if(!entries.item(j).isElement()){err+=QObject::tr("Invalid XML file."); return false;}
 		QDomElement CurrEntry=entries.item(j).toElement();
-		if(!CurrEntry.hasAttribute("name")){err+=QObject::trUtf8("Ungültiges XML-Dokument"); return false;}
+		if(!CurrEntry.hasAttribute("name")){err+=QObject::tr("Invalid XML file."); return false;}
 		CEntry* NewEntry=pwm->addEntry();
 		NewEntry->Title=CurrEntry.attribute("name");
 		NewEntry->GroupID=NewGroup->ID;
@@ -78,45 +78,3 @@ pwm->CryptoAlgorithmus=ALGO_AES;
 pwm->KeyEncRounds=6000;
 return true;
 }
-
-
-// unvollständiger Schnippsel zum Lesen des Binärformats
-/*
-QFile file(FileName);
-if(!file.exists()){
-	err+=QObject::trUtf8("Datei nicht gefunden");
-	return false;}
-if(!file.open(IO_ReadOnly)){
-	err+=QObject::trUtf8("Datei konnte nicht geöffnet werden");
-	return false;}
-int len=file.size();
-int offset=0;
-if(len<48){
-	err+=QObject::trUtf8("Unerwartete Dateilänge");
-	return false;}
-Q_UINT8* buffer=new Q_UINT8[len];
-int df=file.readBlock((char*)buffer,len);
-file.close();
-
-if(memcmp(buffer,"KWALLET\n\r\0\r\n",12)){
-	err+=QObject::trUtf8("Keine gültige KWallet-Datei");
-	return false;}
-offset+=12;
-MajorVersion=buffer[offset];
-offset++;
-MinorVersion=buffer[offset];
-offset++;
-if(MajorVersion != 0 || MinorVersion !=0){
-	err+=QObject::trUtf8("Nicht unterstützte Format Version");
-	return false;}
-CryptAlgo=buffer[offset];
-offset++;
-if(CryptAlgo != 0){
-	err+=QObject::trUtf8("Nicht unterstützter Verschlüsselungsalgorithmus");
-	return false;}
-HashAlgo=buffer[offset];
-offset++;
-if(HashAlgo != 0){
-	err+=QObject::trUtf8("Nicht unterstützter Hash-Algorithmus");
-	return false;}
-*/

src/import/Import_PwManager.cpp

@@ -33,33 +33,33 @@ QFile file(filename);
 char* buffer=NULL;
 int offset=0;
 int len=0;
-if(!file.exists()){err+=QObject::trUtf8("Die angegebene Datei existiert nicht."); return false;}
+if(!file.exists()){err+=QObject::tr("File not found."); return false;}
-if(!file.open(QIODevice::ReadOnly)){err+=QObject::trUtf8("Datei konnte nicht geöffnet werden."); return false;}
+if(!file.open(QIODevice::ReadOnly)){err+=QObject::tr("Could not open file."); return false;}
 if(len=file.size()) buffer=new char[len];
-else {err+=QObject::trUtf8("Datei ist leer"); return false;}
+else {err+=QObject::tr("Datei ist leer"); return false;}
 file.readBlock(buffer,len);
 file.close();
 if(QString::fromAscii(buffer,17)!="PWM_PASSWORD_FILE")
-  {err+=QObject::trUtf8("Keine gültige PwManager-Datei"); return false;}
+  {err+=QObject::tr("File is no valid PwManager file."); return false;}
 offset+=17;
 if(buffer[offset]!=0x05)
- {err+=QObject::trUtf8("Nicht unterstützte Version"); return false;}
+ {err+=QObject::tr("Unsupported file version."); return false;}
 offset++;
 if(buffer[offset]!=0x01)
- {err+=QObject::trUtf8("Nicht unterstützter Hash-Algorithmus"); return false;}
+ {err+=QObject::tr("Unsupported hash algorithm."); return false;}
 offset++;
 if(buffer[offset]!=0x01)
- {err+=QObject::trUtf8("Nicht unterstützter Hash-Algorithmus"); return false;}
+ {err+=QObject::tr("Unsupported hash algorithm."); return false;}
 offset++;
 if(buffer[offset]!=0x01)
- {err+=QObject::trUtf8("Nicht unterstützter Verschlüsselungs-Algorithmus"); return false;}
+ {err+=QObject::tr("Unsupported encryption algorithm."); return false;}
 offset++;
 if(buffer[offset]==0x00)Compression=0;
 if(buffer[offset]==0x01)Compression=1;
 if(buffer[offset]==0x02)Compression=2;
   ///@TODO Compression
   if(buffer[offset])
-  {err+=QObject::trUtf8("Komprimierte PwManager-Dateien werden nicht unterstützt"); return false;}
+  {err+=QObject::tr("Compressed files are not supported yet."); return false;}
 offset++;
 if(buffer[offset]==0x00)KeyFlag=true;
 else KeyFlag=false;
@@ -84,7 +84,7 @@ memcpy(Key,password.ascii(),pwlen);
   sha.GetHash((unsigned char*)key_hash);
   if(memcmp(key_hash,KeyHash,20)){
 	delete[] Key; delete [] key_hash; delete [] buffer;
-	err+=QObject::trUtf8("Falsches Passwort");
+	err+=QObject::tr("Wrong password.");
 	return false;
 }
 delete [] key_hash;
@@ -99,14 +99,14 @@ delete [] buffer;
   sha.GetHash((unsigned char*)content_hash);
   if(memcmp(content_hash,DataHash,20)){
 	delete [] content_hash; delete [] xml;
-	err+=QObject::trUtf8("Dateiinhalt ungültig (Hash-Test fehlgeschlagen)");
+	err+=QObject::tr("File is damaged (hash test failed).");
 	return false;
 }
 delete[] content_hash;
 
 if(!parseXmlContent((char*)xml)){
 	delete [] xml;
-	err+=QObject::trUtf8("Ungültiger XML-Inhalt"); return false;}
+	err+=QObject::tr("Invalid XML data (see stdout for details)."); return false;}
 return true;
 }
 
@@ -120,7 +120,7 @@ if(!db.setContent(QString::fromUtf8(content,strlen(content)-1),false,&err,&line,
 	return false;}
 QDomElement root=db.documentElement();
 if(root.tagName()!="P")return false;
-//Kommentar und Kategorie haben das selbe Tag "c"
+//Achtung! Kommentare und Kategorien haben das selbe Tag "c"
 if(!root.elementsByTagName("c").item(0).isElement())return false;
 QDomElement groups=root.elementsByTagName("c").item(0).toElement();
 

src/lib/EntryView.cpp

@@ -192,25 +192,25 @@ void KeepassEntryView::updateColumns(){
 setColumnCount(0);
 QStringList cols;
 if(config.Columns[0]){
- cols << trUtf8("Titel");}
+ cols << tr("Title");}
 if(config.Columns[1]){
- cols << trUtf8("Benutzername");}
+ cols << tr("Username");}
 if(config.Columns[2]){
- cols << trUtf8("URL");}
+ cols << tr("URL");}
 if(config.Columns[3]){
- cols << trUtf8("Passwort");}
+ cols << tr("Password");}
 if(config.Columns[4]){
- cols << trUtf8("Kommentare");}
+ cols << tr("Comments");}
 if(config.Columns[5]){
- cols << trUtf8("Gültig bis");}
+ cols << tr("Expires");}
 if(config.Columns[6]){
- cols << trUtf8("Erstellung");}
+ cols << tr("Creation");}
 if(config.Columns[7]){
- cols << trUtf8("letzte Ãnderung");}
+ cols << tr("Last Change");}
 if(config.Columns[8]){
- cols << trUtf8("letzter Zugriff");}
+ cols << tr("Last Access");}
 if(config.Columns[9]){
- cols << trUtf8("Anhang");}
+ cols << tr("Attachment");}
 setHeaderLabels(cols);
 resizeColumns();
 }

src/lib/EntryView.h

@@ -17,6 +17,7 @@
  *   Free Software Foundation, Inc.,                                       *
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
+
 #ifndef _ENTRY_VIEW_H_
 #define _ENTRY_VIEW_H_
 

src/lib/GroupView.cpp

@@ -211,7 +211,7 @@ for(int i=0;i<Items.size();i++){
 }
 if(ShowSearchGroup){
  	 Items.push_back(new GroupViewItem(this));
-     Items.back()->setText(0,trUtf8("Suchergebnisse"));
+     Items.back()->setText(0,tr("Search Results"));
      Items.back()->pGroup=NULL;
      QFont f=Items.back()->font(0);
      f.setItalic(true);

src/lib/random.cpp

@@ -32,7 +32,6 @@ else{
 dev_random = fopen("/dev/urandom","r");}
 
 if (dev_random==NULL){
- qWarning(QObject::tr("/dev/random konnte nicht geöffnet werden - nutze Standardbibliothek (stdlib)")+"\n");
  srand(QTime(0,0,0).secsTo(QTime::currentTime()));
  for(int i=0;i<NumBlocks*BlockSize;i++){
 	Q_UINT8 rnd=rand()%256;

src/main.cpp

@@ -121,7 +121,7 @@ if(config.Language!="_DEUTSCH_"){
   else app->installTranslator(translator);
 }
 
-DateTimeFormat=QObject::trUtf8("dd'.'MM'.'yy' 'hh':'mm");
+DateTimeFormat=QObject::tr("dd'.'MM'.'yy' 'hh':'mm");
 loadImages();
 
 SecString::generateSessionKey();
@@ -131,7 +131,7 @@ mainWin->show();
 int r=app->exec();
 delete mainWin;
 if(!config.saveToIni(IniFilename))
-	QMessageBox::warning(NULL,QObject::tr("Warnung"),QObject::trUtf8("Die Konfigurationsdatei konnte nicht gespeichert werden.Stellen Sie sicher, dass\nSie Schreibrechte im Verzeichnis ~/.keepass besitzen."),QObject::tr("OK"),"","",0.0);
+	QMessageBox::warning(NULL,QObject::tr("Warning"),QObject::tr("Could not save configuration file.\nMake sure you have write access to '~/.keepass'."),QObject::tr("OK"),"","",0.0);
 delete app;
 return r;
 }
@@ -201,7 +201,7 @@ browser.startDetached(cmd,args);
 void loadImg(QString name,QPixmap& Img){
 if(Img.load(AppDir+"/../share/keepass/icons/"+name)==false){
  if(Img.load(AppDir+"/share/"+name)==false){
- QMessageBox::critical(0,QObject::trUtf8("Fehler"),QObject::trUtf8("Die Datei '%1' konnte nicht gefunden werden.")
+ QMessageBox::critical(0,QObject::tr("Fehler"),QObject::tr("File '%1' could not be found.")
 				   .arg(name),QObject::tr("OK"),0,0,2,1);
  exit(1);
 }}

src/mainwindow.cpp

@@ -47,7 +47,6 @@
 #include "dialogs/EditGroupDlg.h"
 #include "dialogs/SearchDlg.h"
 #include "dialogs/ChangeKeyDlg.h"
-#include "dialogs/LanguageDlg.h"
 #include "dialogs/SettingsDlg.h"
 #include "dialogs/DatabaseSettingsDlg.h"
 #include "dialogs/PasswordDlg.h"
@@ -73,7 +72,7 @@ KeepassMainWindow::KeepassMainWindow(QWidget *parent, Qt::WFlags flags):QMainWin
   FileOpen=false;
   Clipboard=QApplication::clipboard();
   setStatusBar(new QStatusBar(this));
-  StatusBarGeneral=new QLabel(tr("Bereit"),statusBar());
+  StatusBarGeneral=new QLabel(tr("Ready"),statusBar());
   StatusBarSelection=new QLabel(statusBar());
   statusBar()->addWidget(StatusBarGeneral,30);
   statusBar()->addWidget(StatusBarSelection,70);
@@ -122,6 +121,8 @@ void KeepassMainWindow::setupConnections(){
 
    connect(ExtrasSettingsAction,SIGNAL(triggered(bool)),this,SLOT(OnExtrasSettings()));
 
+   connect(HelpAboutAction,SIGNAL(triggered()),this,SLOT(OnHelpAbout()));
+
    connect(&ClipboardTimer, SIGNAL(timeout()), this, SLOT(OnClipboardTimeOut()));
    connect(GroupView,SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),this,
 		   SLOT(OnCurrentGroupChanged(QTreeWidgetItem*,QTreeWidgetItem*)));
@@ -256,9 +257,10 @@ setStateFileModified(false);
 else{
 //ERROR
 delete db;
-if(err=="")err=trUtf8("unbekannter Fehler in PwDatabase::loadDatabase()");
+if(err=="")err=tr("Unknown error in PwDatabase::loadDatabase()");
-QMessageBox::critical(this,trUtf8("Fehler"),trUtf8("Beim öffnen der Datenbank ist ein Fehler aufgetreten:\n%1")
+QMessageBox::critical(this,tr("Error")
-				 .arg(err),trUtf8("OK"));
+						  ,tr("The following error occured while opening the database:\n%1")
+				 		  .arg(err),tr("OK"));
 }
 }
 
@@ -266,8 +268,8 @@ bool KeepassMainWindow::closeDatabase(){
 Q_ASSERT(FileOpen);
 Q_ASSERT(db!=NULL);
 if(ModFlag){
- int r=QMessageBox::question(this,trUtf8("Geänderte Datei speichern?"),
+ int r=QMessageBox::question(this,tr("Save modified file?"),
-				  trUtf8("Die aktuell geöffnete Datei wurde verändert. Sollen die Änderungen\nvor dem Schließen gespeichert werden?"),tr("Ja"),tr("Nein"),tr("Abbrechen"),2,2);
+				  tr("The current file was modified. Do you want\nto save the changes?"),tr("Yes"),tr("No"),tr("Cancel"),2,2);
  if(r==2)return false;			//Abbrechen
  if(r==0)				//Ja (Datei speichern)
   if(!OnFileSave())return false;
@@ -283,7 +285,7 @@ GroupView->Items.clear();
 SearchResults.clear();
 GroupView->ShowSearchGroup=false;
 setStateFileOpen(false);
-setCaption("Keepass Passwort-Manager");
+setCaption("KeePassX Password Manager");
 return true;
 }
 
@@ -294,7 +296,7 @@ if(FileOpen)
 db=new PwDatabase();
 CChangeKeyDlg dlg(this,db);
 if(dlg.exec()==1){
-setCaption(tr("Keepass - %1").arg(tr("[neu]")));
+setCaption(tr("KeePassX - %1").arg(tr("[neu]")));
 GroupView->db=db;
 EntryView->db=db;
 GroupView->updateItems();
@@ -309,7 +311,7 @@ else delete db;
 void KeepassMainWindow::OnFileOpen(){
 if(FileOpen)
  if(!closeDatabase())return;
-QString filename=QFileDialog::getOpenFileName(this,trUtf8("Databank öffnen..."),QDir::homePath(),"*.kdb");
+QString filename=QFileDialog::getOpenFileName(this,tr("Databank öffnen..."),QDir::homePath(),"*.kdb");
 if(filename!=QString::null){
  openDatabase(filename);
 }
@@ -401,7 +403,7 @@ if(EntryView->selectedItems().size()!=1){
  return;}
 
 CEntry& entry=*((EntryViewItem*)(EntryView->selectedItems()[0]))->pEntry;
-QString str=trUtf8("<B>Gruppe: </B>%1  <B>Titel: </B>%2  <B>Benutzername: </B>%3  <B>URL: </B><a href=%4>%4</a>  <B>Passwort: </B>%5  <B>Erstellt: </B>%6  <B>letzte Änderung: </B>%7  <B>letzter Zugriff: </B>%8  <B>gültig bis: </B>%9");
+QString str=tr("<B>Group: </B>%1  <B>Title: </B>%2  <B>Username: </B>%3  <B>URL: </B><a href=%4>%4</a>  <B>Password: </B>%5  <B>Creation: </B>%6  <B>Last Change: </B>%7  <B>LastAccess: </B>%8  <B>Expires: </B>%9");
 //todo: a "CGroup* PwDatabase::getGroup(CEntry*)" method would be a good idea
 str=str.arg(db->Groups[db->getGroupIndex(entry.GroupID)].Name).arg(entry.Title);
 
@@ -437,9 +439,9 @@ switch(EntrySelection){
     EditSaveAttachmentAction->setEnabled(false);
     EditEditEntryAction->setEnabled(false);
     EditCloneEntryAction->setEnabled(false);
-    EditCloneEntryAction->setText(trUtf8("Eintrag duplizieren"));
+    EditCloneEntryAction->setText(tr("Clone Entry"));
     EditDeleteEntryAction->setEnabled(false);
-    EditDeleteEntryAction->setText(trUtf8("Eintrag löschen"));
+    EditDeleteEntryAction->setText(tr("Delete Entry"));
     break;
  case SINGLE:
     EditPasswordToClipboardAction->setEnabled(true);
@@ -448,9 +450,9 @@ switch(EntrySelection){
     EditSaveAttachmentAction->setEnabled(true);
     EditEditEntryAction->setEnabled(true);
     EditCloneEntryAction->setEnabled(true);
-    EditCloneEntryAction->setText(trUtf8("Eintrag duplizieren"));
+    EditCloneEntryAction->setText(tr("Clone Entry"));
     EditDeleteEntryAction->setEnabled(true);
-    EditDeleteEntryAction->setText(trUtf8("Eintrag löschen"));
+    EditDeleteEntryAction->setText(tr("Delete Entry"));
     break;
  case MULTIPLE:
     EditPasswordToClipboardAction->setEnabled(false);
@@ -459,9 +461,9 @@ switch(EntrySelection){
     EditSaveAttachmentAction->setEnabled(false);
     EditEditEntryAction->setEnabled(false);
     EditCloneEntryAction->setEnabled(true);
-    EditCloneEntryAction->setText(trUtf8("Einträge duplizieren"));
+    EditCloneEntryAction->setText(tr("Clone Entries"));
     EditDeleteEntryAction->setEnabled(true);
-    EditDeleteEntryAction->setText(trUtf8("Einträge löschen"));
+    EditDeleteEntryAction->setText(tr("Delete Entries"));
     break;
  default: Q_ASSERT(false);
 }
@@ -474,9 +476,9 @@ switch(EntrySelection){
     EditSaveAttachmentAction->setEnabled(false);
     EditEditEntryAction->setEnabled(false);
     EditCloneEntryAction->setEnabled(false);
-    EditCloneEntryAction->setText(trUtf8("Eintrag duplizieren"));
+    EditCloneEntryAction->setText(tr("Clone Entry"));
     EditDeleteEntryAction->setEnabled(false);
-    EditDeleteEntryAction->setText(trUtf8("Eintrag löschen"));
+    EditDeleteEntryAction->setText(tr("Delete Entry"));
     break;
  case SINGLE:
     EditPasswordToClipboardAction->setEnabled(true);
@@ -485,9 +487,9 @@ switch(EntrySelection){
     EditSaveAttachmentAction->setEnabled(true);
     EditEditEntryAction->setEnabled(true);
     EditCloneEntryAction->setEnabled(false);
-    EditCloneEntryAction->setText(trUtf8("Eintrag duplizieren"));
+    EditCloneEntryAction->setText(tr("Clone Entry"));
     EditDeleteEntryAction->setEnabled(true);
-    EditDeleteEntryAction->setText(trUtf8("Eintrag löschen"));
+    EditDeleteEntryAction->setText(tr("Delete Entry"));
     break;
  case MULTIPLE:
     EditPasswordToClipboardAction->setEnabled(false);
@@ -496,9 +498,9 @@ switch(EntrySelection){
     EditSaveAttachmentAction->setEnabled(false);
     EditEditEntryAction->setEnabled(false);
     EditCloneEntryAction->setEnabled(false);
-    EditCloneEntryAction->setText(trUtf8("Einträge duplizieren"));
+    EditCloneEntryAction->setText(tr("Clone Entries"));
     EditDeleteEntryAction->setEnabled(true);
-    EditDeleteEntryAction->setText(trUtf8("Einträge löschen"));
+    EditDeleteEntryAction->setText(tr("Delete Entries"));
     break;
  default: Q_ASSERT(false);
 }
@@ -511,17 +513,17 @@ if(db->filename==QString())
 if(db->saveDatabase())
   setStateFileModified(false);
 else{
-  showErrMsg(trUtf8("Die Datei konnte nicht gespeichert werden.\n%1").arg(db->getError()));
+  showErrMsg(tr("File could not be saved.\n%1").arg(db->getError()));
   return false;  
 }
 return true;
 }
 
 bool KeepassMainWindow::OnFileSaveAs(){
-QString filename=QFileDialog::getSaveFileName(this,trUtf8("Datenbank speichern unter..."),QDir::homePath(),"*.kdb"); 
+QString filename=QFileDialog::getSaveFileName(this,tr("Save Database As..."),QDir::homePath(),"*.kdb"); 
 if(filename==QString()) return false;
 db->filename=filename;
-setCaption(tr("Keepass - %1").arg(db->filename));
+setCaption(tr("KeePassX - %1").arg(db->filename));
 return OnFileSave();
 }
 
@@ -789,7 +791,11 @@ else
 void KeepassMainWindow::OnExtrasSettings(){
 CSettingsDlg dlg(this,"SettingsDlg");
 dlg.exec();
+}
 
+void KeepassMainWindow::OnHelpAbout(){
+CAboutDialog dlg(this,"AboutDlg");
+dlg.exec();
 }
 
 void KeepassMainWindow::OnViewShowToolbar(bool show){

src/mainwindow.h

@@ -87,6 +87,7 @@ private slots:
    void OnUsernPasswVisibilityChanged(bool hide);
    void OnFileModified();
    void OnExtrasSettings();
+   void OnHelpAbout();
 
 private:
  enum SelectionState{NONE,SINGLE,MULTIPLE,SEARCHGROUP};

src/src.pro

@@ -15,7 +15,6 @@ macx{ target.path = /Applications
 FORMS += forms/EditGroupDlg.ui \
          forms/SearchDlg.ui \
          forms/AboutDlg.ui \
-         forms/LanguageDlg.ui \
          forms/SettingsDlg.ui \
          forms/ChangeKeyDlg.ui \
          forms/MainWindow.ui \
@@ -24,8 +23,9 @@ FORMS += forms/EditGroupDlg.ui \
          forms/PasswordDlg.ui \
          forms/EditEntryDlg.ui \
          forms/PasswordGenDlg.ui 
-TRANSLATIONS += translations/english.ts \
+TRANSLATIONS += translations/keepass-de_DE.ts \
-                translations/russian.ts 
+		translations/keepass-ru_Ru.ts \
+                translations/keepass-xx_XX.ts
 HEADERS += lib/IniReader.h \
            lib/UrlLabel.h \
            mainwindow.h \
@@ -44,7 +44,6 @@ HEADERS += lib/IniReader.h \
            dialogs/EditGroupDlg.h \
            dialogs/SearchDlg.h \
            dialogs/ChangeKeyDlg.h \
-           dialogs/LanguageDlg.h \
            dialogs/SettingsDlg.h \
            dialogs/DatabaseSettingsDlg.h \
            dialogs/PasswordDlg.h \
@@ -79,7 +78,6 @@ SOURCES += lib/IniReader.cpp \
            dialogs/EditGroupDlg.cpp \
            dialogs/SearchDlg.cpp \
            dialogs/ChangeKeyDlg.cpp \
-           dialogs/LanguageDlg.cpp \
            dialogs/SettingsDlg.cpp \
            dialogs/DatabaseSettingsDlg.cpp \
            dialogs/PasswordDlg.cpp \