diff -Nru keepassxc-2.2.2/CHANGELOG keepassxc-2.2.4/CHANGELOG --- keepassxc-2.2.2/CHANGELOG 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/CHANGELOG 2017-12-13 17:58:56.000000000 +0000 @@ -1,3 +1,13 @@ +2.2.4 (2017-12-13) +========================= + +- Prevent database corruption when locked [#1219] +- Fixes apply button not saving new entries [#1141] +- Switch to Consolas font on Windows for password edit [#1229] +- Multiple fixes to AppImage deployment [#1115, #1228] +- Fixes multiple memory leaks [#1213] +- Resize message close to 16x16 pixels [#1253] + 2.2.2 (2017-10-22) ========================= diff -Nru keepassxc-2.2.2/CMakeLists.txt keepassxc-2.2.4/CMakeLists.txt --- keepassxc-2.2.2/CMakeLists.txt 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/CMakeLists.txt 2017-12-13 17:58:56.000000000 +0000 @@ -49,7 +49,7 @@ set(KEEPASSXC_VERSION_MAJOR "2") set(KEEPASSXC_VERSION_MINOR "2") -set(KEEPASSXC_VERSION_PATCH "2") +set(KEEPASSXC_VERSION_PATCH "4") set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}") # Distribution info diff -Nru keepassxc-2.2.2/debian/changelog keepassxc-2.2.4/debian/changelog --- keepassxc-2.2.2/debian/changelog 2017-10-25 02:34:15.000000000 +0000 +++ keepassxc-2.2.4/debian/changelog 2017-12-14 08:44:14.000000000 +0000 @@ -1,3 +1,9 @@ +keepassxc (2.2.4-0ppa1~xenial1) xenial; urgency=medium + + * New upstream release + + -- KeePassXC Team Thu, 14 Dec 2017 09:44:08 +0100 + keepassxc (2.2.2-1~xenial1) xenial; urgency=medium * Fixed entries with empty URLs being reported to KeePassHTTP clients [#1031] diff -Nru keepassxc-2.2.2/Dockerfile keepassxc-2.2.4/Dockerfile --- keepassxc-2.2.2/Dockerfile 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/Dockerfile 2017-12-13 17:58:56.000000000 +0000 @@ -14,67 +14,49 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -FROM centos:7 +FROM ubuntu:14.04 + +ENV QT5_VERSION=59 +ENV QT5_PPA_VERSION=${QT5_VERSION}2 RUN set -x \ - && curl "https://copr.fedorainfracloud.org/coprs/bugzy/keepassxc/repo/epel-7/bugzy-keepassxc-epel-7.repo" \ - > /etc/yum.repos.d/bugzy-keepassxc-epel-7.repo + && apt-get update -y \ + && apt-get -y install software-properties-common RUN set -x \ - && curl "https://copr.fedorainfracloud.org/coprs/sic/backports/repo/epel-7/sic-backports-epel-7.repo" \ - > /etc/yum.repos.d/sic-backports-epel-7.repo + && add-apt-repository ppa:beineri/opt-qt${QT5_PPA_VERSION}-trusty \ + && add-apt-repository ppa:phoerious/keepassxc RUN set -x \ - && yum clean -y all \ - && yum upgrade -y + && apt-get update -y \ + && apt-get upgrade -y # build and runtime dependencies RUN set -x \ - && yum install -y \ - make \ - automake \ - gcc-c++ \ - cmake \ - libgcrypt16-devel \ - qt5-qtbase-devel \ - qt5-linguist \ - qt5-qttools \ - zlib-devel \ - qt5-qtx11extras \ - qt5-qtx11extras-devel \ - libXi-devel \ - libXtst-devel + && apt-get install -y \ + cmake3 \ + g++ \ + libgcrypt20-dev \ + qt${QT5_VERSION}base \ + qt${QT5_VERSION}tools \ + qt${QT5_VERSION}x11extras \ + zlib1g-dev \ + libxi-dev \ + libxtst-dev \ + mesa-common-dev \ + libyubikey-dev \ + libykpers-1-dev + +ENV CMAKE_PREFIX_PATH=/opt/qt${QT5_VERSION}/lib/cmake +ENV LD_LIBRARY_PATH=/opt/qt${QT5_VERSION}/lib +RUN set -x \ + && echo /opt/qt${QT_VERSION}/lib > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf # AppImage dependencies RUN set -x \ - && yum install -y \ - wget \ - fuse-libs - -# build libyubikey -ENV YUBIKEY_VERSION=1.13 -RUN set -x && yum install -y libusb-devel -RUN set -x \ - && wget "https://developers.yubico.com/yubico-c/Releases/libyubikey-${YUBIKEY_VERSION}.tar.gz" \ - && tar xf libyubikey-${YUBIKEY_VERSION}.tar.gz \ - && cd libyubikey-${YUBIKEY_VERSION} \ - && ./configure --prefix=/usr --libdir=/usr/lib64 \ - && make \ - && make install \ - && cd .. \ - && rm -Rf libyubikey-${YUBIKEY_VERSION}* - -# build libykpers-1 -ENV YKPERS_VERSION=1.18.0 -RUN set -x \ - && wget "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${YKPERS_VERSION}.tar.gz" \ - && tar xf ykpers-${YKPERS_VERSION}.tar.gz \ - && cd ykpers-${YKPERS_VERSION} \ - && ./configure --prefix=/usr --libdir=/usr/lib64 \ - && make \ - && make install \ - && cd .. \ - && rm -Rf ykpers-${YKPERS_VERSION}* + && apt-get install -y \ + libfuse2 \ + wget VOLUME /keepassxc/src VOLUME /keepassxc/out diff -Nru keepassxc-2.2.2/release-tool keepassxc-2.2.4/release-tool --- keepassxc-2.2.2/release-tool 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/release-tool 2017-12-13 17:58:56.000000000 +0000 @@ -264,13 +264,13 @@ } checkAppStreamInfo() { - if [ ! -f share/linux/org.keepassxc.appdata.xml ]; then + if [ ! -f share/linux/org.keepassxc.KeePassXC.appdata.xml ]; then exitError "No AppStream info file found!" fi - grep -qPzo "" share/linux/org.keepassxc.appdata.xml + grep -qPzo "" share/linux/org.keepassxc.KeePassXC.appdata.xml if [ $? -ne 0 ]; then - exitError "'share/linux/org.keepassxc.appdata.xml' has not been updated to the '${RELEASE_NAME}' release!" + exitError "'share/linux/org.keepassxc.KeePassXC.appdata.xml' has not been updated to the '${RELEASE_NAME}' release!" fi } diff -Nru keepassxc-2.2.2/share/CMakeLists.txt keepassxc-2.2.4/share/CMakeLists.txt --- keepassxc-2.2.2/share/CMakeLists.txt 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/CMakeLists.txt 2017-12-13 17:58:56.000000000 +0000 @@ -30,8 +30,8 @@ install(DIRECTORY icons/application/ DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor FILES_MATCHING PATTERN "application-x-keepassxc.png" PATTERN "application-x-keepassxc.svgz" PATTERN "status" EXCLUDE PATTERN "actions" EXCLUDE PATTERN "categories" EXCLUDE) - install(FILES linux/org.keepassxc.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) - install(FILES linux/org.keepassxc.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) + install(FILES linux/org.keepassxc.KeePassXC.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications) + install(FILES linux/org.keepassxc.KeePassXC.appdata.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo) install(FILES linux/keepassxc.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/mime/packages) endif(UNIX AND NOT APPLE) Binary files /tmp/tmpeTy0g3/wMBqIH28UH/keepassxc-2.2.2/share/icons/application/16x16/actions/message-close.png and /tmp/tmpeTy0g3/RMbdrhxJ50/keepassxc-2.2.4/share/icons/application/16x16/actions/message-close.png differ diff -Nru keepassxc-2.2.2/share/linux/org.keepassxc.appdata.xml keepassxc-2.2.4/share/linux/org.keepassxc.appdata.xml --- keepassxc-2.2.2/share/linux/org.keepassxc.appdata.xml 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/linux/org.keepassxc.appdata.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,218 +0,0 @@ - - - - org.keepassxc - KeePassXC - CC-BY-3.0 - GPL-3.0+ - keepassxc - https://keepassxc.org - - application/x-keepass2 - - Community-driven port of the Windows application “KeePass Password Safe” - -

- KeePassXC is an application for people with extremely high demands on secure - personal data management. It has a light interface, is cross-platform and - published under the terms of the GNU General Public License. -

- - - org.keepassxc.desktop - - - - https://keepassxc.org/images/screenshots/linux/screen_001.png - - - https://keepassxc.org/images/screenshots/linux/screen_002.png - - - https://keepassxc.org/images/screenshots/linux/screen_003.png - - - https://keepassxc.org/images/screenshots/linux/screen_004.png - - - https://keepassxc.org/images/screenshots/linux/screen_005.png - - - https://keepassxc.org/images/screenshots/linux/screen_006.png - - - https://keepassxc.org/images/screenshots/linux/screen_007.png - - - https://keepassxc.org/images/screenshots/linux/screen_008.png - - - https://keepassxc.org/images/screenshots/linux/screen_009.png - - - https://keepassxc.org/images/screenshots/linux/screen_010.png - - - https://keepassxc.org/images/screenshots/linux/screen_011.png - - - https://keepassxc.org/images/screenshots/linux/screen_012.png - - - https://keepassxc.org/images/screenshots/linux/screen_013.png - - - https://keepassxc.org/images/screenshots/linux/screen_014.png - - - - - - -
    -
  • Fixed entries with empty URLs being reported to KeePassHTTP clients [#1031]
    • -
  • Fixed YubiKey detection and enabled CLI tool for AppImage binary [#1100]
    • -
  • Added AppStream description [#1082]
    • -
  • Improved TOTP compatibility and added new Base32 implementation [#1069]
    • -
  • Fixed error handling when processing invalid cipher stream [#1099]
    • -
  • Fixed double warning display when opening a database [#1037]
    • -
  • Fixed unlocking databases with --pw-stdin [#1087]
    • -
  • Added ability to override QT_PLUGIN_PATH environment variable for AppImages [#1079]
    • -
  • Fixed transform seed not being regenerated when saving the database [#1068]
    • -
  • Fixed only one YubiKey slot being polled [#1048]
    • -
  • Corrected an issue with entry icons while merging [#1008]
    • -
  • Corrected desktop and tray icons in Snap package [#1030]
    • -
  • Fixed screen lock and Google fallback settings [#1029]
    • -
- - - -
    -
  • Corrected multiple snap issues [#934, #1011]
    • -
  • Corrected multiple custom icon issues [#708, #719, #994]
    • -
  • Corrected multiple Yubikey issues [#880]
    • -
  • Fixed single instance preventing load on occasion [#997]
    • -
  • Keep entry history when merging databases [#970]
    • -
  • Prevent data loss if passwords were mismatched [#1007]
    • -
  • Fixed crash after merge [#941]
    • -
  • Added configurable auto-type default delay [#703]
    • -
  • Unlock database dialog window comes to front [#663]
    • -
  • Translation and compiling fixes
    • -
- - - - -
    -
  • Added YubiKey 2FA integration for unlocking databases [#127]
    • -
  • Added TOTP support [#519]
    • -
  • Added CSV import tool [#146, #490]
    • -
  • Added KeePassXC CLI tool [#254]
    • -
  • Added diceware password generator [#373]
    • -
  • Added support for entry references [#370, #378]
    • -
  • Added support for Twofish encryption [#167]
    • -
  • Enabled DEP and ASLR for in-memory protection [#371]
    • -
  • Enabled single instance mode [#510]
    • -
  • Enabled portable mode [#645]
    • -
  • Enabled database lock on screensaver and session lock [#545]
    • -
  • Redesigned welcome screen with common features and recent databases [#292]
    • -
  • Multiple updates to search behavior [#168, #213, #374, #471, #603, #654]
    • -
  • Added auto-type fields {CLEARFIELD}, {SPACE}, {{}, {}} [#267, #427, #480]
    • -
  • Fixed auto-type errors on Linux [#550]
    • -
  • Prompt user prior to executing a cmd:// URL [#235]
    • -
  • Entry attributes can be protected (hidden) [#220]
    • -
  • Added extended ascii to password generator [#538]
    • -
  • Added new database icon to toolbar [#289]
    • -
  • Added context menu entry to empty recycle bin in databases [#520]
    • -
  • Added "apply" button to entry and group edit windows [#624]
    • -
  • Added macOS tray icon and enabled minimize on close [#583]
    • -
  • Fixed issues with unclean shutdowns [#170, #580]
    • -
  • Changed keyboard shortcut to create new database to CTRL+SHIFT+N [#515]
    • -
  • Compare window title to entry URLs [#556]
    • -
  • Implemented inline error messages [#162]
    • -
  • Ignore group expansion and other minor changes when making database "dirty" [#464]
    • -
  • Updated license and copyright information on souce files [#632]
    • -
  • Added contributors list to about dialog [#629]
    • -
- - - - -
    -
  • Bumped KeePassHTTP version to 1.8.4.2
    • -
  • KeePassHTTP confirmation window comes to foreground [#466]
    • -
- - - - -
    -
  • Fix possible overflow in zxcvbn library [#363]
    • -
  • Revert HiDPI setting to avoid problems on laptop screens [#332]
    • -
  • Set file meta properties in Windows executable [#330]
    • -
  • Suppress error message when auto-reloading a locked database [#345]
    • -
  • Improve usability of question dialog when database is already locked by a different instance [#346]
    • -
  • Fix compiler warnings in QHttp library [#351]
    • -
  • Use unified toolbar on Mac OS X [#361]
    • -
  • Fix an issue on X11 where the main window would be raised instead of closed on Alt+F4 [#362]
    • -
- - - - -
    -
  • Ask for save location when creating a new database [#302]
    • -
  • Remove Libmicrohttpd dependency to clean up the code and ensure better OS X compatibility [#317, #265]
    • -
  • Prevent Qt from degrading Wifi network performance on certain platforms [#318]
    • -
  • Visually refine user interface on OS X and other platforms [#299]
    • -
  • Remove unusable tray icon setting on OS X [#293]
    • -
  • Fix compositing glitches on Ubuntu and prevent flashing when minimizing to the tray at startup [#307]
    • -
  • Fix AppImage tray icon on Ubuntu [#277, #273]
    • -
  • Fix global menu disappearing after restoring KeePassXC from the tray on Ubuntu [#276]
    • -
  • Fix result order in entry search [#320]
    • -
  • Enable HiDPI scaling on supported platforms [#315]
    • -
  • Remove empty directories from installation target [#282]
    • -
- - - - -
    -
  • Enabled HTTP plugin build; plugin is disabled by default and limited to localhost [#147]
    • -
  • Escape HTML in dialog boxes [#247]
    • -
  • Corrected crashes in favicon download and password generator [#233, #226]
    • -
  • Increase font size of password meter [#228]
    • -
  • Fixed compatibility with Qt 5.8 [#211]
    • -
  • Use consistent button heights in password generator [#229]
    • -
- - - - -
    -
  • Show unlock dialog when using autotype on a closed database [#10, #89]
    • -
  • Show different tray icon when database is locked [#37, #46]
    • -
  • Support autotype on Windows and OS X [#42, #60, #63]
    • -
  • Add delay feature to autotype [#76, #77]
    • -
  • Add password strength meter [#84, #92]
    • -
  • Add option for automatically locking the database when minimizing the window [#57]
    • -
  • Add feature to download favicons and use them as entry icons [#30]
    • -
  • Automatically reload and merge database when the file changed on disk [#22, #33, #93]
    • -
  • Add tool for merging two databases [#22, #47, #143]
    • -
  • Add --pw-stdin commandline option to unlock the database by providing a password on STDIN [#54]
    • -
  • Add utility script for reading the database password from KWallet [#55]
    • -
  • Fix some KeePassHTTP settings not being remembered [#34, #65]
    • -
  • Make search box persistent [#15, #67, #157]
    • -
  • Enhance search feature by scoping the search to selected group [#16, #118]
    • -
  • Improve interaction between search field and entry list [#131, #141]
    • -
  • Add stand-alone password-generator [#18, #92]
    • -
  • Don't require password repetition when password is visible [#27, #92]
    • -
  • Add support for entry attributes in autotype sequences [#107]
    • -
  • Always focus password field when opening the database unlock widget [#116, #117]
    • -
  • Fix compilation errors on various platforms [#53, #126, #130]
    • -
  • Restructure and improve kdbx-extract utility [#160]
    • -
- - - - diff -Nru keepassxc-2.2.2/share/linux/org.keepassxc.desktop keepassxc-2.2.4/share/linux/org.keepassxc.desktop --- keepassxc-2.2.2/share/linux/org.keepassxc.desktop 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/linux/org.keepassxc.desktop 1970-01-01 00:00:00.000000000 +0000 @@ -1,16 +0,0 @@ -[Desktop Entry] -Name=KeePassXC -GenericName=Password Manager -GenericName[de]=Passwortverwaltung -GenericName[es]=Gestor de contraseñas -GenericName[fr]=Gestionnaire de mot de passe -GenericName[ru]=менеджер паролей -Comment=Community-driven port of the Windows application “KeePass Password Safe” -Exec=keepassxc %f -TryExec=keepassxc -Icon=keepassxc -Terminal=false -Type=Application -Version=1.0 -Categories=Utility;Security;Qt; -MimeType=application/x-keepass2; diff -Nru keepassxc-2.2.2/share/linux/org.keepassxc.KeePassXC.appdata.xml keepassxc-2.2.4/share/linux/org.keepassxc.KeePassXC.appdata.xml --- keepassxc-2.2.2/share/linux/org.keepassxc.KeePassXC.appdata.xml 1970-01-01 00:00:00.000000000 +0000 +++ keepassxc-2.2.4/share/linux/org.keepassxc.KeePassXC.appdata.xml 2017-12-13 17:58:56.000000000 +0000 @@ -0,0 +1,231 @@ + + + + org.keepassxc + KeePassXC + CC-BY-3.0 + GPL-3.0+ + keepassxc + https://keepassxc.org + + application/x-keepass2 + + Community-driven port of the Windows application “KeePass Password Safe” + +

+ KeePassXC is an application for people with extremely high demands on secure + personal data management. It has a light interface, is cross-platform and + published under the terms of the GNU General Public License. +

+ + + org.keepassxc.desktop + + + + https://keepassxc.org/images/screenshots/linux/screen_001.png + + + https://keepassxc.org/images/screenshots/linux/screen_002.png + + + https://keepassxc.org/images/screenshots/linux/screen_003.png + + + https://keepassxc.org/images/screenshots/linux/screen_004.png + + + https://keepassxc.org/images/screenshots/linux/screen_005.png + + + https://keepassxc.org/images/screenshots/linux/screen_006.png + + + https://keepassxc.org/images/screenshots/linux/screen_007.png + + + https://keepassxc.org/images/screenshots/linux/screen_008.png + + + https://keepassxc.org/images/screenshots/linux/screen_009.png + + + https://keepassxc.org/images/screenshots/linux/screen_010.png + + + https://keepassxc.org/images/screenshots/linux/screen_011.png + + + https://keepassxc.org/images/screenshots/linux/screen_012.png + + + https://keepassxc.org/images/screenshots/linux/screen_013.png + + + https://keepassxc.org/images/screenshots/linux/screen_014.png + + + + + + +
    +
  • Prevent database corruption when locked [#1219]
    • +
  • Fixes apply button not saving new entries [#1141]
    • +
  • Switch to Consolas font on Windows for password edit [#1229]
    • +
  • Multiple fixes to AppImage deployment [#1115, #1228]
    • +
  • Fixes multiple memory leaks [#1213]
    • +
  • Resize message close to 16x16 pixels [#1253]
    • +
+ + + + +
    +
  • Fixed entries with empty URLs being reported to KeePassHTTP clients [#1031]
    • +
  • Fixed YubiKey detection and enabled CLI tool for AppImage binary [#1100]
    • +
  • Added AppStream description [#1082]
    • +
  • Improved TOTP compatibility and added new Base32 implementation [#1069]
    • +
  • Fixed error handling when processing invalid cipher stream [#1099]
    • +
  • Fixed double warning display when opening a database [#1037]
    • +
  • Fixed unlocking databases with --pw-stdin [#1087]
    • +
  • Added ability to override QT_PLUGIN_PATH environment variable for AppImages [#1079]
    • +
  • Fixed transform seed not being regenerated when saving the database [#1068]
    • +
  • Fixed only one YubiKey slot being polled [#1048]
    • +
  • Corrected an issue with entry icons while merging [#1008]
    • +
  • Corrected desktop and tray icons in Snap package [#1030]
    • +
  • Fixed screen lock and Google fallback settings [#1029]
    • +
+ + + + +
    +
  • Corrected multiple snap issues [#934, #1011]
    • +
  • Corrected multiple custom icon issues [#708, #719, #994]
    • +
  • Corrected multiple Yubikey issues [#880]
    • +
  • Fixed single instance preventing load on occasion [#997]
    • +
  • Keep entry history when merging databases [#970]
    • +
  • Prevent data loss if passwords were mismatched [#1007]
    • +
  • Fixed crash after merge [#941]
    • +
  • Added configurable auto-type default delay [#703]
    • +
  • Unlock database dialog window comes to front [#663]
    • +
  • Translation and compiling fixes
    • +
+ + + + +
    +
  • Added YubiKey 2FA integration for unlocking databases [#127]
    • +
  • Added TOTP support [#519]
    • +
  • Added CSV import tool [#146, #490]
    • +
  • Added KeePassXC CLI tool [#254]
    • +
  • Added diceware password generator [#373]
    • +
  • Added support for entry references [#370, #378]
    • +
  • Added support for Twofish encryption [#167]
    • +
  • Enabled DEP and ASLR for in-memory protection [#371]
    • +
  • Enabled single instance mode [#510]
    • +
  • Enabled portable mode [#645]
    • +
  • Enabled database lock on screensaver and session lock [#545]
    • +
  • Redesigned welcome screen with common features and recent databases [#292]
    • +
  • Multiple updates to search behavior [#168, #213, #374, #471, #603, #654]
    • +
  • Added auto-type fields {CLEARFIELD}, {SPACE}, {{}, {}} [#267, #427, #480]
    • +
  • Fixed auto-type errors on Linux [#550]
    • +
  • Prompt user prior to executing a cmd:// URL [#235]
    • +
  • Entry attributes can be protected (hidden) [#220]
    • +
  • Added extended ascii to password generator [#538]
    • +
  • Added new database icon to toolbar [#289]
    • +
  • Added context menu entry to empty recycle bin in databases [#520]
    • +
  • Added "apply" button to entry and group edit windows [#624]
    • +
  • Added macOS tray icon and enabled minimize on close [#583]
    • +
  • Fixed issues with unclean shutdowns [#170, #580]
    • +
  • Changed keyboard shortcut to create new database to CTRL+SHIFT+N [#515]
    • +
  • Compare window title to entry URLs [#556]
    • +
  • Implemented inline error messages [#162]
    • +
  • Ignore group expansion and other minor changes when making database "dirty" [#464]
    • +
  • Updated license and copyright information on souce files [#632]
    • +
  • Added contributors list to about dialog [#629]
    • +
+ + + + +
    +
  • Bumped KeePassHTTP version to 1.8.4.2
    • +
  • KeePassHTTP confirmation window comes to foreground [#466]
    • +
+ + + + +
    +
  • Fix possible overflow in zxcvbn library [#363]
    • +
  • Revert HiDPI setting to avoid problems on laptop screens [#332]
    • +
  • Set file meta properties in Windows executable [#330]
    • +
  • Suppress error message when auto-reloading a locked database [#345]
    • +
  • Improve usability of question dialog when database is already locked by a different instance [#346]
    • +
  • Fix compiler warnings in QHttp library [#351]
    • +
  • Use unified toolbar on Mac OS X [#361]
    • +
  • Fix an issue on X11 where the main window would be raised instead of closed on Alt+F4 [#362]
    • +
+ + + + +
    +
  • Ask for save location when creating a new database [#302]
    • +
  • Remove Libmicrohttpd dependency to clean up the code and ensure better OS X compatibility [#317, #265]
    • +
  • Prevent Qt from degrading Wifi network performance on certain platforms [#318]
    • +
  • Visually refine user interface on OS X and other platforms [#299]
    • +
  • Remove unusable tray icon setting on OS X [#293]
    • +
  • Fix compositing glitches on Ubuntu and prevent flashing when minimizing to the tray at startup [#307]
    • +
  • Fix AppImage tray icon on Ubuntu [#277, #273]
    • +
  • Fix global menu disappearing after restoring KeePassXC from the tray on Ubuntu [#276]
    • +
  • Fix result order in entry search [#320]
    • +
  • Enable HiDPI scaling on supported platforms [#315]
    • +
  • Remove empty directories from installation target [#282]
    • +
+ + + + +
    +
  • Enabled HTTP plugin build; plugin is disabled by default and limited to localhost [#147]
    • +
  • Escape HTML in dialog boxes [#247]
    • +
  • Corrected crashes in favicon download and password generator [#233, #226]
    • +
  • Increase font size of password meter [#228]
    • +
  • Fixed compatibility with Qt 5.8 [#211]
    • +
  • Use consistent button heights in password generator [#229]
    • +
+ + + + +
    +
  • Show unlock dialog when using autotype on a closed database [#10, #89]
    • +
  • Show different tray icon when database is locked [#37, #46]
    • +
  • Support autotype on Windows and OS X [#42, #60, #63]
    • +
  • Add delay feature to autotype [#76, #77]
    • +
  • Add password strength meter [#84, #92]
    • +
  • Add option for automatically locking the database when minimizing the window [#57]
    • +
  • Add feature to download favicons and use them as entry icons [#30]
    • +
  • Automatically reload and merge database when the file changed on disk [#22, #33, #93]
    • +
  • Add tool for merging two databases [#22, #47, #143]
    • +
  • Add --pw-stdin commandline option to unlock the database by providing a password on STDIN [#54]
    • +
  • Add utility script for reading the database password from KWallet [#55]
    • +
  • Fix some KeePassHTTP settings not being remembered [#34, #65]
    • +
  • Make search box persistent [#15, #67, #157]
    • +
  • Enhance search feature by scoping the search to selected group [#16, #118]
    • +
  • Improve interaction between search field and entry list [#131, #141]
    • +
  • Add stand-alone password-generator [#18, #92]
    • +
  • Don't require password repetition when password is visible [#27, #92]
    • +
  • Add support for entry attributes in autotype sequences [#107]
    • +
  • Always focus password field when opening the database unlock widget [#116, #117]
    • +
  • Fix compilation errors on various platforms [#53, #126, #130]
    • +
  • Restructure and improve kdbx-extract utility [#160]
    • +
+ + + + diff -Nru keepassxc-2.2.2/share/linux/org.keepassxc.KeePassXC.desktop keepassxc-2.2.4/share/linux/org.keepassxc.KeePassXC.desktop --- keepassxc-2.2.2/share/linux/org.keepassxc.KeePassXC.desktop 1970-01-01 00:00:00.000000000 +0000 +++ keepassxc-2.2.4/share/linux/org.keepassxc.KeePassXC.desktop 2017-12-13 17:58:56.000000000 +0000 @@ -0,0 +1,17 @@ +[Desktop Entry] +Name=KeePassXC +GenericName=Password Manager +GenericName[de]=Passwortverwaltung +GenericName[es]=Gestor de contraseñas +GenericName[fr]=Gestionnaire de mot de passe +GenericName[ru]=менеджер паролей +Comment=Community-driven port of the Windows application “KeePass Password Safe” +Exec=keepassxc %f +TryExec=keepassxc +Icon=keepassxc +StartupWMClass=keepassxc +Terminal=false +Type=Application +Version=1.0 +Categories=Utility;Security;Qt; +MimeType=application/x-keepass2; diff -Nru keepassxc-2.2.2/share/translations/keepassx_ca.ts keepassxc-2.2.4/share/translations/keepassx_ca.ts --- keepassxc-2.2.2/share/translations/keepassx_ca.ts 1970-01-01 00:00:00.000000000 +0000 +++ keepassxc-2.2.4/share/translations/keepassx_ca.ts 2017-12-13 17:58:56.000000000 +0000 @@ -0,0 +1,2395 @@ + + + AboutDialog + + About KeePassXC + Sobre KeePassXC + + + About + Sobre + + + Contributors + Contribuïdors + + + Debug Info + Informació de depuració + + + Copy to clipboard + Copia al porta-retalls + + + Version %1 + + Versió %1 + + + + Revision: %1 + Revisió: %1 + + + Libraries: + Llibreries + + + Operating system: %1 +CPU architecture: %2 +Kernel: %3 %4 + Sistema operatiu: %1 +Arquitectura de la CPU: %2 +Nucli: %3 %4 + + + Enabled extensions: + Extensions habilitades: + + + Report bugs at: <a href="https://github.com/keepassxreboot/keepassxc/issues" style="text-decoration: underline;">https://github.com</a> + Reportar errors a: <a href="https://github.com/keepassxreboot/keepassxc/issues" style="text-decoration: underline;">https://github.com</a> + + + KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3. + KeepassXC es distribueix sota els termes de la Llicència Pública General GNU (GPL) versió 2 o (segons la vostra opció) versió 3. + + + Project Maintainers: + Mantenidors del projecte: + + + <a href="https://github.com/keepassxreboot/keepassxc/graphs/contributors">See Contributions on GitHub</a> + <a href="https://github.com/keepassxreboot/keepassxc/graphs/contributors">Veure els contribuïdors a GitHub</a> + + + Include the following information whenever you report a bug: + Inclou la següent informació a l'hora de reportar un error: + + + Distribution: %1 + Distribució: %1 + + + + AccessControlDialog + + Remember this decision + Recorda aquesta decisió + + + Allow + Permet + + + Deny + Denega + + + %1 has requested access to passwords for the following item(s). +Please select whether you want to allow access. + + + + KeePassXC HTTP Confirm Access + KeePassXC HTTP Confirmeu l'accés + + + + AutoType + + Couldn't find an entry that matches the window title: + No hem trobat una entrada que coincidesca amb el títol de la finestra: + + + Auto-Type - KeePassXC + + + + + AutoTypeAssociationsModel + + Window + Finestra + + + Sequence + Seqüència + + + Default sequence + Seqüència per omissió + + + + AutoTypeSelectDialog + + Select entry to Auto-Type: + + + + Auto-Type - KeePassXC + + + + + ChangeMasterKeyWidget + + Password + Contrasenya + + + Enter password: + Introduïu la contrasenya: + + + Repeat password: + Repetiu la contrasenya: + + + Browse + Navegar + + + Create + Crea + + + Key files + Fitxers de clau + + + All files + Tots els fitxers + + + Create Key File... + Crea un arxiu clau... + + + Unable to create Key File : + + + + Select a key file + Seleccioneu un arxiu clau + + + Do you really want to use an empty string as password? + Realment voleu utilitzar una cadena buida com a contrasenya? + + + Different passwords supplied. + Les contrasenyes no coincideixen. + + + Failed to set %1 as the Key file: +%2 + No ha pogut definir %1 com a arxiu clau: %2 + + + &Key file + Arxiu clau + + + Cha&llenge Response + + + + Refresh + L'actualitza + + + Empty password + Contrasenya buida + + + Changing master key failed: no YubiKey inserted. + + + + + CloneDialog + + Clone Options + Clona les opcions + + + Replace username and password with references + Substituir el nom d'usuari i contrasenya amb referències + + + Copy history + Còpia el historial + + + Append ' - Clone' to title + Afegeix '-clon' al títol + + + + CsvImportWidget + + Import CSV fields + Importació de fitxer CSV + + + filename + nom del fitxer + + + size, rows, columns + mida, files, columnes + + + Encoding + Codificació + + + Codec + Còdec + + + Text is qualified by + Text està qualificat per + + + Fields are separated by + Els camps estan separats per + + + Comments start with + Els comentaris comencen amb + + + First record has field names + El primer registre conté els noms de camp + + + Number of headers line to discard + Número de línies amb capçaleres per a descartar + + + Consider '\' an escape character + Considera ' \' com un caràcter d'escapada + + + Preview + Visualització prèvia + + + Column layout + Columnes + + + Not present in CSV file + + + + Empty fieldname + Camp de nom buit + + + column + columna + + + Imported from CSV file + Importats d'un fitxer CSV + + + Original data: + Dades originals: + + + Error(s) detected in CSV file ! + S'ha(n) detectat error(s) al fitxer CSV ! + + + more messages skipped] + + + + Error + Error + + + CSV import: writer has errors: + + + + + + CsvImportWizard + + Import CSV file + + + + Error + Error + + + Unable to calculate master key + No es pot calcular la clau mestra + + + + CsvParserModel + + byte, + byte, + + + rows, + files, + + + columns + columnes + + + + DatabaseOpenWidget + + Enter master key + Introduïu la clau mestra + + + Key File: + Fitxer clau: + + + Password: + Contrasenya: + + + Browse + Navega + + + Unable to open the database. + No es pot obrir la base de dades. + + + Can't open key file + No es pot obrir el fitxer de clau + + + All files + Tots els fitxers + + + Key files + Arxius de clau + + + Select key file + Seleccioneu el fitxer de clau + + + Refresh + Actualitza + + + Challenge Response: + + + + + DatabaseRepairWidget + + Repair database + Repara la base de dades + + + Error + Error + + + Can't open key file + No es pot obrir el fitxer de clau + + + Database opened fine. Nothing to do. + + + + Unable to open the database. + No es pot obrir la base de dades. + + + Success + + + + The database has been successfully repaired +You can now save it. + + + + Unable to repair the database. + No es pot reparar la base de dades. + + + + DatabaseSettingsWidget + + Database name: + Nom de base de dades: + + + Database description: + Descripció de la base de dades: + + + Transform rounds: + + + + Default username: + Usuari per defecte: + + + MiB + MiB + + + Benchmark + + + + Max. history items: + N. max. d'elements al historial: + + + Max. history size: + Mida màx. del historial: + + + Use recycle bin + Utilitza la paperera + + + AES: 256 Bit (default) + AES: 256 bits (per defecte) + + + Twofish: 256 Bit + Twofish: 256 bits + + + Algorithm: + Algoritme: + + + + DatabaseTabWidget + + Root + Arrel + + + KeePass 2 Database + Base de dades de KeePass 2 + + + All files + Tots els fitxers + + + Open database + Obre la base de dades + + + File not found! + No s'ha trobat el fitxer! + + + Open KeePass 1 database + Obre base de dades de KeePass 1 + + + KeePass 1 database + Base de dades de KeePass 1 + + + All files (*) + Tots els arxius (*) + + + Close? + Voleu tancar? + + + Save changes? + Voleu desar els canvis? + + + "%1" was modified. +Save changes? + "%1" ha canviat. +Voleu desar els canvis? + + + Writing the database failed. + Ha fallat l'escriptura en la base de dades. + + + Save database as + Desa la base de dades com a + + + New database + Nova base de dades + + + locked + bloquejat + + + Lock database + Bloqueja la base de dades + + + Can't lock the database as you are currently editing it. +Please press cancel to finish your changes or discard them. + No es pot bloquejar la base de dades actualment en ús. +Per favor, feu clic a cancel·la per a finalitzar els canvis o descarteu-los. + + + This database has never been saved. +You can save the database or stop locking it. + Aquesta base de dades no s'ha desat. +Podeu desar la base de dades o deixar de bloquejar-la. + + + This database has been modified. +Do you want to save the database before locking it? +Otherwise your changes are lost. + Aquesta base de dades ha estat modificada. +Voleu desar la base de dades abans de tancar-la? +En cas contrari, es perderan els canvis. + + + "%1" is in edit mode. +Discard changes and close anyway? + "%1" està en mode d'edició. +Voleu descartar els canvis i tancar de totes maneres? + + + Export database to CSV file + Exporta la base de dades a un fitxer CSV + + + CSV file + Fitxer CSV + + + Writing the CSV file failed. + Ha fallat l'escriptura al fitxer CSV. + + + Unable to open the database. + No es pot obrir la base de dades. + + + Merge database + Fusiona la base de dades + + + The database you are trying to save as is locked by another instance of KeePassXC. +Do you want to save it anyway? + La base de dades que està intentant salvar està bloquejada per una altra instància de KeePassXC. +Voleu desar-la igualment? + + + Passwords + Contrasenyes + + + Database already opened + La base de dades ja està oberta + + + The database you are trying to open is locked by another instance of KeePassXC. + +Do you want to open it anyway? + La base de dades que està intentant obrir està bloquejada per una altra instància de KeePassXC. + +Voleu obrir-la igualment? + + + Open read-only + Obre en mode només de lectura + + + File opened in read only mode. + Arxiu obert en mode de només lectura. + + + Open CSV file + Obre arxiu CSV + + + + DatabaseWidget + + Change master key + Canvia la clau mestra + + + Delete entry? + Suprimir l'entrada? + + + Do you really want to delete the entry "%1" for good? + Realment voleu suprimir l'entrada "%1" per sempre? + + + Delete entries? + Suprimir les entrades? + + + Do you really want to delete %1 entries for good? + Realment voleu suprimir %1 entrades per sempre? + + + Move entries to recycle bin? + Moure les entrades a la paperera? + + + Do you really want to move %n entry(s) to the recycle bin? + Realment voleu moure %n entry(s) a la Paperera de reciclatge?Realment voleu moure %n entrada(es) a la paperera? + + + Delete group? + Voleu suprimir el grup? + + + Do you really want to delete the group "%1" for good? + Realment voleu suprimir el grup "%1" per sempre? + + + Unable to calculate master key + No es pot calcular la clau mestra + + + Move entry to recycle bin? + Moure l'entrada a la Paperera? + + + Do you really want to move entry "%1" to the recycle bin? + Realment voleu moure l'entrada "%1" a la paperera? + + + Searching... + Cercant... + + + No current database. + Cap base de dades actual. + + + No source database, nothing to do. + + + + Search Results (%1) + Resultats de la cerca (%1) + + + No Results + No hi ha resultats + + + Execute command? + Execute l'ordre? + + + Do you really want to execute the following command?<br><br>%1<br> + Voleu executar la següent ordre? <br><br>%1<br> + + + Remember my choice + Recordar la meva elecció + + + Autoreload Request + Tona a carregar la petició + + + The database file has changed. Do you want to load the changes? + El fitxer de base de dades ha canviat. Voleu carregar els canvis? + + + Merge Request + + + + The database file has changed and you have unsaved changes.Do you want to merge your changes? + El fitxer de base de dades ha canviat i té canvis no desats. Voleu combinar els canvis? + + + Could not open the new database file while attempting to autoreload this database. + + + + Empty recycle bin? + Buida la paperera? + + + Are you sure you want to permanently delete everything from your recycle bin? + Esteu segur que voleu suprimir permanentment tot el contingut de la paperera? + + + + EditEntryWidget + + Entry + Entrada + + + Advanced + Avançat + + + Icon + Icona + + + Auto-Type + + + + Properties + Propietats + + + History + Historial + + + Entry history + Historial de l'entrada + + + Add entry + Afegiu una entrada + + + Edit entry + Edita l'entrada + + + Different passwords supplied. + Les contrasenyes no coincideixen. + + + New attribute + Nou atribut + + + Select file + Seleccioneu el fitxer + + + Unable to open file + No es pot obrir el fitxer + + + Save attachment + Deseu el fitxer adjunt + + + Unable to save the attachment: + + No es por desar l'arxiu adjunt: + + + + Tomorrow + Demà + + + %n week(s) + %n setmanes%n setmana(es) + + + %n month(s) + %n mes (OS)%n mes(os) + + + 1 year + 1 any + + + Confirm Remove + Confirma la supressió + + + Are you sure you want to remove this attribute? + Esteu segur que voleu suprimir aquest atribut? + + + [PROTECTED] Press reveal to view or edit + [PROTEGIT] Premeu revelar per veure o editar + + + Are you sure you want to remove this attachment? + Esteu segur que voleu suprimir aquest fitxer adjunt? + + + + EditEntryWidgetAdvanced + + Additional attributes + Atributs addicionals + + + Add + Afegiu + + + Remove + Suprimiu + + + Attachments + Fitxers adjunts + + + Save + Desa + + + Open + Obre + + + Edit Name + Edita el nom + + + Protect + Protegeix + + + Reveal + Revela + + + + EditEntryWidgetAutoType + + Enable Auto-Type for this entry + + + + + + + + + + - + - + + + Window title: + Títol de la finestra: + + + Inherit default Auto-Type sequence from the &group + + + + &Use custom Auto-Type sequence: + + + + Use default se&quence + + + + Set custo&m sequence: + + + + Window Associations + + + + + EditEntryWidgetHistory + + Show + Mostra + + + Restore + Restaura + + + Delete + Suprimeix + + + Delete all + Suprimeix tots + + + + EditEntryWidgetMain + + Title: + Títol: + + + Username: + Nom d'usuari: + + + Password: + Contrasenya: + + + Repeat: + Repeteix: + + + URL: + URL: + + + Expires + Expira + + + Presets + Configuracions + + + Notes: + Notes: + + + + EditGroupWidget + + Group + Grup + + + Icon + Icona + + + Properties + Propietats + + + Add group + Afegeix un grup + + + Edit group + Edita el grup + + + Enable + Habilita + + + Disable + Inhabilita + + + Inherit from parent group (%1) + Hereta de grup pare (%1) + + + + EditGroupWidgetMain + + Name + Nom + + + Notes + Notes + + + Expires + Expira + + + Search + Cerca + + + Auto-Type + + + + &Use default Auto-Type sequence of parent group + + + + Set default Auto-Type se&quence + + + + + EditWidgetIcons + + Add custom icon + Afegeix una icona personalitzada + + + Delete custom icon + Suprimeix la icona personalitzada + + + Images + Imatges + + + All files + Tots els fitxers + + + Select Image + Seleccioneu la imatge + + + Download favicon + Descarregua el favicon + + + Unable to fetch favicon. + No es pot descarregar el favicon. + + + Can't read icon + No es pot llegir la icona + + + &Use default icon + + + + Use custo&m icon + + + + Confirm Delete + Confirma la supressió + + + This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it? + Aquesta icona s'utilitza en %1 entrades i serà substituïda per la icona per defecte. Esteu segur que voleu suprimir-la? + + + Hint: You can enable Google as a fallback under Tools>Settings>Security + Consell: Podeu activar Google com a recurs alternatiu a Eines > Configuració > Seguretat + + + Custom icon already exists + Ja existeix una icona personalitzada + + + + EditWidgetProperties + + Created: + Creat: + + + Modified: + Modificat: + + + Accessed: + Accedit: + + + Uuid: + UUID: + + + + Entry + + - Clone + -Clon + + + + EntryAttributesModel + + Name + Nom + + + + EntryHistoryModel + + Last modified + Darrera modificació + + + Title + Títol + + + Username + Nom d'usuari + + + URL + URL + + + + EntryModel + + Group + Grup + + + Title + Títol + + + Username + Nom d'usuari + + + URL + URL + + + Ref: + Reference abbreviation + Ref: + + + + Group + + Recycle Bin + Paperera + + + + HttpPasswordGeneratorWidget + + Length: + Longitud: + + + Character Types + Tipus de caràcter + + + Upper Case Letters + Lletra majúscula + + + A-Z + A-Z + + + Lower Case Letters + Lletra minúscula + + + a-z + a-z + + + Numbers + Números + + + 0-9 + + + + Special Characters + + + + /*_& ... + + + + Exclude look-alike characters + + + + Ensure that the password contains characters from every group + + + + + KMessageWidget + + &Close + + + + Close message + + + + + KeePass1OpenWidget + + Import KeePass1 database + + + + Unable to open the database. + No es pot obrir la base de dades. + + + + KeePass1Reader + + Unable to read keyfile. + + + + Not a KeePass database. + + + + Unsupported encryption algorithm. + + + + Unsupported KeePass database version. + + + + Root + Arrel + + + Unable to calculate master key + No es pot calcular la clau mestra + + + Wrong key or database file is corrupt. + + + + + KeePass2Reader + + Not a KeePass database. + + + + Unsupported KeePass database version. + + + + Wrong key or database file is corrupt. + + + + Unable to calculate master key + No es pot calcular la clau mestra + + + Unable to issue challenge-response. + + + + The selected file is an old KeePass 1 database (.kdb). + +You can import it by clicking on Database > 'Import KeePass 1 database...'. +This is a one-way migration. You won't be able to open the imported database with the old KeePassX 0.4 version. + + + + + KeePass2Writer + + Unable to issue challenge-response. + + + + Unable to calculate master key + No es pot calcular la clau mestra + + + + Main + + Fatal error while testing the cryptographic functions. + + + + KeePassXC - Error + + + + The lock file could not be created. Single-instance mode disabled. + + + + Another instance of KeePassXC is already running. + + + + Existing single-instance lock file is invalid. Launching new instance. + + + + + MainWindow + + Open database + Obre la base de dades + + + Database settings + + + + Copy username to clipboard + + + + Copy password to clipboard + + + + Settings + + + + Show toolbar + + + + read-only + + + + Toggle window + + + + KeePass 2 Database + Base de dades de KeePass 2 + + + All files + Tots els fitxers + + + Save repaired database + + + + Writing the database failed. + Ha fallat l'escriptura en la base de dades. + + + &Recent databases + + + + E&ntries + + + + Copy att&ribute to clipboard + + + + &Groups + + + + &View + + + + &Quit + + + + &About + + + + &Save database + + + + &Close database + + + + &New database + + + + Merge from KeePassX database + + + + &Add new entry + + + + &View/Edit entry + + + + &Delete entry + + + + &Add new group + + + + &Edit group + + + + &Delete group + + + + &Database settings + + + + &Clone entry + + + + Timed one-time password + + + + Copy &TOTP + + + + Show TOTP + + + + &Find + + + + Copy &username + + + + Cop&y password + + + + &Settings + + + + &Perform Auto-Type + + + + &Open URL + + + + &Lock databases + + + + &Title + + + + &URL + + + + &Notes + + + + Password Generator + + + + Clear history + + + + &Database + + + + Import + + + + &Tools + + + + Empty recycle bin + + + + Access error for config file %1 + + + + Quit KeePassXC + + + + Please touch the button on your YubiKey! + + + + &Help + + + + &Open database... + + + + Sa&ve database as... + + + + Change &master key... + + + + &Export to CSV file... + + + + Import KeePass 1 database... + + + + Import CSV file... + + + + Re&pair database... + + + + Set up TOTP... + + + + + OptionDialog + + Dialog + + + + General + + + + Sh&ow a notification when credentials are requested + + + + Sort matching entries by &username + + + + Re&move all stored permissions from entries in active database + + + + Advanced + Avançat + + + Always allow &access to entries + + + + Always allow &updating entries + + + + Searc&h in all opened databases for matching entries + + + + HTTP Port: + + + + Default port: 19455 + + + + Re&quest to unlock the database if it is locked + + + + Sort &matching entries by title + + + + KeePassXC will listen to this port on 127.0.0.1 + + + + Cannot bind to privileged ports + + + + Cannot bind to privileged ports below 1024! +Using default port 19455. + + + + R&emove all shared encryption keys from active database + + + + &Return advanced string fields which start with "KPH: " + + + + Automatically creating or updating string fields is not supported. + + + + This is required for accessing your databases from ChromeIPass or PassIFox + + + + Enable KeePassHTTP server + + + + Only returns the best matches for a specific URL instead of all entries for the whole domain. + + + + &Return only best matching entries + + + + Only entries with the same scheme (http://, https://, ftp://, ...) are returned. + + + + &Match URL schemes + + + + Password Generator + + + + Only the selected database has to be connected with a client. + + + + The following options can be dangerous! +Change them only if you know what you are doing. + + + + + PasswordGeneratorWidget + + Password: + Contrasenya: + + + Character Types + Tipus de caràcter + + + Upper Case Letters + Lletra majúscula + + + Lower Case Letters + Lletra minúscula + + + Numbers + Números + + + Special Characters + + + + Exclude look-alike characters + + + + Accept + + + + %p% + + + + strength + + + + entropy + + + + &Length: + + + + Pick characters from every group + + + + Generate + + + + Close + + + + Apply + + + + Entropy: %1 bit + + + + Password Quality: %1 + + + + Poor + + + + Weak + + + + Good + + + + Excellent + + + + Password + Contrasenya + + + Extended ASCII + + + + Passphrase + + + + Wordlist: + + + + Word Count: + + + + Word Separator: + + + + Copy + + + + + QObject + + NULL device + + + + error reading from device + + + + file empty ! + + + + + malformed string + + + + missing closing quote + + + + INTERNAL - unget lower bound exceeded + + + + Group + Grup + + + Title + Títol + + + Username + Nom d'usuari + + + Password + Contrasenya + + + URL + URL + + + Notes + Notes + + + Browser Integration + + + + YubiKey[%1] Challenge Response - Slot %2 - %3 + + + + Press + + + + Passive + + + + + QtIOCompressor + + Internal zlib error when compressing: + + + + Error writing to underlying device: + + + + Error opening underlying device: + + + + Error reading data from underlying device: + + + + Internal zlib error when decompressing: + + + + + QtIOCompressor::open + + The gzip format not supported in this version of zlib. + + + + Internal zlib error: + + + + + SearchWidget + + Case Sensitive + + + + Search + Cerca + + + Clear + + + + Search... + + + + Limit search to selected group + + + + + Service + + A shared encryption-key with the name "%1" already exists. +Do you want to overwrite it? + + + + Do you want to update the information in %1 - %2? + + + + The active database is locked! +Please unlock the selected database or choose another one which is unlocked. + + + + Successfully removed %1 encryption-%2 from KeePassX/Http Settings. + + + + No shared encryption-keys found in KeePassHttp Settings. + + + + The active database does not contain an entry of KeePassHttp Settings. + + + + Removing stored permissions... + + + + Abort + + + + Successfully removed permissions from %1 %2. + + + + The active database does not contain an entry with permissions. + + + + KeePassXC: New key association request + + + + You have received an association request for the above key. +If you would like to allow it access to your KeePassXC database +give it a unique name to identify and accept it. + + + + KeePassXC: Overwrite existing key? + + + + KeePassXC: Update Entry + + + + KeePassXC: Database locked! + + + + KeePassXC: Removed keys from database + + + + KeePassXC: No keys found + + + + KeePassXC: Settings not available! + + + + KeePassXC: Removed permissions + + + + KeePassXC: No entry with permissions found! + + + + + SettingsWidget + + Application Settings + + + + General + + + + Security + + + + Access error for config file %1 + + + + + SettingsWidgetGeneral + + Remember last databases + + + + Automatically save on exit + + + + Automatically save after every change + + + + Minimize when copying to clipboard + + + + Use group icon on entry creation + + + + Global Auto-Type shortcut + + + + Language + + + + Show a system tray icon + + + + Hide window to system tray when minimized + + + + Load previous databases on startup + + + + Automatically reload the database when modified externally + + + + Hide window to system tray instead of app exit + + + + Minimize window at application startup + + + + Basic Settings + + + + Remember last key files and security dongles + + + + Don't mark database as modified for non-data changes (e.g., expanding groups) + + + + Auto-Type + + + + Use entry title and URL to match windows for global Auto-Type + + + + Always ask before performing Auto-Type + + + + Auto-Type delay + + + + ms + + + + Start only a single instance of KeePassXC + + + + + SettingsWidgetSecurity + + Clear clipboard after + + + + sec + + + + Lock databases after inactivity of + + + + Show passwords in cleartext by default + + + + Lock databases after minimizing the window + + + + Don't require password repeat when it is visible + + + + Timeouts + + + + Convenience + + + + Lock databases when session is locked or lid is closed + + + + Privacy + + + + Use Google as fallback for downloading website icons + + + + + SetupTotpDialog + + Setup TOTP + + + + Key: + + + + Use custom settings + + + + Note: Change these settings only if you know what you are doing. + + + + Time step: + + + + 8 digits + + + + 6 digits + + + + Code size: + + + + sec + + + + + TotpDialog + + Timed Password + + + + 000000 + + + + Copy + + + + Expires in + + + + seconds + + + + + UnlockDatabaseWidget + + Unlock database + + + + + WelcomeWidget + + Welcome to KeePassXC + + + + Start storing your passwords securely in a KeePassXC database + + + + Create new database + + + + Open existing database + + + + Import from KeePass 1 + + + + Import from CSV + + + + Recent databases + + + + + main + + path to a custom config file + + + + key file of the database + + + + KeePassXC - cross-platform password manager + + + + read password of the database from stdin + + + + filenames of the password databases to open (*.kdbx) + + + + Copy a password to the clipboard + + + + Path of the database. + + + + Use a GUI prompt unlocking the database. + + + + Name of the entry to clip. + + + + Extract and print the content of a database. + + + + Path of the database to extract. + + + + Name of the command to execute. + + + + List database entries. + + + + Path of the group to list. Default is / + + + + Print the UUIDs of the entries and groups. + + + + Merge two databases. + + + + Path of the database to merge into. + + + + Path of the database to merge from. + + + + Use the same password for both database files. + + + + Show a password. + + + + Name of the entry to show. + + + + \ No newline at end of file diff -Nru keepassxc-2.2.2/share/translations/keepassx_de.ts keepassxc-2.2.4/share/translations/keepassx_de.ts --- keepassxc-2.2.2/share/translations/keepassx_de.ts 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/translations/keepassx_de.ts 2017-12-13 17:58:56.000000000 +0000 @@ -571,7 +571,7 @@ Do you want to save the database before locking it? Otherwise your changes are lost. Dieses Datenbank wurde geändert. -Soll sie gespeichert werden bevor sie gesperrt wirt? +Soll sie gespeichert werden bevor sie gesperrt wird? Anderenfalls gehen Ihre Änderungen verloren. diff -Nru keepassxc-2.2.2/share/translations/keepassx_es.ts keepassxc-2.2.4/share/translations/keepassx_es.ts --- keepassxc-2.2.2/share/translations/keepassx_es.ts 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/translations/keepassx_es.ts 2017-12-13 17:58:56.000000000 +0000 @@ -69,7 +69,7 @@ Distribution: %1 - + Distribución: %1 @@ -250,7 +250,7 @@ Codec - Codificación + Códec Text is qualified by @@ -302,11 +302,11 @@ Original data: - Datos originales: + Dato original: Error(s) detected in CSV file ! - ¡Se detectaron errores en el archivo CSV! + ¡Error(es) detectado(s) en el archivo CSV! more messages skipped] @@ -728,7 +728,7 @@ Merge Request - Solicitud de unión + Solicitud de Unión The database file has changed and you have unsaved changes.Do you want to merge your changes? @@ -744,7 +744,7 @@ Are you sure you want to permanently delete everything from your recycle bin? - ¿Está seguro(a) que quiere permanentemente eliminar todo de su papelera de reciclaje? + ¿Está seguro que quiere eliminar permanentemente todo de su papelera de reciclaje? @@ -795,7 +795,7 @@ Select file - Seleccionar archivo llave + Seleccionar archivo Unable to open file @@ -817,11 +817,11 @@ %n week(s) - %n semana%n semanas + %n semana%n semana(s) %n month(s) - %n mes%n meses + %n mes%n mes(es) 1 year @@ -969,7 +969,7 @@ Presets - Predeterminado + Programar Notes: @@ -1098,7 +1098,7 @@ Custom icon already exists - + El icono personalizado ya existe @@ -1352,7 +1352,7 @@ Existing single-instance lock file is invalid. Launching new instance. - + El archivo de bloqueo de instancia única existente no es válido. Lanzando nueva instancia. @@ -1483,7 +1483,7 @@ Timed one-time password - Contraseña programada de único uso (TOTP) + Contraseña programada de único uso Copy &TOTP diff -Nru keepassxc-2.2.2/share/translations/keepassx_fr.ts keepassxc-2.2.4/share/translations/keepassx_fr.ts --- keepassxc-2.2.2/share/translations/keepassx_fr.ts 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/translations/keepassx_fr.ts 2017-12-13 17:58:56.000000000 +0000 @@ -29,27 +29,27 @@ Revision: %1 - Revision: %1 + Révision : %1 Libraries: - Bibliothèques: + Bibliothèques : Operating system: %1 CPU architecture: %2 Kernel: %3 %4 - Système d'exploitation: %1 -Architecture CPU: %2 -Kernel: %3 %4 + Système d'exploitation : %1 +Architecture CPU : %2 +Kernel : %3 %4 Enabled extensions: - Extensions activées: + Extensions activées : Report bugs at: <a href="https://github.com/keepassxreboot/keepassxc/issues" style="text-decoration: underline;">https://github.com</a> - Signaler les bugs sur: <a href="https://github.com/keepassxreboot/keepassxc/issues" style="text-decoration: underline;">https://github.com</a> + Signaler les bugs sur : <a href="https://github.com/keepassxreboot/keepassxc/issues" style="text-decoration: underline;">https://github.com</a> KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3. @@ -57,7 +57,7 @@ Project Maintainers: - Mainteneurs du projet: + Mainteneurs du projet : <a href="https://github.com/keepassxreboot/keepassxc/graphs/contributors">See Contributions on GitHub</a> @@ -65,11 +65,11 @@ Include the following information whenever you report a bug: - Inclure l'information suivante lorsque vous signaler un bug: + Inclure l'information suivante lorsque vous signaler un bug : Distribution: %1 - + Distribution : %1 @@ -302,7 +302,7 @@ Original data: - Données originales: + Données originales : Error(s) detected in CSV file ! @@ -397,7 +397,7 @@ Challenge Response: - Challenge-réponse: + Challenge-réponse : @@ -477,15 +477,15 @@ AES: 256 Bit (default) - AES: 256 Bits (par défault) + AES : 256 Bits (par défaut) Twofish: 256 Bit - Twofish: 256 bits + Twofish : 256 bits Algorithm: - Algorithme: + Algorithme : @@ -737,7 +737,7 @@ Could not open the new database file while attempting to autoreload this database. - La nouvelle base de données ne peux être ouverte pendant qu'un rafraîchissement automatique de l'actuelle est en cours. + La nouvelle base de données ne peut être ouverte pendant qu'un rafraîchissement automatique de l'actuelle est en cours. Empty recycle bin? @@ -1095,11 +1095,11 @@ Hint: You can enable Google as a fallback under Tools>Settings>Security - Astuce: Vous pouvez activer Google en tant que repli sous Outils>Paramètres>Sécurité + Astuce : Vous pouvez activer Google en tant que repli sous Outils>Paramètres>Sécurité Custom icon already exists - + L'icône personnalisée existe déjà @@ -1175,7 +1175,7 @@ Ref: Reference abbreviation - Réf: + Réf : @@ -1353,7 +1353,7 @@ Existing single-instance lock file is invalid. Launching new instance. - + Le fichier de verrouillage de l’instance unique existant n’est pas valide. Lancement d'une nouvelle instance. @@ -1647,11 +1647,11 @@ HTTP Port: - Port HTTP: + Port HTTP : Default port: 19455 - Port par défaut: 19455 + Port par défaut : 19455 Re&quest to unlock the database if it is locked @@ -1681,7 +1681,7 @@ &Return advanced string fields which start with "KPH: " - & Retourne les champs avancés de type chaîne qui commencent par "KPH:" + & Retourne les champs avancés de type chaîne qui commencent par "KPH :" Automatically creating or updating string fields is not supported. @@ -1774,7 +1774,7 @@ &Length: - &Longueur: + &Longueur : Pick characters from every group @@ -1794,11 +1794,11 @@ Entropy: %1 bit - Entropie: %1 bit + Entropie : %1 bit Password Quality: %1 - Qualité du mot de passe: %1 + Qualité du mot de passe : %1 Poor @@ -1830,15 +1830,15 @@ Wordlist: - Liste de mots: + Liste de mots : Word Count: - Nombre de mots: + Nombre de mots : Word Separator: - Séparateur de mot: + Séparateur de mot : Copy @@ -2019,7 +2019,7 @@ KeePassXC: New key association request - KeePassXC: nouvelle demande d'association + KeePassXC : nouvelle demande d'association You have received an association request for the above key. @@ -2031,23 +2031,23 @@ KeePassXC: Overwrite existing key? - KeePassXC: Écraser la clé existante ? + KeePassXC : Écraser la clé existante ? KeePassXC: Update Entry - KeePassXC: Mettre à jour l'entrée + KeePassXC : Mettre à jour l'entrée KeePassXC: Database locked! - KeePassXC: Base de données verrouillée ! + KeePassXC : Base de données verrouillée ! KeePassXC: Removed keys from database - KeePassXC: Les clés ont été effacées de la base de donnée + KeePassXC : Les clés ont été effacées de la base de donnée KeePassXC: No keys found - KeePassXC: Aucune clé trouvée + KeePassXC : Aucune clé trouvée KeePassXC: Settings not available! @@ -2055,11 +2055,11 @@ KeePassXC: Removed permissions - KeePassXC: Permissions retirées + KeePassXC : Permissions retirées KeePassXC: No entry with permissions found! - KeePassXC: Aucune entrée avec permissions trouvée ! + KeePassXC : Aucune entrée avec permissions trouvée ! @@ -2145,7 +2145,7 @@ Don't mark database as modified for non-data changes (e.g., expanding groups) - Ne pas indiquer la base de données comme modifiée pour les changements hors-données (par exemple: groupes développés) + Ne pas indiquer la base de données comme modifiée pour les changements hors-données (par exemple : groupes développés) Auto-Type @@ -2227,7 +2227,7 @@ Key: - Clé: + Clé : Use custom settings @@ -2235,11 +2235,11 @@ Note: Change these settings only if you know what you are doing. - Attention: modifiez ces paramètres seulement si vous savez ce que vous faites. + Attention : modifiez ces paramètres seulement si vous savez ce que vous faites. Time step: - Période de temps: + Période de temps : 8 digits @@ -2251,7 +2251,7 @@ Code size: - Taille du code: + Taille du code : sec @@ -2375,7 +2375,7 @@ Path of the group to list. Default is / - Chemin du groupe à lister. Par défaut: / + Chemin du groupe à lister. Par défaut : / Print the UUIDs of the entries and groups. diff -Nru keepassxc-2.2.2/share/translations/keepassx_id.ts keepassxc-2.2.4/share/translations/keepassx_id.ts --- keepassxc-2.2.2/share/translations/keepassx_id.ts 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/translations/keepassx_id.ts 2017-12-13 17:58:56.000000000 +0000 @@ -69,7 +69,7 @@ Distribution: %1 - + Distribusi: %1 diff -Nru keepassxc-2.2.2/share/translations/keepassx_it.ts keepassxc-2.2.4/share/translations/keepassx_it.ts --- keepassxc-2.2.2/share/translations/keepassx_it.ts 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/translations/keepassx_it.ts 2017-12-13 17:58:56.000000000 +0000 @@ -131,7 +131,7 @@ Auto-Type - KeePassXC - KeePassXC - Auto completamento + KeePassXC - Auto completamento @@ -170,7 +170,7 @@ Unable to create Key File : - Impossibile creare file chiave: + Impossibile creare file chiave: Select a key file @@ -290,11 +290,11 @@ Empty fieldname - Nome campo vuoto + Nome campo vuoto column - colonna + colonna Imported from CSV file @@ -302,7 +302,7 @@ Original data: - Dati originali: + Dati originali: Error(s) detected in CSV file ! @@ -1917,23 +1917,23 @@ QtIOCompressor Internal zlib error when compressing: - Errore interno di zlib durante la compressione: + Errore interno di zlib durante la compressione: Error writing to underlying device: - Errore durante la scrittura nel dispositivo: + Errore durante la scrittura nel dispositivo: Error opening underlying device: - Errore durante l'apertura dal dispositivo: + Errore durante l'apertura dal dispositivo: Error reading data from underlying device: - Errore durante la lettura dal dispositivo: + Errore durante la lettura dal dispositivo: Internal zlib error when decompressing: - Errore interno di zlib durante la decompressione: + Errore interno di zlib durante la decompressione: @@ -1944,7 +1944,7 @@ Internal zlib error: - Errore interno di zlib: + Errore interno di zlib: @@ -2018,7 +2018,7 @@ KeePassXC: New key association request - KeePassXC: Nuova richiesta di associazione chiave + KeePassXC: Nuova richiesta di associazione chiave You have received an association request for the above key. @@ -2164,7 +2164,7 @@ ms - ms + ms Start only a single instance of KeePassXC @@ -2179,7 +2179,7 @@ sec - sec + sec Lock databases after inactivity of @@ -2254,7 +2254,7 @@ sec - sec + sec diff -Nru keepassxc-2.2.2/share/translations/keepassx_ja.ts keepassxc-2.2.4/share/translations/keepassx_ja.ts --- keepassxc-2.2.2/share/translations/keepassx_ja.ts 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/translations/keepassx_ja.ts 2017-12-13 17:58:56.000000000 +0000 @@ -69,7 +69,7 @@ Distribution: %1 - + 配布形式: %1 diff -Nru keepassxc-2.2.2/share/translations/keepassx_ko.ts keepassxc-2.2.4/share/translations/keepassx_ko.ts --- keepassxc-2.2.2/share/translations/keepassx_ko.ts 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/translations/keepassx_ko.ts 2017-12-13 17:58:56.000000000 +0000 @@ -69,7 +69,7 @@ Distribution: %1 - + 배포판: %1 @@ -1096,7 +1096,7 @@ Custom icon already exists - + 사용자 정의 아이콘이 이미 존재함 @@ -1350,7 +1350,7 @@ Existing single-instance lock file is invalid. Launching new instance. - + 존재하는 단일 인스턴스 잠금 파일이 잘못되었습니다. 새 인스턴스를 실행합니다. diff -Nru keepassxc-2.2.2/share/translations/keepassx_ru.ts keepassxc-2.2.4/share/translations/keepassx_ru.ts --- keepassxc-2.2.2/share/translations/keepassx_ru.ts 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/translations/keepassx_ru.ts 2017-12-13 17:58:56.000000000 +0000 @@ -69,7 +69,7 @@ Distribution: %1 - + Дистрибутив: %1 @@ -219,7 +219,7 @@ Replace username and password with references - Заменить имя пользователя и пароль к ссылкам + Использовать ссылки для имени пользователя и пароля Copy history @@ -227,7 +227,7 @@ Append ' - Clone' to title - Добавить' - Клонировать' в заголовок + Добавить к названию « - клон» @@ -579,7 +579,7 @@ "%1" is in edit mode. Discard changes and close anyway? - «%1» в режиме редактирования. + «%1» в режиме правки. Отменить изменения и всё равно закрыть? @@ -741,7 +741,7 @@ Empty recycle bin? - Корзина пустая? + Очистить корзину? Are you sure you want to permanently delete everything from your recycle bin? @@ -784,7 +784,7 @@ Edit entry - Редактировать запись + Править запись Different passwords supplied. @@ -838,7 +838,7 @@ [PROTECTED] Press reveal to view or edit - [Защищён] Нажмите для открытия просмотра или редактирования + [Защищён] Нажмите для открытия просмотра или правки Are you sure you want to remove this attachment? @@ -853,7 +853,7 @@ Add - Добавить + Создать Remove @@ -946,7 +946,7 @@ EditEntryWidgetMain Title: - Заголовок: + Название: Username: @@ -997,7 +997,7 @@ Edit group - Редактировать группу + Править группу Enable @@ -1095,22 +1095,22 @@ Hint: You can enable Google as a fallback under Tools>Settings>Security - Подсказка: вы можете включить Google в качестве резервного копирования в меню «Инструменты»> «Настройки»> «Безопасность» + Подсказка: в качестве резервного варианта для получения значков сайтов возможно использовать Google. Включите этот параметр в меню «Инструменты» -> «Настройки» -> «Безопасность» Custom icon already exists - + Пользовательский значок уже существует EditWidgetProperties Created: - Создано: + Создание: Modified: - Изменено: + Изменение: Accessed: @@ -1125,7 +1125,7 @@ Entry - Clone - - Клонировать + - клон @@ -1143,7 +1143,7 @@ Title - Заголовок + Имя записи Username @@ -1162,7 +1162,7 @@ Title - Заголовок + Имя записи Username @@ -1353,7 +1353,7 @@ Existing single-instance lock file is invalid. Launching new instance. - + Запускается новый экземпляр программы, т.к. файл блокировки запуска повреждён. @@ -1452,11 +1452,11 @@ &Add new entry - &Добавить новую запись + &Создать запись &View/Edit entry - &Посмотреть/редактировать запись + &Открыть/править запись &Delete entry @@ -1464,11 +1464,11 @@ &Add new group - &Добавить новую группу + &Создать группу &Edit group - &Редактировать группу + &Править группу &Delete group @@ -1524,7 +1524,7 @@ &Title - &Заголовок + &Имя записи &URL @@ -1556,7 +1556,7 @@ Empty recycle bin - Корзина пустая + Очистить корзину Access error for config file %1 @@ -1701,15 +1701,15 @@ &Return only best matching entries - &Возврат только наиболее совпадающих записей + &Показывать только лучшие совпадения Only entries with the same scheme (http://, https://, ftp://, ...) are returned. - Возвращаются только записи с той же схемой (http: //, https: //, ftp: //, ...). + Будут отобраны только записи с совпадающим протоколом (http://, https://, ftp://, ...). &Match URL schemes - &Совпадения схем адресов + &Проверять протокол Password Generator @@ -1879,7 +1879,7 @@ Title - Заголовок + Имя записи Username @@ -2085,7 +2085,7 @@ SettingsWidgetGeneral Remember last databases - Помнить последнюю базу данных + Запоминать последнюю базу данных Automatically save on exit @@ -2117,7 +2117,7 @@ Hide window to system tray when minimized - При сворачивании прятать окно в системный лоток + При сворачивании скрывать окно в системный лоток Load previous databases on startup @@ -2129,7 +2129,7 @@ Hide window to system tray instead of app exit - Прятать окно в системный лоток вместо выхода + Скрывать окно в системный лоток вместо выхода Minimize window at application startup @@ -2141,11 +2141,11 @@ Remember last key files and security dongles - Помнить последние ключевые файлы и ключи безопасности + Запоминать последние использованные файлы ключей и устройства Don't mark database as modified for non-data changes (e.g., expanding groups) - Не помечать базу данных как измененную без изменения данных (например, для расширения групп) + Не помечать базу данных изменённой при действиях, не связанных с изменением данных (например, при распахивании групп) Auto-Type @@ -2153,7 +2153,7 @@ Use entry title and URL to match windows for global Auto-Type - Использовать URL и заголовок записи при сопоставлении окон для глобального автоввода + Использовать для поиска URL и название записи Always ask before performing Auto-Type @@ -2184,7 +2184,7 @@ Lock databases after inactivity of - Заблокировать базу данных после неактивности длительностью + Блокировать базу данных при отсутствии активности длительностью Show passwords in cleartext by default @@ -2192,7 +2192,7 @@ Lock databases after minimizing the window - Блокировать базу данных после сворачивания окна + Блокировать базу данных при сворачивания окна Don't require password repeat when it is visible @@ -2216,7 +2216,7 @@ Use Google as fallback for downloading website icons - Использовать Google как резерв для загрузки значков веб-сайтов + Использовать Google в качестве резервного варианта для получения значков веб-сайтов diff -Nru keepassxc-2.2.2/share/translations/keepassx_zh_TW.ts keepassxc-2.2.4/share/translations/keepassx_zh_TW.ts --- keepassxc-2.2.2/share/translations/keepassx_zh_TW.ts 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/share/translations/keepassx_zh_TW.ts 2017-12-13 17:58:56.000000000 +0000 @@ -69,7 +69,7 @@ Distribution: %1 - + 散佈：%1 @@ -196,7 +196,7 @@ Cha&llenge Response - + 挑戰回應 Refresh @@ -208,7 +208,7 @@ Changing master key failed: no YubiKey inserted. - + 挑戰主金鑰失敗：沒有插入 YubiKey @@ -397,7 +397,7 @@ Challenge Response: - + 挑戰驗證： @@ -1098,7 +1098,7 @@ Custom icon already exists - + 自訂圖示已經存在 @@ -2140,7 +2140,7 @@ Remember last key files and security dongles - 記住最近的金鑰檔案與安全加密狗 + 記住最近的金鑰檔案與安全鎖 Don't mark database as modified for non-data changes (e.g., expanding groups) diff -Nru keepassxc-2.2.2/src/crypto/SymmetricCipherGcrypt.cpp keepassxc-2.2.4/src/crypto/SymmetricCipherGcrypt.cpp --- keepassxc-2.2.2/src/crypto/SymmetricCipherGcrypt.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/crypto/SymmetricCipherGcrypt.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -86,6 +86,8 @@ gcry_error_t error; + if(m_ctx != nullptr) + gcry_cipher_close(m_ctx); error = gcry_cipher_open(&m_ctx, m_algo, m_mode, 0); if (error != 0) { setErrorString(error); diff -Nru keepassxc-2.2.2/src/format/KeePass2Repair.cpp keepassxc-2.2.4/src/format/KeePass2Repair.cpp --- keepassxc-2.2.2/src/format/KeePass2Repair.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/format/KeePass2Repair.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 @@ -18,36 +19,29 @@ #include "KeePass2Repair.h" #include +#include #include #include "format/KeePass2RandomStream.h" #include "format/KeePass2Reader.h" #include "format/KeePass2XmlReader.h" -KeePass2Repair::KeePass2Repair() - : m_db(nullptr) +KeePass2Repair::RepairOutcome KeePass2Repair::repairDatabase(QIODevice* device, const CompositeKey& key) { -} - -KeePass2Repair::RepairResult KeePass2Repair::repairDatabase(QIODevice* device, const CompositeKey& key) -{ - m_db = nullptr; m_errorStr.clear(); KeePass2Reader reader; reader.setSaveXml(true); - Database* db = reader.readDatabase(device, key, true); + QScopedPointer db(reader.readDatabase(device, key, true)); if (!reader.hasError()) { - delete db; - return NothingTodo; + return qMakePair(NothingTodo, nullptr); } QByteArray xmlData = reader.xmlData(); if (!db || xmlData.isEmpty()) { - delete db; m_errorStr = reader.errorString(); - return UnableToOpen; + return qMakePair(UnableToOpen, nullptr); } bool repairAction = false; @@ -59,8 +53,7 @@ && encodingRegExp.cap(1).compare("utf8", Qt::CaseInsensitive) != 0) { // database is not utf-8 encoded, we don't support repairing that - delete db; - return RepairFailed; + return qMakePair(RepairFailed, nullptr); } } @@ -75,8 +68,7 @@ if (!repairAction) { // we were unable to find the problem - delete db; - return RepairFailed; + return qMakePair(RepairFailed, nullptr); } KeePass2RandomStream randomStream; @@ -84,23 +76,16 @@ KeePass2XmlReader xmlReader; QBuffer buffer(&xmlData); buffer.open(QIODevice::ReadOnly); - xmlReader.readDatabase(&buffer, db, &randomStream); + xmlReader.readDatabase(&buffer, db.data(), &randomStream); if (xmlReader.hasError()) { - delete db; - return RepairFailed; + return qMakePair(RepairFailed, nullptr); } else { - m_db = db; - return RepairSuccess; + return qMakePair(RepairSuccess, db.take()); } } -Database* KeePass2Repair::database() const -{ - return m_db; -} - QString KeePass2Repair::errorString() const { return m_errorStr; diff -Nru keepassxc-2.2.2/src/format/KeePass2Repair.h keepassxc-2.2.4/src/format/KeePass2Repair.h --- keepassxc-2.2.2/src/format/KeePass2Repair.h 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/format/KeePass2Repair.h 2017-12-13 17:58:56.000000000 +0000 @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 @@ -20,6 +21,7 @@ #include #include +#include #include "core/Database.h" #include "keys/CompositeKey.h" @@ -36,14 +38,12 @@ RepairSuccess, RepairFailed }; + using RepairOutcome = QPair; - KeePass2Repair(); - RepairResult repairDatabase(QIODevice* device, const CompositeKey& key); - Database* database() const; + RepairOutcome repairDatabase(QIODevice* device, const CompositeKey& key); QString errorString() const; private: - Database* m_db; QString m_errorStr; }; diff -Nru keepassxc-2.2.2/src/gui/DatabaseOpenWidget.cpp keepassxc-2.2.4/src/gui/DatabaseOpenWidget.cpp --- keepassxc-2.2.2/src/gui/DatabaseOpenWidget.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/gui/DatabaseOpenWidget.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -95,11 +95,16 @@ m_ui->editPassword->setFocus(); #ifdef WITH_XC_YUBIKEY - connect(YubiKey::instance(), SIGNAL(detected(int,bool)), SLOT(yubikeyDetected(int,bool)), Qt::QueuedConnection); - connect(YubiKey::instance(), SIGNAL(detectComplete()), SLOT(yubikeyDetectComplete()), Qt::QueuedConnection); - connect(YubiKey::instance(), SIGNAL(notFound()), SLOT(noYubikeyFound()), Qt::QueuedConnection); + // showEvent() may be called twice, so make sure we are only polling once + if (!m_yubiKeyBeingPolled) { + connect(YubiKey::instance(), SIGNAL(detected(int, bool)), SLOT(yubikeyDetected(int, bool)), + Qt::QueuedConnection); + connect(YubiKey::instance(), SIGNAL(detectComplete()), SLOT(yubikeyDetectComplete()), Qt::QueuedConnection); + connect(YubiKey::instance(), SIGNAL(notFound()), SLOT(noYubikeyFound()), Qt::QueuedConnection); - pollYubikey(); + pollYubikey(); + m_yubiKeyBeingPolled = true; + } #endif } @@ -110,6 +115,7 @@ #ifdef WITH_XC_YUBIKEY // Don't listen to any Yubikey events if we are hidden disconnect(YubiKey::instance(), 0, this, 0); + m_yubiKeyBeingPolled = false; #endif } @@ -311,10 +317,12 @@ m_ui->checkChallengeResponse->setEnabled(true); m_ui->buttonRedetectYubikey->setEnabled(true); m_ui->yubikeyProgress->setVisible(false); + m_yubiKeyBeingPolled = false; } void DatabaseOpenWidget::noYubikeyFound() { m_ui->buttonRedetectYubikey->setEnabled(true); m_ui->yubikeyProgress->setVisible(false); + m_yubiKeyBeingPolled = false; } diff -Nru keepassxc-2.2.2/src/gui/DatabaseOpenWidget.h keepassxc-2.2.4/src/gui/DatabaseOpenWidget.h --- keepassxc-2.2.2/src/gui/DatabaseOpenWidget.h 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/gui/DatabaseOpenWidget.h 2017-12-13 17:58:56.000000000 +0000 @@ -73,6 +73,7 @@ QString m_filename; private: + bool m_yubiKeyBeingPolled = false; Q_DISABLE_COPY(DatabaseOpenWidget) }; diff -Nru keepassxc-2.2.2/src/gui/DatabaseRepairWidget.cpp keepassxc-2.2.4/src/gui/DatabaseRepairWidget.cpp --- keepassxc-2.2.2/src/gui/DatabaseRepairWidget.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/gui/DatabaseRepairWidget.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -1,5 +1,6 @@ /* * Copyright (C) 2016 Felix Geyer + * Copyright (C) 2017 KeePassXC Team * * 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 @@ -69,7 +70,8 @@ delete m_db; } QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); - KeePass2Repair::RepairResult repairResult = repair.repairDatabase(&file, masterKey); + auto repairOutcome = repair.repairDatabase(&file, masterKey); + KeePass2Repair::RepairResult repairResult = repairOutcome.first; QApplication::restoreOverrideCursor(); switch (repairResult) { @@ -83,7 +85,7 @@ emit editFinished(false); return; case KeePass2Repair::RepairSuccess: - m_db = repair.database(); + m_db = repairOutcome.second; MessageBox::warning(this, tr("Success"), tr("The database has been successfully repaired\nYou can now save it.")); emit editFinished(true); return; diff -Nru keepassxc-2.2.2/src/gui/DatabaseTabWidget.cpp keepassxc-2.2.4/src/gui/DatabaseTabWidget.cpp --- keepassxc-2.2.2/src/gui/DatabaseTabWidget.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/gui/DatabaseTabWidget.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -298,8 +298,7 @@ if (!saveDatabase(db)) { return false; } - } - else { + } else if (dbStruct.dbWidget->currentMode() != DatabaseWidget::LockedMode) { QMessageBox::StandardButton result = MessageBox::question( this, tr("Save changes?"), @@ -307,10 +306,9 @@ QMessageBox::Yes | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Yes); if (result == QMessageBox::Yes) { if (!saveDatabase(db)) { - return false; + return false; } - } - else if (result == QMessageBox::Cancel) { + } else if (result == QMessageBox::Cancel) { return false; } } @@ -355,8 +353,13 @@ { DatabaseManagerStruct& dbStruct = m_dbList[db]; - if (dbStruct.saveToFilename) { + if (dbStruct.dbWidget->currentMode() == DatabaseWidget::LockedMode) { + // Never allow saving a locked database; it causes corruption + // We return true since a save is not required + return true; + } + if (dbStruct.saveToFilename) { dbStruct.dbWidget->blockAutoReload(true); QString errorMessage = db->saveToFile(dbStruct.canonicalFilePath); dbStruct.dbWidget->blockAutoReload(false); @@ -375,7 +378,6 @@ MessageWidget::Error); return false; } - } else { return saveDatabaseAs(db); } diff -Nru keepassxc-2.2.2/src/gui/DatabaseWidget.cpp keepassxc-2.2.4/src/gui/DatabaseWidget.cpp --- keepassxc-2.2.2/src/gui/DatabaseWidget.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/gui/DatabaseWidget.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -1125,7 +1125,7 @@ void DatabaseWidget::reloadDatabaseFile() { - if (m_db == nullptr) + if (m_db == nullptr || currentMode() == DatabaseWidget::LockedMode) return; if (! config()->get("AutoReloadOnChange").toBool()) { diff -Nru keepassxc-2.2.2/src/gui/entry/EditEntryWidget.cpp keepassxc-2.2.4/src/gui/entry/EditEntryWidget.cpp --- keepassxc-2.2.2/src/gui/entry/EditEntryWidget.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/gui/entry/EditEntryWidget.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -278,6 +278,7 @@ m_database = database; m_create = create; m_history = history; + m_saved = false; if (history) { setHeadline(QString("%1 > %2").arg(parentName, tr("Entry history"))); @@ -438,6 +439,7 @@ } updateEntryData(m_entry); + m_saved = true; if (!m_create) { m_entry->endUpdate(); @@ -510,7 +512,7 @@ clear(); - emit editFinished(false); + emit editFinished(m_saved); } void EditEntryWidget::clear() diff -Nru keepassxc-2.2.2/src/gui/entry/EditEntryWidget.h keepassxc-2.2.4/src/gui/entry/EditEntryWidget.h --- keepassxc-2.2.2/src/gui/entry/EditEntryWidget.h 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/gui/entry/EditEntryWidget.h 2017-12-13 17:58:56.000000000 +0000 @@ -121,6 +121,7 @@ bool m_create; bool m_history; + bool m_saved; const QScopedPointer m_mainUi; const QScopedPointer m_advancedUi; const QScopedPointer m_autoTypeUi; diff -Nru keepassxc-2.2.2/src/gui/MainWindow.cpp keepassxc-2.2.4/src/gui/MainWindow.cpp --- keepassxc-2.2.2/src/gui/MainWindow.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/gui/MainWindow.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -881,7 +881,7 @@ raise(); activateWindow(); -#if defined(Q_OS_LINUX) && ! defined(QT_NO_DBUS) +#if defined(Q_OS_LINUX) && ! defined(QT_NO_DBUS) && (QT_VERSION < QT_VERSION_CHECK(5, 9, 0)) // re-register global D-Bus menu (needed on Ubuntu with Unity) // see https://github.com/keepassxreboot/keepassxc/issues/271 // and https://bugreports.qt.io/browse/QTBUG-58723 diff -Nru keepassxc-2.2.2/src/gui/PasswordEdit.cpp keepassxc-2.2.4/src/gui/PasswordEdit.cpp --- keepassxc-2.2.2/src/gui/PasswordEdit.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/gui/PasswordEdit.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -31,9 +31,18 @@ { setEchoMode(QLineEdit::Password); updateStylesheet(); - - // set font to system monospace font and increase letter spacing + + // use a monospace font for the password field QFont passwordFont = QFontDatabase::systemFont(QFontDatabase::FixedFont); +#ifdef Q_OS_WIN + // try to use Consolas on Windows, because the default Courier New has too many similar characters + QFont consolasFont = QFontDatabase().font("Consolas", passwordFont.styleName(), passwordFont.pointSize()); + const QFont defaultFont; + if (passwordFont != defaultFont) { + passwordFont = consolasFont; + } +#endif + passwordFont.setLetterSpacing(QFont::PercentageSpacing, 110); setFont(passwordFont); } diff -Nru keepassxc-2.2.2/src/version.h.cmake keepassxc-2.2.4/src/version.h.cmake --- keepassxc-2.2.2/src/version.h.cmake 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/src/version.h.cmake 2017-12-13 17:58:56.000000000 +0000 @@ -1,5 +1,5 @@ #define GIT_HEAD "@GIT_HEAD@" #define GIT_DESCRIBE "@GIT_DESCRIBE@" -#define DIST_HASH "6d46717cfc2d61bfc6a5335b02e95c6b1d9bf482" -#define DIST_DATE "1508624888" +#define DIST_HASH "4723f66d23db95f8318f04ee3aeae448d2305c9c" +#define DIST_DATE "1513187936" diff -Nru keepassxc-2.2.2/tests/gui/TestGui.cpp keepassxc-2.2.4/tests/gui/TestGui.cpp --- keepassxc-2.2.2/tests/gui/TestGui.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/tests/gui/TestGui.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -332,15 +332,27 @@ QTest::keyClicks(passwordRepeatEdit, "something 2"); QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); - // Add entry "something 3" + // Add entry "something 3" using the apply button then click ok QTest::mouseClick(entryNewWidget, Qt::LeftButton); QTest::keyClicks(titleEdit, "something 3"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Apply), Qt::LeftButton); QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); + // Add entry "something 4" using the apply button then click cancel + QTest::mouseClick(entryNewWidget, Qt::LeftButton); + QTest::keyClicks(titleEdit, "something 4"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Apply), Qt::LeftButton); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Cancel), Qt::LeftButton); + + // Add entry "something 5" but click cancel button (does NOT add entry) + QTest::mouseClick(entryNewWidget, Qt::LeftButton); + QTest::keyClicks(titleEdit, "something 5"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Cancel), Qt::LeftButton); + QApplication::processEvents(); - // Confirm that 4 entries now exist - QTRY_COMPARE(entryView->model()->rowCount(), 4); + // Confirm that 5 entries now exist + QTRY_COMPARE(entryView->model()->rowCount(), 5); } void TestGui::testPasswordEntryEntropy() @@ -513,7 +525,7 @@ void TestGui::testSearch() { // Add canned entries for consistent testing - testAddEntry(); + Q_UNUSED(addCannedEntries()); QToolBar* toolBar = m_mainWindow->findChild("toolBar"); @@ -629,7 +641,7 @@ void TestGui::testDeleteEntry() { // Add canned entries for consistent testing - testAddEntry(); + Q_UNUSED(addCannedEntries()); GroupView* groupView = m_dbWidget->findChild("groupView"); EntryView* entryView = m_dbWidget->findChild("entryView"); @@ -905,6 +917,42 @@ delete m_mainWindow; } +int TestGui::addCannedEntries() +{ + int entries_added = 0; + + // Find buttons + QToolBar* toolBar = m_mainWindow->findChild("toolBar"); + QWidget* entryNewWidget = toolBar->widgetForAction(m_mainWindow->findChild("actionEntryNew")); + EditEntryWidget* editEntryWidget = m_dbWidget->findChild("editEntryWidget"); + QLineEdit* titleEdit = editEntryWidget->findChild("titleEdit"); + QLineEdit* passwordEdit = editEntryWidget->findChild("passwordEdit"); + QLineEdit* passwordRepeatEdit = editEntryWidget->findChild("passwordRepeatEdit"); + + // Add entry "test" and confirm added + QTest::mouseClick(entryNewWidget, Qt::LeftButton); + QTest::keyClicks(titleEdit, "test"); + QDialogButtonBox* editEntryWidgetButtonBox = editEntryWidget->findChild("buttonBox"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); + ++entries_added; + + // Add entry "something 2" + QTest::mouseClick(entryNewWidget, Qt::LeftButton); + QTest::keyClicks(titleEdit, "something 2"); + QTest::keyClicks(passwordEdit, "something 2"); + QTest::keyClicks(passwordRepeatEdit, "something 2"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); + ++entries_added; + + // Add entry "something 3" + QTest::mouseClick(entryNewWidget, Qt::LeftButton); + QTest::keyClicks(titleEdit, "something 3"); + QTest::mouseClick(editEntryWidgetButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton); + ++entries_added; + + return entries_added; +} + void TestGui::checkDatabase(QString dbFileName) { if (dbFileName.isEmpty()) diff -Nru keepassxc-2.2.2/tests/gui/TestGui.h keepassxc-2.2.4/tests/gui/TestGui.h --- keepassxc-2.2.2/tests/gui/TestGui.h 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/tests/gui/TestGui.h 2017-12-13 17:58:56.000000000 +0000 @@ -61,6 +61,7 @@ void testDatabaseLocking(); private: + int addCannedEntries(); void checkDatabase(QString dbFileName = ""); void triggerAction(const QString& name); void dragAndDropGroup(const QModelIndex& sourceIndex, const QModelIndex& targetIndex, int row, diff -Nru keepassxc-2.2.2/tests/TestCsvParser.cpp keepassxc-2.2.4/tests/TestCsvParser.cpp --- keepassxc-2.2.2/tests/TestCsvParser.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/tests/TestCsvParser.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -24,17 +24,12 @@ void TestCsvParser::initTestCase() { - parser = new CsvParser(); -} - -void TestCsvParser::cleanupTestCase() -{ - delete parser; + parser.reset(new CsvParser()); } void TestCsvParser::init() { - file = new QTemporaryFile(); + file.reset(new QTemporaryFile()); if (not file->open()) QFAIL("Cannot open file!"); parser->setBackslashSyntax(false); @@ -51,20 +46,20 @@ /****************** TEST CASES ******************/ void TestCsvParser::testMissingQuote() { parser->setTextQualifier(':'); - QTextStream out(file); + QTextStream out(file.data()); out << "A,B\n:BM,1"; QEXPECT_FAIL("", "Bad format", Continue); - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QWARN(parser->getStatus().toLatin1()); } void TestCsvParser::testMalformed() { parser->setTextQualifier(':'); - QTextStream out(file); + QTextStream out(file.data()); out << "A,B,C\n:BM::,1,:2:"; QEXPECT_FAIL("", "Bad format", Continue); - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QWARN(parser->getStatus().toLatin1()); } @@ -72,14 +67,14 @@ void TestCsvParser::testBackslashSyntax() { parser->setBackslashSyntax(true); parser->setTextQualifier(QChar('X')); - QTextStream out(file); + QTextStream out(file.data()); //attended result: one"\t\"wo out << "Xone\\\"\\\\t\\\\\\\"w\noX\n" << "X13X,X2\\X,X,\"\"3\"X\r" << "3,X\"4\"X,,\n" << "XX\n" << "\\"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.at(0).at(0) == "one\"\\t\\\"w\no"); QVERIFY(t.at(1).at(0) == "13"); @@ -94,10 +89,10 @@ } void TestCsvParser::testQuoted() { - QTextStream out(file); + QTextStream out(file.data()); out << "ro,w,\"end, of \"\"\"\"\"\"row\"\"\"\"\"\n" << "2\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.at(0).at(0) == "ro"); QVERIFY(t.at(0).at(1) == "w"); @@ -107,41 +102,41 @@ } void TestCsvParser::testEmptySimple() { - QTextStream out(file); + QTextStream out(file.data()); out <<""; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 0); } void TestCsvParser::testEmptyQuoted() { - QTextStream out(file); + QTextStream out(file.data()); out <<"\"\""; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 0); } void TestCsvParser::testEmptyNewline() { - QTextStream out(file); + QTextStream out(file.data()); out <<"\"\n\""; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 0); } void TestCsvParser::testEmptyFile() { - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 0); } void TestCsvParser::testNewline() { - QTextStream out(file); + QTextStream out(file.data()); out << "1,2\n\n\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 1); QVERIFY(t.at(0).at(0) == "1"); @@ -150,9 +145,9 @@ void TestCsvParser::testCR() { - QTextStream out(file); + QTextStream out(file.data()); out << "1,2\r3,4"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 2); QVERIFY(t.at(0).at(0) == "1"); @@ -163,9 +158,9 @@ void TestCsvParser::testLF() { - QTextStream out(file); + QTextStream out(file.data()); out << "1,2\n3,4"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 2); QVERIFY(t.at(0).at(0) == "1"); @@ -176,9 +171,9 @@ void TestCsvParser::testCRLF() { - QTextStream out(file); + QTextStream out(file.data()); out << "1,2\r\n3,4"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 2); QVERIFY(t.at(0).at(0) == "1"); @@ -189,13 +184,13 @@ void TestCsvParser::testComments() { - QTextStream out(file); + QTextStream out(file.data()); out << " #one\n" << " \t # two, three \r\n" << " #, sing\t with\r" << " #\t me!\n" << "useful,text #1!"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 1); QVERIFY(t.at(0).at(0) == "useful"); @@ -203,21 +198,21 @@ } void TestCsvParser::testColumns() { - QTextStream out(file); + QTextStream out(file.data()); out << "1,2\n" << ",,,,,,,,,a\n" << "a,b,c,d\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(parser->getCsvCols() == 10); } void TestCsvParser::testSimple() { - QTextStream out(file); + QTextStream out(file.data()); out << ",,2\r,2,3\n" << "A,,B\"\n" << " ,,\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 4); QVERIFY(t.at(0).at(0) == ""); @@ -236,11 +231,11 @@ void TestCsvParser::testSeparator() { parser->setFieldSeparator('\t'); - QTextStream out(file); + QTextStream out(file.data()); out << "\t\t2\r\t2\t3\n" << "A\t\tB\"\n" << " \t\t\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 4); QVERIFY(t.at(0).at(0) == ""); @@ -260,10 +255,10 @@ void TestCsvParser::testMultiline() { parser->setTextQualifier(QChar(':')); - QTextStream out(file); + QTextStream out(file.data()); out << ":1\r\n2a::b:,:3\r4:\n" << "2\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.at(0).at(0) == "1\n2a:b"); QVERIFY(t.at(0).at(1) == "3\n4"); @@ -281,10 +276,10 @@ void TestCsvParser::testReparsing() { - QTextStream out(file); + QTextStream out(file.data()); out << ":te\r\nxt1:,:te\rxt2:,:end of \"this\n string\":\n" << "2\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QEXPECT_FAIL("", "Wrong qualifier", Continue); @@ -303,10 +298,10 @@ void TestCsvParser::testQualifier() { parser->setTextQualifier(QChar('X')); - QTextStream out(file); + QTextStream out(file.data()); out << "X1X,X2XX,X,\"\"3\"\"\"X\r" << "3,X\"4\"X,,\n"; - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 2); QVERIFY(t.at(0).at(0) == "1"); @@ -324,10 +319,10 @@ //CORRECT QChar g(0x20AC); //ERROR QChar g("\u20AC"); parser->setFieldSeparator(QChar('A')); - QTextStream out(file); + QTextStream out(file.data()); out << QString("€1A2śA\"3śAż\"Ażac"); - QVERIFY(parser->parse(file)); + QVERIFY(parser->parse(file.data())); t = parser->getCsvTable(); QVERIFY(t.size() == 1); QVERIFY(t.at(0).at(0) == "€1"); diff -Nru keepassxc-2.2.2/tests/TestCsvParser.h keepassxc-2.2.4/tests/TestCsvParser.h --- keepassxc-2.2.2/tests/TestCsvParser.h 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/tests/TestCsvParser.h 2017-12-13 17:58:56.000000000 +0000 @@ -22,6 +22,7 @@ #include #include #include +#include #include "core/CsvParser.h" @@ -37,7 +38,6 @@ void init(); void cleanup(); void initTestCase(); - void cleanupTestCase(); void testUnicode(); void testLF(); @@ -62,8 +62,8 @@ void testColumns(); private: - QTemporaryFile* file; - CsvParser* parser; + QScopedPointer file; + QScopedPointer parser; CsvTable t; void dumpRow(CsvTable table, int row); }; diff -Nru keepassxc-2.2.2/tests/TestGroup.cpp keepassxc-2.2.4/tests/TestGroup.cpp --- keepassxc-2.2.2/tests/TestGroup.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/tests/TestGroup.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -18,9 +18,10 @@ #include "TestGroup.h" +#include #include +#include #include -#include #include #include "core/Database.h" @@ -76,6 +77,7 @@ QCOMPARE(g4->children().size(), 0); QVERIFY(rootGroup->children().at(0) == g1); + QVERIFY(rootGroup->children().at(0) == g1); QVERIFY(g1->children().at(0) == g2); QVERIFY(g1->children().at(1) == g3); QVERIFY(g3->children().contains(g4)); @@ -99,7 +101,6 @@ g3->setIcon(Uuid::random()); g1->setIcon(2); QCOMPARE(spy.count(), 6); - delete db; QVERIFY(rootGroup.isNull()); @@ -107,7 +108,6 @@ QVERIFY(g2.isNull()); QVERIFY(g3.isNull()); QVERIFY(g4.isNull()); - delete tmpRoot; } @@ -117,18 +117,18 @@ Database* db2 = new Database(); QPointer root = db->rootGroup(); - QSignalSpy spyAboutToAdd(db, SIGNAL(groupAboutToAdd(Group*,int))); + QSignalSpy spyAboutToAdd(db, SIGNAL(groupAboutToAdd(Group*, int))); QSignalSpy spyAdded(db, SIGNAL(groupAdded())); QSignalSpy spyAboutToRemove(db, SIGNAL(groupAboutToRemove(Group*))); QSignalSpy spyRemoved(db, SIGNAL(groupRemoved())); - QSignalSpy spyAboutToMove(db, SIGNAL(groupAboutToMove(Group*,Group*,int))); + QSignalSpy spyAboutToMove(db, SIGNAL(groupAboutToMove(Group*, Group*, int))); QSignalSpy spyMoved(db, SIGNAL(groupMoved())); - QSignalSpy spyAboutToAdd2(db2, SIGNAL(groupAboutToAdd(Group*,int))); + QSignalSpy spyAboutToAdd2(db2, SIGNAL(groupAboutToAdd(Group*, int))); QSignalSpy spyAdded2(db2, SIGNAL(groupAdded())); QSignalSpy spyAboutToRemove2(db2, SIGNAL(groupAboutToRemove(Group*))); QSignalSpy spyRemoved2(db2, SIGNAL(groupRemoved())); - QSignalSpy spyAboutToMove2(db2, SIGNAL(groupAboutToMove(Group*,Group*,int))); + QSignalSpy spyAboutToMove2(db2, SIGNAL(groupAboutToMove(Group*, Group*, int))); QSignalSpy spyMoved2(db2, SIGNAL(groupMoved())); Group* g1 = new Group(); @@ -251,7 +251,7 @@ void TestGroup::testDeleteSignals() { - Database* db = new Database(); + QScopedPointer db(new Database()); Group* groupRoot = db->rootGroup(); Group* groupChild = new Group(); Group* groupChildChild = new Group(); @@ -260,15 +260,13 @@ groupChildChild->setObjectName("groupChildChild"); groupChild->setParent(groupRoot); groupChildChild->setParent(groupChild); - QSignalSpy spyAboutToRemove(db, SIGNAL(groupAboutToRemove(Group*))); - QSignalSpy spyRemoved(db, SIGNAL(groupRemoved())); + QSignalSpy spyAboutToRemove(db.data(), SIGNAL(groupAboutToRemove(Group*))); + QSignalSpy spyRemoved(db.data(), SIGNAL(groupRemoved())); delete groupChild; QVERIFY(groupRoot->children().isEmpty()); QCOMPARE(spyAboutToRemove.count(), 2); QCOMPARE(spyRemoved.count(), 2); - delete db; - Group* group = new Group(); Entry* entry = new Entry(); @@ -282,7 +280,7 @@ QCOMPARE(spyEntryRemoved.count(), 1); delete group; - Database* db2 = new Database(); + QScopedPointer db2(new Database()); Group* groupRoot2 = db2->rootGroup(); Group* group2 = new Group(); group2->setParent(groupRoot2); @@ -294,12 +292,11 @@ delete group2; QCOMPARE(spyEntryAboutToRemove2.count(), 1); QCOMPARE(spyEntryRemoved2.count(), 1); - delete db2; } void TestGroup::testCopyCustomIcon() { - Database* dbSource = new Database(); + QScopedPointer dbSource(new Database()); Uuid groupIconUuid = Uuid::random(); QImage groupIcon(16, 16, QImage::Format_RGB32); @@ -321,7 +318,7 @@ entry->setIcon(entryIconUuid); QCOMPARE(entry->icon(), entryIcon); - Database* dbTarget = new Database(); + QScopedPointer dbTarget(new Database()); group->setParent(dbTarget->rootGroup()); QVERIFY(dbTarget->metadata()->containsCustomIcon(groupIconUuid)); @@ -332,37 +329,34 @@ QVERIFY(dbTarget->metadata()->containsCustomIcon(entryIconUuid)); QCOMPARE(dbTarget->metadata()->customIcon(entryIconUuid), entryIcon); QCOMPARE(entry->icon(), entryIcon); - - delete dbSource; - delete dbTarget; } void TestGroup::testClone() { - Database* db = new Database(); + QScopedPointer db(new Database()); - Group* originalGroup = new Group(); + QScopedPointer originalGroup(new Group()); originalGroup->setParent(db->rootGroup()); originalGroup->setName("Group"); originalGroup->setIcon(42); - Entry* originalGroupEntry = new Entry(); - originalGroupEntry->setGroup(originalGroup); + QScopedPointer originalGroupEntry(new Entry()); + originalGroupEntry->setGroup(originalGroup.data()); originalGroupEntry->setTitle("GroupEntryOld"); originalGroupEntry->setIcon(43); originalGroupEntry->beginUpdate(); originalGroupEntry->setTitle("GroupEntry"); originalGroupEntry->endUpdate(); - Group* subGroup = new Group(); - subGroup->setParent(originalGroup); + QScopedPointer subGroup(new Group()); + subGroup->setParent(originalGroup.data()); subGroup->setName("SubGroup"); - Entry* subGroupEntry = new Entry(); - subGroupEntry->setGroup(subGroup); + QScopedPointer subGroupEntry(new Entry()); + subGroupEntry->setGroup(subGroup.data()); subGroupEntry->setTitle("SubGroupEntry"); - Group* clonedGroup = originalGroup->clone(); + QScopedPointer clonedGroup(originalGroup->clone()); QVERIFY(!clonedGroup->parentGroup()); QVERIFY(!clonedGroup->database()); QVERIFY(clonedGroup->uuid() != originalGroup->uuid()); @@ -387,19 +381,15 @@ QVERIFY(clonedSubGroupEntry->uuid() != subGroupEntry->uuid()); QCOMPARE(clonedSubGroupEntry->title(), QString("SubGroupEntry")); - Group* clonedGroupKeepUuid = originalGroup->clone(Entry::CloneNoFlags); + QScopedPointer clonedGroupKeepUuid(originalGroup->clone(Entry::CloneNoFlags)); QCOMPARE(clonedGroupKeepUuid->entries().at(0)->uuid(), originalGroupEntry->uuid()); QCOMPARE(clonedGroupKeepUuid->children().at(0)->entries().at(0)->uuid(), subGroupEntry->uuid()); - - delete clonedGroup; - delete clonedGroupKeepUuid; - delete db; } void TestGroup::testCopyCustomIcons() { - Database* dbSource = new Database(); - Database* dbTarget = new Database(); + QScopedPointer dbSource(new Database()); + QScopedPointer dbTarget(new Database()); QImage iconImage1(1, 1, QImage::Format_RGB32); iconImage1.setPixel(0, 0, qRgb(1, 2, 3)); @@ -407,20 +397,20 @@ QImage iconImage2(1, 1, QImage::Format_RGB32); iconImage2.setPixel(0, 0, qRgb(4, 5, 6)); - Group* group1 = new Group(); + QScopedPointer group1(new Group()); group1->setParent(dbSource->rootGroup()); Uuid group1Icon = Uuid::random(); dbSource->metadata()->addCustomIcon(group1Icon, iconImage1); group1->setIcon(group1Icon); - Group* group2 = new Group(); - group2->setParent(group1); + QScopedPointer group2(new Group()); + group2->setParent(group1.data()); Uuid group2Icon = Uuid::random(); dbSource->metadata()->addCustomIcon(group2Icon, iconImage1); group2->setIcon(group2Icon); - Entry* entry1 = new Entry(); - entry1->setGroup(group2); + QScopedPointer entry1(new Entry()); + entry1->setGroup(group2.data()); Uuid entry1IconOld = Uuid::random(); dbSource->metadata()->addCustomIcon(entry1IconOld, iconImage1); entry1->setIcon(entry1IconOld); @@ -447,27 +437,24 @@ QCOMPARE(metaTarget->customIcon(group1Icon).pixel(0, 0), qRgb(1, 2, 3)); QCOMPARE(metaTarget->customIcon(group2Icon).pixel(0, 0), qRgb(4, 5, 6)); - - delete dbTarget; - delete dbSource; } void TestGroup::testMerge() { - Group* group1 = new Group(); + QScopedPointer group1(new Group()); group1->setName("group 1"); - Group* group2 = new Group(); + QScopedPointer group2(new Group()); group2->setName("group 2"); - Entry* entry1 = new Entry(); - Entry* entry2 = new Entry(); + QScopedPointer entry1(new Entry()); + QScopedPointer entry2(new Entry()); - entry1->setGroup(group1); + entry1->setGroup(group1.data()); entry1->setUuid(Uuid::random()); - entry2->setGroup(group1); + entry2->setGroup(group1.data()); entry2->setUuid(Uuid::random()); - group2->merge(group1); + group2->merge(group1.data()); QCOMPARE(group1->entries().size(), 2); QCOMPARE(group2->entries().size(), 2); @@ -475,25 +462,22 @@ void TestGroup::testMergeDatabase() { - Database* dbSource = createMergeTestDatabase(); - Database* dbDest = new Database(); + QScopedPointer dbSource(createMergeTestDatabase()); + QScopedPointer dbDest(new Database()); - dbDest->merge(dbSource); + dbDest->merge(dbSource.data()); QCOMPARE(dbDest->rootGroup()->children().size(), 2); QCOMPARE(dbDest->rootGroup()->children().at(0)->entries().size(), 2); - - delete dbDest; - delete dbSource; } void TestGroup::testMergeConflict() { - Database* dbSource = createMergeTestDatabase(); + QScopedPointer dbSource(createMergeTestDatabase()); // test merging updated entries // falls back to KeepBoth mode - Database* dbCopy = new Database(); + QScopedPointer dbCopy(new Database()); dbCopy->setRootGroup(dbSource->rootGroup()->clone(Entry::CloneNoFlags)); // sanity check @@ -505,22 +489,19 @@ updatedTimeInfo.setLastModificationTime(updatedTimeInfo.lastModificationTime().addYears(1)); updatedEntry->setTimeInfo(updatedTimeInfo); - dbCopy->merge(dbSource); + dbCopy->merge(dbSource.data()); // one entry is duplicated because of mode QCOMPARE(dbCopy->rootGroup()->children().at(0)->entries().size(), 2); - - delete dbSource; - delete dbCopy; } void TestGroup::testMergeConflictKeepBoth() { - Database* dbSource = createMergeTestDatabase(); + QScopedPointer dbSource(createMergeTestDatabase()); // test merging updated entries // falls back to KeepBoth mode - Database* dbCopy = new Database(); + QScopedPointer dbCopy(new Database()); dbCopy->setRootGroup(dbSource->rootGroup()->clone(Entry::CloneNoFlags)); // sanity check @@ -534,21 +515,18 @@ dbCopy->rootGroup()->setMergeMode(Group::MergeMode::KeepBoth); - dbCopy->merge(dbSource); + dbCopy->merge(dbSource.data()); // one entry is duplicated because of mode QCOMPARE(dbCopy->rootGroup()->children().at(0)->entries().size(), 3); // the older entry was merged from the other db as last in the group Entry* olderEntry = dbCopy->rootGroup()->children().at(0)->entries().at(2); QVERIFY2(olderEntry->attributes()->hasKey("merged"), "older entry is marked with an attribute \"merged\""); - - delete dbSource; - delete dbCopy; } Database* TestGroup::createMergeTestDatabase() { - Database* db = new Database(); + QScopedPointer db(new Database()); Group* group1 = new Group(); group1->setName("group 1"); @@ -566,12 +544,12 @@ group1->setParent(db->rootGroup()); group2->setParent(db->rootGroup()); - return db; + return db.take(); } void TestGroup::testFindEntry() { - Database* db = new Database(); + QScopedPointer db(new Database()); Entry* entry1 = new Entry(); entry1->setTitle(QString("entry1")); @@ -642,13 +620,11 @@ // An invalid UUID. entry = db->rootGroup()->findEntry(QString("febfb01ebcdf9dbd90a3f1579dc")); QVERIFY(entry == nullptr); - - delete db; } void TestGroup::testFindGroupByPath() { - Database* db = new Database(); + QScopedPointer db(new Database()); Group* group1 = new Group(); group1->setName("group1"); @@ -706,13 +682,11 @@ group = db->rootGroup()->findGroupByPath("invalid"); QVERIFY(group == nullptr); - - delete db; } void TestGroup::testPrint() { - Database* db = new Database(); + QScopedPointer db(new Database()); QString output = db->rootGroup()->print(); QCOMPARE(output, QString("[empty]\n")); @@ -731,7 +705,6 @@ output = db->rootGroup()->print(true); QCOMPARE(output, QString("entry1 " + entry1->uuid().toHex() + "\n")); - Group* group1 = new Group(); group1->setName("group1"); @@ -752,5 +725,4 @@ QVERIFY(output.contains(QString("entry1 " + entry1->uuid().toHex() + "\n"))); QVERIFY(output.contains(QString("group1/ " + group1->uuid().toHex() + "\n"))); QVERIFY(output.contains(QString(" entry2 " + entry2->uuid().toHex() + "\n"))); - delete db; } diff -Nru keepassxc-2.2.2/tests/TestKeePass2Writer.cpp keepassxc-2.2.4/tests/TestKeePass2Writer.cpp --- keepassxc-2.2.2/tests/TestKeePass2Writer.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/tests/TestKeePass2Writer.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -148,13 +148,15 @@ KeePass2Repair repair; QFile file(brokenDbFilename); file.open(QIODevice::ReadOnly); - QCOMPARE(repair.repairDatabase(&file, key), KeePass2Repair::RepairSuccess); - Database* dbRepaired = repair.database(); + auto result = repair.repairDatabase(&file, key); + QCOMPARE(result.first, KeePass2Repair::RepairSuccess); + Database* dbRepaired = result.second; QVERIFY(dbRepaired); QCOMPARE(dbRepaired->rootGroup()->entries().size(), 1); QCOMPARE(dbRepaired->rootGroup()->entries().at(0)->username(), QString("testuser").append(QChar(0x20AC))); QCOMPARE(dbRepaired->rootGroup()->entries().at(0)->password(), QString("testpw")); + delete dbRepaired; } void TestKeePass2Writer::cleanupTestCase() diff -Nru keepassxc-2.2.2/tests/TestSymmetricCipher.cpp keepassxc-2.2.4/tests/TestSymmetricCipher.cpp --- keepassxc-2.2.2/tests/TestSymmetricCipher.cpp 2017-10-21 22:28:08.000000000 +0000 +++ keepassxc-2.2.4/tests/TestSymmetricCipher.cpp 2017-12-13 17:58:56.000000000 +0000 @@ -162,7 +162,7 @@ bool ok; for (int i = 0; i < keys.size(); ++i) { - cipher.init(keys[i], ivs[i]); + QVERIFY(cipher.init(keys[i], ivs[i])); QByteArray ptNext = plainTexts[i]; QByteArray ctPrev = ivs[i]; QByteArray ctCur;