Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-12-27 08:19:47 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'keepassx/master'

Browse Source 
# Conflicts:
#	README.md
#	share/translations/keepassx_de.ts
#	src/CMakeLists.txt
#	src/gui/MainWindow.h
This commit is contained in:
Jonathan White 2016-02-27 19:11:09 -05:00
commit aba4fa94be
244 changed files with 17683 additions and 6918 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
src/version.h.cmake export-subst

16
.travis.yml
View File

@ -5,15 +5,21 @@ compiler:
- gcc - gcc
- clang - clang
language: cpp language: cpp
sudo: required
dist: trusty
install: install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake libqt4-dev libgcrypt11-dev zlib1g-dev libxtst-dev; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq install cmake qtbase5-dev libqt5x11extras5-dev qttools5-dev qttools5-dev-tools libgcrypt20-dev zlib1g-dev libxtst-dev xvfb; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew install cmake qt libgcrypt; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq cmake || brew install cmake; fi
before_script: mkdir build && pushd build - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq qt5 || brew install qt5; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew ls | grep -wq libgcrypt || brew install libgcrypt; fi
before_script:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then CMAKE_ARGS="-DCMAKE_PREFIX_PATH=/usr/local/opt/qt5"; fi
- mkdir build && pushd build
script: script:
- cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_GUI_TESTS=ON .. - cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_GUI_TESTS=ON $CMAKE_ARGS ..
- make - make
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then make test ARGS+="-E testgui --output-on-failure"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then make test ARGS+="-E testgui --output-on-failure"; fi
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then xvfb-run -a --server-args="-screen 0 800x600x24" make test ARGS+="-R testgui --output-on-failure"; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then xvfb-run -a --server-args="-screen 0 800x600x24" make test ARGS+="-R testgui --output-on-failure"; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then make test; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then make test ARGS+="--output-on-failure"; fi

52
CHANGELOG
View File

@ -1,3 +1,55 @@
2.0.2 (2016-02-02)
=========================
- Fix regression in database writer that caused it to strip certain special
characters (characters from Unicode plane > 0).
- Fix bug in repair function that caused it to strip non-ASCII characters.
2.0.1 (2016-01-31)
=========================
- Flush temporary file before opening attachment. [#390]
- Disable password generator when showing entry in history mode. [#422]
- Strip invalid XML chars when writing databases. [#392]
- Add repair function to fix databases with invalid XML chars. [#392]
- Display custom icons scaled. [#322]
- Allow opening databases that have no password and keyfile. [#391]
- Fix crash when importing .kdb files with invalid icon ids. [#425]
- Update translations.
2.0 (2015-12-06)
=========================
- Improve UI of the search edit.
- Clear clipboard when locking databases. [#342]
- Enable Ctrl+M shortcut to minimize the window on all platforms. [#329]
- Show a better message when trying to open an old database format. [#338]
- Fix global auto-type behavior with some window managers.
- Show global auto-type window on the active desktop. [#359]
- Disable systray on OS X. [#326]
- Restore main window when clicking on the OS X docker icon. [#326]
2.0 Beta 2 (2015-09-06)
=========================
- Fix crash when locking with search UI open [#309]
- Fix file locking on Mac OS X [#327]
- Set default extension when saving a database [#79, #308]
2.0 Beta 1 (2015-07-18)
=========================
- Remember entry column sizes [#159]
- Add translations
- Support opening attachments directly
- Support cmd:// URLs [#244]
- Protect opened databases with a file lock [#18]
- Export to csv files [#57]
- Add optional tray icon [#153]
- Allow setting the default auto-type sequence for groups [#175]
- Make the kdbx parser more lenient
- Remove --password command line option [#285]
2.0 Alpha 6 (2014-04-12) 2.0 Alpha 6 (2014-04-12)
========================= =========================

57
CMakeLists.txt
View File

@ -21,7 +21,7 @@ endif()
project(KeePassX) project(KeePassX)
cmake_minimum_required(VERSION 2.6.4) cmake_minimum_required(VERSION 2.8.12)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
@ -31,11 +31,10 @@ include(CheckCXXSourceCompiles)
option(WITH_TESTS "Enable building of unit tests" ON) option(WITH_TESTS "Enable building of unit tests" ON)
option(WITH_GUI_TESTS "Enable building of GUI tests" OFF) option(WITH_GUI_TESTS "Enable building of GUI tests" OFF)
option(WITH_LTO "Enable Link Time Optimization (LTO)" OFF) option(WITH_DEV_BUILD "Use only for development. Disables/warns about deprecated methods." OFF)
option(WITH_CXX11 "Build with the C++ 11 standard" ON)
set(KEEPASSX_VERSION "2.0 alpha 6") set(KEEPASSX_VERSION "2.0.2")
set(KEEPASSX_VERSION_NUM "1.9.85") set(KEEPASSX_VERSION_NUM "2.0.2")
if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") if("${CMAKE_C_COMPILER}" MATCHES "clang$" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
set(CMAKE_COMPILER_IS_CLANG 1) set(CMAKE_COMPILER_IS_CLANG 1)
@ -62,7 +61,7 @@ macro(add_gcc_compiler_flags FLAGS)
add_gcc_compiler_cflags("${FLAGS}") add_gcc_compiler_cflags("${FLAGS}")
endmacro(add_gcc_compiler_flags) endmacro(add_gcc_compiler_flags)
add_definitions(-DQT_NO_KEYWORDS -DQT_NO_EXCEPTIONS -DQT_NO_STL -DQT_STRICT_ITERATORS -DQT_NO_CAST_TO_ASCII) add_definitions(-DQT_NO_KEYWORDS -DQT_NO_EXCEPTIONS -DQT_STRICT_ITERATORS -DQT_NO_CAST_TO_ASCII)
add_gcc_compiler_flags("-fno-common -fstack-protector --param=ssp-buffer-size=4") add_gcc_compiler_flags("-fno-common -fstack-protector --param=ssp-buffer-size=4")
add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long") add_gcc_compiler_flags("-Wall -Wextra -Wundef -Wpointer-arith -Wno-long-long")
@ -101,25 +100,16 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,-z,relro")
endif() endif()
if(WITH_LTO) add_gcc_compiler_cxxflags("-std=c++11")
if(CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX)
check_cxx_compiler_flag("-flto -fuse-linker-plugin" LTO_AVAILABLE)
if(LTO_AVAILABLE) if(APPLE)
add_gcc_compiler_flags("-flto -fuse-linker-plugin") add_gcc_compiler_cxxflags("-stdlib=libc++")
else()
message(FATAL_ERROR "This version of gcc doesn't support LTO")
endif(LTO_AVAILABLE)
else()
message(FATAL_ERROR "LTO is only supported with gcc")
endif()
endif() endif()
if (WITH_CXX11) add_gcc_compiler_cflags("-ansi")
add_gcc_compiler_cxxflags("-std=c++0x")
add_gcc_compiler_cflags("-ansi") if(WITH_DEV_BUILD)
else() add_definitions(-DQT_DEPRECATED_WARNINGS -DGCRYPT_NO_DEPRECATED)
add_gcc_compiler_flags("-ansi")
endif() endif()
if(MINGW) if(MINGW)
@ -158,22 +148,18 @@ if(WITH_TESTS)
enable_testing() enable_testing()
endif(WITH_TESTS) endif(WITH_TESTS)
set(QT_REQUIRED_MODULES QtCore QtGui QtTest) find_package(Qt5Core 5.2 REQUIRED)
if(UNIX AND NOT APPLE) find_package(Qt5Concurrent 5.2 REQUIRED)
set(QT_REQUIRED_MODULES ${QT_REQUIRED_MODULES} QtDBus) find_package(Qt5Widgets 5.2 REQUIRED)
endif() find_package(Qt5Test 5.2 REQUIRED)
find_package(Qt5LinguistTools 5.2 REQUIRED)
set(CMAKE_AUTOMOC ON)
find_package(Qt4 4.6.0 REQUIRED ${QT_REQUIRED_MODULES})
include(${QT_USE_FILE})
# Debian sets the the build type to None for package builds. # Debian sets the the build type to None for package builds.
# Make sure we don't enable asserts there. # Make sure we don't enable asserts there.
set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_NONE QT_NO_DEBUG) set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_NONE QT_NO_DEBUG)
find_package(Gcrypt REQUIRED) find_package(Gcrypt 1.6.0 REQUIRED)
if(NOT (${GCRYPT_VERSION_STRING} VERSION_LESS "1.6.0"))
message(STATUS "Gcrypt ${GCRYPT_VERSION_STRING} supports the SALSA20 cipher")
set(GCRYPT_HAS_SALSA20 1)
endif()
find_package(LibMicroHTTPD REQUIRED) find_package(LibMicroHTTPD REQUIRED)
@ -218,10 +204,7 @@ endif()
include_directories(SYSTEM ${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}) include_directories(SYSTEM ${GCRYPT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR})
if(NOT (${CMAKE_VERSION} VERSION_LESS 2.8.3)) include(FeatureSummary)
set(PRINT_SUMMARY ON)
include(FeatureSummary)
endif()
add_subdirectory(src) add_subdirectory(src)
add_subdirectory(share) add_subdirectory(share)

6
COPYING
View File

@ -139,10 +139,10 @@ Files: share/icons/application/*/actions/application-exit.png
share/icons/application/*/actions/password-copy.png share/icons/application/*/actions/password-copy.png
share/icons/application/*/actions/password-show-*.png share/icons/application/*/actions/password-show-*.png
share/icons/application/*/actions/system-search.png share/icons/application/*/actions/system-search.png
share/icons/application/*/actions/username-copy.png
share/icons/application/*/status/dialog-error.png share/icons/application/*/status/dialog-error.png
share/icons/application/*/status/dialog-information.png share/icons/application/*/status/dialog-information.png
share/icons/application/*/status/dialog-warning.png share/icons/application/*/status/dialog-warning.png
share/icons/application/*/status/username-copy.png
share/icons/svg/*.svgz share/icons/svg/*.svgz
Copyright: 2007, Nuno Pinheiro <nuno@oxygen-icons.org> Copyright: 2007, Nuno Pinheiro <nuno@oxygen-icons.org>
2007, David Vignoni <david@icon-king.com> 2007, David Vignoni <david@icon-king.com>
@ -183,3 +183,7 @@ Files: src/streams/qtiocompressor.*
tests/modeltest.* tests/modeltest.*
Copyright: 2009-2012, Nokia Corporation and/or its subsidiary(-ies) Copyright: 2009-2012, Nokia Corporation and/or its subsidiary(-ies)
License: LGPL-2.1 or GPL-3 License: LGPL-2.1 or GPL-3
Files: cmake/GetGitRevisionDescription.cmake*
Copyright: 2009-2010, Iowa State University
License: Boost-1.0

23
LICENSE.BOOST-1.0 Normal file
View File

@ -0,0 +1,23 @@
Boost Software License - Version 1.0 - August 17th, 2003
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

53
README.md
View File

@ -13,22 +13,23 @@ My intention is to keep this repository as up-to-date with the main keePassX rep
The following tools must exist within your PATH: The following tools must exist within your PATH:
* make * make
* cmake (>= 2.6.4) * cmake (>= 2.8.12)
* g++ or clang++ * g++ (>= 4.7) or clang++ (>= 3.0)
The following libraries are required: The following libraries are required:
* Qt 4 (>= 4.6) * Qt 5 (>= 5.2): qtbase and qttools5
* libgcrypt * libgcrypt (>= 1.6)
* zlib * zlib
* libmicrohttpd * libmicrohttpd
* QJSON * QJSON
* libxtst (optional for auto-type on X11) * libxtst (optional for auto-type on X11)
* libxtst, qtx11extras (optional for auto-type on X11)
On Debian you can install them with: On Debian you can install them with:
```bash ```bash
sudo apt-get install build-essential cmake libqt4-dev libgcrypt11-dev zlib1g-dev sudo apt-get install build-essential cmake qtbase5-dev libqt5x11extras5-dev qttools5-dev qttools5-dev-tools libgcrypt20-dev zlib1g-dev
``` ```
#### Build Steps #### Build Steps
@ -51,3 +52,45 @@ sudo make install
``` ```
More detailed instructions available in the INSTALL file. More detailed instructions available in the INSTALL file.
## Contribute
Coordination of work between developers is handled through the [KeePassX development](https://www.keepassx.org/dev/) site.
Requests for enhancements, or reports of bugs encountered, can also be reported through the KeePassX development site.
However, members of the open-source community are encouraged to submit pull requests directly through GitHub.
### Clone Repository
Clone the repository to a suitable location where you can extend and build this project.
```bash
git clone https://github.com/keepassx/keepassx.git
```
**Note:** This will clone the entire contents of the repository at the HEAD revision.
To update the project from within the project's folder you can run the following command:
```bash
git pull
```
### Feature Requests
We're always looking for suggestions to improve our application. If you have a suggestion for improving an existing feature,
or would like to suggest a completely new feature for KeePassX, please file a ticket on the [KeePassX development](https://www.keepassx.org/dev/) site.
### Bug Reports
Our software isn't always perfect, but we strive to always improve our work. You may file bug reports on the [KeePassX development](https://www.keepassx.org/dev/) site.
### Pull Requests
Along with our desire to hear your feedback and suggestions, we're also interested in accepting direct assistance in the form of code.
Issue merge requests against our [GitHub repository](https://github.com/keepassx/keepassx).
### Translations
Translations are managed on [Transifex](https://www.transifex.com/projects/p/keepassx/) which offers a web interface.
Please join an existing language team or request a new one if there is none.

130
cmake/GetGitRevisionDescription.cmake Normal file
View File

@ -0,0 +1,130 @@
# - Returns a version string from Git
#
# These functions force a re-configure on each git commit so that you can
# trust the values of the variables in your build system.
#
# get_git_head_revision(<refspecvar> <hashvar> [<additional arguments to git describe> ...])
#
# Returns the refspec and sha hash of the current head revision
#
# git_describe(<var> [<additional arguments to git describe> ...])
#
# Returns the results of git describe on the source tree, and adjusting
# the output so that it tests false if an error occurs.
#
# git_get_exact_tag(<var> [<additional arguments to git describe> ...])
#
# Returns the results of git describe --exact-match on the source tree,
# and adjusting the output so that it tests false if there was no exact
# matching tag.
#
# Requires CMake 2.6 or newer (uses the 'function' command)
#
# Original Author:
# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
# http://academic.cleardefinition.com
# Iowa State University HCI Graduate Program/VRAC
#
# Copyright Iowa State University 2009-2010.
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE.BOOST-1.0 or copy at
# http://www.boost.org/LICENSE_1_0.txt)
if(__get_git_revision_description)
return()
endif()
set(__get_git_revision_description YES)
# We must run the following at "include" time, not at function call time,
# to find the path to this module rather than the path to a calling list file
get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH)
function(get_git_head_revision _refspecvar _hashvar)
set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
set(GIT_DIR "${GIT_PARENT_DIR}/.git")
while(NOT EXISTS "${GIT_DIR}") # .git dir not found, search parent directories
set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}")
get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH)
if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT)
# We have reached the root directory, we are not in git
set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE)
return()
endif()
set(GIT_DIR "${GIT_PARENT_DIR}/.git")
endwhile()
# check if this is a submodule
if(NOT IS_DIRECTORY ${GIT_DIR})
file(READ ${GIT_DIR} submodule)
string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule})
get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH)
get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE)
endif()
set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data")
if(NOT EXISTS "${GIT_DATA}")
file(MAKE_DIRECTORY "${GIT_DATA}")
endif()
if(NOT EXISTS "${GIT_DIR}/HEAD")
return()
endif()
set(HEAD_FILE "${GIT_DATA}/HEAD")
configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY)
configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in"
"${GIT_DATA}/grabRef.cmake"
@ONLY)
include("${GIT_DATA}/grabRef.cmake")
set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE)
set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE)
endfunction()
function(git_describe _var)
if(NOT GIT_FOUND)
find_package(Git QUIET)
endif()
get_git_head_revision(refspec hash)
if(NOT GIT_FOUND)
set(${_var} "GIT-NOTFOUND" PARENT_SCOPE)
return()
endif()
if(NOT hash)
set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE)
return()
endif()
# TODO sanitize
#if((${ARGN}" MATCHES "&&") OR
# (ARGN MATCHES "||") OR
# (ARGN MATCHES "\\;"))
# message("Please report the following error to the project!")
# message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}")
#endif()
#message(STATUS "Arguments to execute_process: ${ARGN}")
execute_process(COMMAND
"${GIT_EXECUTABLE}"
describe
${hash}
${ARGN}
WORKING_DIRECTORY
"${CMAKE_SOURCE_DIR}"
RESULT_VARIABLE
res
OUTPUT_VARIABLE
out
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
if(NOT res EQUAL 0)
set(out "${out}-${res}-NOTFOUND")
endif()
set(${_var} "${out}" PARENT_SCOPE)
endfunction()
function(git_get_exact_tag _var)
git_describe(out --exact-match ${ARGN})
set(${_var} "${out}" PARENT_SCOPE)
endfunction()

41
cmake/GetGitRevisionDescription.cmake.in Normal file
View File

@ -0,0 +1,41 @@
#
# Internal file for GetGitRevisionDescription.cmake
#
# Requires CMake 2.6 or newer (uses the 'function' command)
#
# Original Author:
# 2009-2010 Ryan Pavlik <rpavlik@iastate.edu> <abiryan@ryand.net>
# http://academic.cleardefinition.com
# Iowa State University HCI Graduate Program/VRAC
#
# Copyright Iowa State University 2009-2010.
# Distributed under the Boost Software License, Version 1.0.
# (See accompanying file LICENSE.BOOST-1.0 or copy at
# http://www.boost.org/LICENSE_1_0.txt)
set(HEAD_HASH)
file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024)
string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS)
if(HEAD_CONTENTS MATCHES "ref")
# named branch
string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}")
if(EXISTS "@GIT_DIR@/${HEAD_REF}")
configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY)
else()
configure_file("@GIT_DIR@/packed-refs" "@GIT_DATA@/packed-refs" COPYONLY)
file(READ "@GIT_DATA@/packed-refs" PACKED_REFS)
if(${PACKED_REFS} MATCHES "([0-9a-z]*) ${HEAD_REF}")
set(HEAD_HASH "${CMAKE_MATCH_1}")
endif()
endif()
else()
# detached HEAD
configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY)
endif()
if(NOT HEAD_HASH)
file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024)
string(STRIP "${HEAD_HASH}" HEAD_HASH)
endif()

5
share/linux/keepassx.desktop
View File

@ -1,9 +1,10 @@
[Desktop Entry] [Desktop Entry]
Name=KeePassX Name=KeePassX
GenericName=Cross Platform Password Manager GenericName=Password Manager
GenericName[de]=Passwortverwaltung GenericName[de]=Passwortverwaltung
GenericName[es]=Gestor de contraseñas multiplataforma GenericName[es]=Gestor de contraseñas
GenericName[fr]=Gestionnaire de mot de passe GenericName[fr]=Gestionnaire de mot de passe
GenericName[ru]=менеджер паролей
Exec=keepassx %f Exec=keepassx %f
Icon=keepassx Icon=keepassx
Terminal=false Terminal=false

4
share/translations/CMakeLists.txt
View File

@ -17,9 +17,9 @@ file(GLOB TRANSLATION_FILES *.ts)
get_filename_component(TRANSLATION_EN_ABS keepassx_en.ts ABSOLUTE) get_filename_component(TRANSLATION_EN_ABS keepassx_en.ts ABSOLUTE)
list(REMOVE_ITEM TRANSLATION_FILES keepassx_en.ts) list(REMOVE_ITEM TRANSLATION_FILES keepassx_en.ts)
list(REMOVE_ITEM TRANSLATION_FILES ${TRANSLATION_EN_ABS}) list(REMOVE_ITEM TRANSLATION_FILES ${TRANSLATION_EN_ABS})
message(STATUS ${TRANSLATION_FILES}) message(STATUS "${TRANSLATION_FILES}")
qt4_add_translation(QM_FILES ${TRANSLATION_FILES}) qt5_add_translation(QM_FILES ${TRANSLATION_FILES})
install(FILES ${QM_FILES} DESTINATION ${DATA_INSTALL_DIR}/translations) install(FILES ${QM_FILES} DESTINATION ${DATA_INSTALL_DIR}/translations)
add_custom_target(translations DEPENDS ${QM_FILES}) add_custom_target(translations DEPENDS ${QM_FILES})

302
share/translations/keepassx_cs.ts
View File

@ -3,22 +3,26 @@
<name>AboutDialog</name> <name>AboutDialog</name>
<message> <message>
<source>About KeePassX</source> <source>About KeePassX</source>
<translation>O aplikaci KeePassX</translation> <translation>O KeePassX</translation>
</message> </message>
<message> <message>
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation>KeePassX je šířeno za podmínek licence GNU General Public License (GPL) verze 2 a (případně) 3.</translation> <translation>KeePassX je šířeno za podmínek licence GNU General Public License (GPL) verze 2 a (případně) 3.</translation>
</message> </message>
<message>
<source>Revision</source>
<translation>Revize</translation>
</message>
</context> </context>
<context> <context>
<name>AutoType</name> <name>AutoType</name>
<message> <message>
<source>Auto-Type - KeePassX</source> <source>Auto-Type - KeePassX</source>
<translation>Samočinné vyplňování – KeePassX</translation> <translation>Automatické vyplňování – KeePassX</translation>
</message> </message>
<message> <message>
<source>Couldn&apos;t find an entry that matches the window title:</source> <source>Couldn&apos;t find an entry that matches the window title:</source>
<translation>Nelze nalézt položku, která by se shodovala s titulkem okna:</translation> <translation>Nedaří se nalézt položku, která by se shodovala s titulkem okna:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -40,11 +44,11 @@
<name>AutoTypeSelectDialog</name> <name>AutoTypeSelectDialog</name>
<message> <message>
<source>Auto-Type - KeePassX</source> <source>Auto-Type - KeePassX</source>
<translation>Samočinné vyplňování – KeePassX</translation> <translation>Automatické vyplňování – KeePassX</translation>
</message> </message>
<message> <message>
<source>Select entry to Auto-Type:</source> <source>Select entry to Auto-Type:</source>
<translation>Vyberte položku pro samočinné vyplňování:</translation> <translation>Vyberte položku, kterou se bude automaticky vyplňovat:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -91,7 +95,7 @@
</message> </message>
<message> <message>
<source>Unable to create Key File : </source> <source>Unable to create Key File : </source>
<translation>Nelze vytvořit soubor s klíčem :</translation> <translation>Nedaří se vytvořit soubor s klíčem :</translation>
</message> </message>
<message> <message>
<source>Select a key file</source> <source>Select a key file</source>
@ -103,11 +107,21 @@
</message> </message>
<message> <message>
<source>Do you really want to use an empty string as password?</source> <source>Do you really want to use an empty string as password?</source>
<translation>Opravdu chcete heslo ponechat nevyplněné?</translation> <translation>Opravdu chcete ponechat bez hesla, tedy nechráněné?</translation>
</message> </message>
<message> <message>
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Zadání hesla nejsou shodná.</translation> <translation>Nepodařilo se vám zadat heslo do obou kolonek stejně.</translation>
</message>
<message>
<source>Failed to set key file</source>
<translation>Nezdařilo se nastavit soubor s klíčem</translation>
</message>
<message>
<source>Failed to set %1 as the Key file:
%2</source>
<translation>Nezdařilo se nastavit %1 jako soubor s klíčem:
%2</translation>
</message> </message>
</context> </context>
<context> <context>
@ -134,11 +148,11 @@
</message> </message>
<message> <message>
<source>Unable to open the database.</source> <source>Unable to open the database.</source>
<translation>Databázi nebylo možné otevřít.</translation> <translation>Databázi se nepodařilo otevřít.</translation>
</message> </message>
<message> <message>
<source>Can&apos;t open key file</source> <source>Can&apos;t open key file</source>
<translation>Soubor s klíčem nelze otevřít.</translation> <translation>Soubor s klíčem se nedaří otevřít</translation>
</message> </message>
<message> <message>
<source>All files</source> <source>All files</source>
@ -165,7 +179,7 @@
</message> </message>
<message> <message>
<source>Transform rounds:</source> <source>Transform rounds:</source>
<translation>Počet průchodů:</translation> <translation>Počet průchodů algoritmu:</translation>
</message> </message>
<message> <message>
<source>Default username:</source> <source>Default username:</source>
@ -173,7 +187,7 @@
</message> </message>
<message> <message>
<source>Use recycle bin:</source> <source>Use recycle bin:</source>
<translation>Použít Koš:</translation> <translation>Namísto mazání přesouvat do Koše:</translation>
</message> </message>
<message> <message>
<source> MiB</source> <source> MiB</source>
@ -185,11 +199,11 @@
</message> </message>
<message> <message>
<source>Max. history items:</source> <source>Max. history items:</source>
<translation>Nejvyšší umožněný položek historie:</translation> <translation>Nejvyšší umožněný počet položek historie:</translation>
</message> </message>
<message> <message>
<source>Max. history size:</source> <source>Max. history size:</source>
<translation>Nejvyšší umožněná velikost historie:</translation> <translation>Nejvyšší umožněný objem dat historie záznamů:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -200,7 +214,7 @@
</message> </message>
<message> <message>
<source>KeePass 2 Database</source> <source>KeePass 2 Database</source>
<translation>Databáze aplikace KeePass 2</translation> <translation>Databáze aplikace KeePass verze 2</translation>
</message> </message>
<message> <message>
<source>All files</source> <source>All files</source>
@ -220,11 +234,11 @@
</message> </message>
<message> <message>
<source>Open KeePass 1 database</source> <source>Open KeePass 1 database</source>
<translation>Otevřít databázi aplikace KeePass 1</translation> <translation>Otevřít databázi aplikace KeePass verze 1</translation>
</message> </message>
<message> <message>
<source>KeePass 1 database</source> <source>KeePass 1 database</source>
<translation>Databáze aplikace KeePass 1</translation> <translation>Databáze aplikace KeePass verze 1</translation>
</message> </message>
<message> <message>
<source>All files (*)</source> <source>All files (*)</source>
@ -234,12 +248,6 @@
<source>Close?</source> <source>Close?</source>
<translation>Zavřít?</translation> <translation>Zavřít?</translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation>%1 je upravováno.
Přesto zavřít?</translation>
</message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
<translation>Uložit změny?</translation> <translation>Uložit změny?</translation>
@ -270,6 +278,64 @@ Uložit změny?</translation>
<source>locked</source> <source>locked</source>
<translation>zamčeno</translation> <translation>zamčeno</translation>
</message> </message>
<message>
<source>The database you are trying to open is locked by another instance of KeePassX.
Do you want to open it anyway? Alternatively the database is opened read-only.</source>
<translation>Pro databázi, kterou se pokoušíte otevřít, existuje zámek úprav (stejnojmenný
.lock soubor). To znamená, že je nejspíš již otevřená v jiném okně KeePassX
(v případě sdíleného úložiště, třeba i na jiném počítači). Pokud tomu tak není,
je zámek nejspíš pozůstatkem předchozího neočekávaného ukončení aplikace
a je možné ho smazat. V každém případě, dotčenou databázi je možné otevřít
i tak, ale pouze pro čtení. Chcete?</translation>
</message>
<message>
<source>Lock database</source>
<translation>Uzamknout databázi</translation>
</message>
<message>
<source>Can't lock the database as you are currently editing it.
Please press cancel to finish your changes or discard them.</source>
<translation>Nelze uzamknout databázi, protože ji v tuto chvíli upravujete.
Pokud chcete změny dokončit, klikněte na Zrušit. V opačném případě změny zahodíte.</translation>
</message>
<message>
<source>This database has never been saved.
You can save the database or stop locking it.</source>
<translation>Tato databáze doposud ještě nebyla uložena.
Buď ji můžete uložit, nebo neuzamykat.</translation>
</message>
<message>
<source>This database has been modified.
Do you want to save the database before locking it?
Otherwise your changes are lost.</source>
<translation>Tato databáze byla upravena.
Chcete ji před uzamčením uložit?
Pokud ne, provedené změny budou ztraceny.</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation>%1 je právě upravováno.
Přesto zavřít a zahodit změny?</translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation>Exportovat databázi do CSV souboru</translation>
</message>
<message>
<source>CSV file</source>
<translation>CSV soubor</translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation>Zápis do CSV souboru se nezdařil.</translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassX.
Do you want to save it anyway?</source>
<translation>Databáze, kterou se pokoušíte uložit, je uzamčena jinou instancí KeePassX.
Přesto uložit?</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
@ -283,7 +349,7 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Do you really want to delete the entry &quot;%1&quot; for good?</source> <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
<translation>Opravdu chcete smazat položku %1?</translation> <translation>Opravdu chcete nenávratně smazat položku %1?</translation>
</message> </message>
<message> <message>
<source>Delete entries?</source> <source>Delete entries?</source>
@ -291,7 +357,7 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Do you really want to delete %1 entries for good?</source> <source>Do you really want to delete %1 entries for good?</source>
<translation>Opravdu chcete smazat %1 položek?</translation> <translation>Opravdu chcete nenávratně smazat %1 položek?</translation>
</message> </message>
<message> <message>
<source>Move entries to recycle bin?</source> <source>Move entries to recycle bin?</source>
@ -299,7 +365,7 @@ Uložit změny?</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>Do you really want to move %n entry(s) to the recycle bin?</source> <source>Do you really want to move %n entry(s) to the recycle bin?</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> <translation><numerusform>Opravdu chcete přesunout %n položku do Koše?</numerusform><numerusform>Opravdu chcete přesunout %n položky do Koše?</numerusform><numerusform>Opravdu chcete přesunout %n položek do Koše?</numerusform></translation>
</message> </message>
<message> <message>
<source>Delete group?</source> <source>Delete group?</source>
@ -307,12 +373,20 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Do you really want to delete the group &quot;%1&quot; for good?</source> <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
<translation>Opravdu chcete smazat skupinu %1?</translation> <translation>Opravdu chcete nenávratně smazat skupinu %1?</translation>
</message> </message>
<message> <message>
<source>Current group</source> <source>Current group</source>
<translation>Stávající skupina</translation> <translation>Stávající skupina</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Nepodařilo se spočítat hlavní klíč</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidget</name> <name>EditEntryWidget</name>
@ -330,7 +404,7 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Auto-Type</source> <source>Auto-Type</source>
<translation>Samočinné vyplňování</translation> <translation>Automatické vyplňování</translation>
</message> </message>
<message> <message>
<source>Properties</source> <source>Properties</source>
@ -370,7 +444,7 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Unable to open file</source> <source>Unable to open file</source>
<translation>Soubor nelze otevřít</translation> <translation>Soubor se nedaří otevřít</translation>
</message> </message>
<message> <message>
<source>Save attachment</source> <source>Save attachment</source>
@ -379,7 +453,7 @@ Uložit změny?</translation>
<message> <message>
<source>Unable to save the attachment: <source>Unable to save the attachment:
</source> </source>
<translation>Přílohu nelze uložit: <translation>Přílohu se nedaří uložit:
</translation> </translation>
</message> </message>
<message> <message>
@ -388,11 +462,11 @@ Uložit změny?</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>%n week(s)</source> <source>%n week(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> <translation><numerusform>%n týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>%n month(s)</source> <source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> <translation><numerusform>%n měsíc</numerusform><numerusform>%n měsíce</numerusform><numerusform>%n měsíců</numerusform></translation>
</message> </message>
<message> <message>
<source>1 year</source> <source>1 year</source>
@ -425,20 +499,24 @@ Uložit změny?</translation>
<source>Save</source> <source>Save</source>
<translation>Uložit</translation> <translation>Uložit</translation>
</message> </message>
<message>
<source>Open</source>
<translation>Otevřít</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAutoType</name> <name>EditEntryWidgetAutoType</name>
<message> <message>
<source>Enable Auto-Type for this entry</source> <source>Enable Auto-Type for this entry</source>
<translation>Zapnout samočinné vyplňování u této položky</translation> <translation>Zapnout automatické vyplňování této položky</translation>
</message> </message>
<message> <message>
<source>Inherit default Auto-Type sequence from the group</source> <source>Inherit default Auto-Type sequence from the group</source>
<translation>Převzít výchozí posloupnost samočinného vyplňování ze skupiny</translation> <translation>Převzít výchozí posloupnost automatického vyplňování od skupiny</translation>
</message> </message>
<message> <message>
<source>Use custom Auto-Type sequence:</source> <source>Use custom Auto-Type sequence:</source>
<translation>Použít vlastní posloupnost samočinného vyplňování:</translation> <translation>Použít vlastní posloupnost automatického vyplňování:</translation>
</message> </message>
<message> <message>
<source>+</source> <source>+</source>
@ -500,7 +578,7 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Gen.</source> <source>Gen.</source>
<translation>Obec.</translation> <translation>Tvoř</translation>
</message> </message>
<message> <message>
<source>URL:</source> <source>URL:</source>
@ -551,7 +629,7 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Inherit from parent group (%1)</source> <source>Inherit from parent group (%1)</source>
<translation>Převzít z nadřazené skupiny (%1)</translation> <translation>Převzít od nadřazené skupiny (%1)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -574,7 +652,15 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Auto-type</source> <source>Auto-type</source>
<translation>Samočinné vyplňování</translation> <translation>Automatické vyplňování</translation>
</message>
<message>
<source>Use default auto-type sequence of parent group</source>
<translation>Použít výchozí posloupnost automatického vyplňování z nadřazené skupiny</translation>
</message>
<message>
<source>Set default auto-type sequence</source>
<translation>Nastavit výchozí posloupnost automatického vyplňování</translation>
</message> </message>
</context> </context>
<context> <context>
@ -585,15 +671,15 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Use custom icon</source> <source>Use custom icon</source>
<translation>Použít vlastní ikonu</translation> <translation>Použít svou vlastní ikonu</translation>
</message> </message>
<message> <message>
<source>Add custom icon</source> <source>Add custom icon</source>
<translation>Přidat vlastní ikonu</translation> <translation>Přidat svou vlastní ikonu</translation>
</message> </message>
<message> <message>
<source>Delete custom icon</source> <source>Delete custom icon</source>
<translation>Smazat vlastní ikonu</translation> <translation>Smazat svou vlastní ikonu</translation>
</message> </message>
<message> <message>
<source>Images</source> <source>Images</source>
@ -613,26 +699,26 @@ Uložit změny?</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>Can&apos;t delete icon. Still used by %n item(s).</source> <source>Can&apos;t delete icon. Still used by %n item(s).</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> <translation><numerusform>Ikonu není možné smazat. Je používána %n položkou.</numerusform><numerusform>Ikonu není možné smazat. Je používána %n položkami.</numerusform><numerusform>Ikonu není možné smazat. Používá ji %n položek</numerusform></translation>
</message> </message>
</context> </context>
<context> <context>
<name>EditWidgetProperties</name> <name>EditWidgetProperties</name>
<message> <message>
<source>Created:</source> <source>Created:</source>
<translation>Vytvořeno:</translation> <translation>Okamžik vytvoření:</translation>
</message> </message>
<message> <message>
<source>Modified:</source> <source>Modified:</source>
<translation>Čas poslední změny:</translation> <translation>Okamžik minulé úpravy:</translation>
</message> </message>
<message> <message>
<source>Accessed:</source> <source>Accessed:</source>
<translation>Čas posledního přístupu:</translation> <translation>Okamžik minulého přístupu:</translation>
</message> </message>
<message> <message>
<source>Uuid:</source> <source>Uuid:</source>
<translation>Uuid identifikátor:</translation> <translation>Univerzálně jedinečný identifikátor:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -646,7 +732,7 @@ Uložit změny?</translation>
<name>EntryHistoryModel</name> <name>EntryHistoryModel</name>
<message> <message>
<source>Last modified</source> <source>Last modified</source>
<translation>Čas poslední změny</translation> <translation>Okamžik minulé změny</translation>
</message> </message>
<message> <message>
<source>Title</source> <source>Title</source>
@ -691,7 +777,7 @@ Uložit změny?</translation>
<name>KeePass1OpenWidget</name> <name>KeePass1OpenWidget</name>
<message> <message>
<source>Import KeePass1 database</source> <source>Import KeePass1 database</source>
<translation>Importovat databázi aplikace KeePass 1</translation> <translation>Importovat databázi aplikace KeePass verze 1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -724,6 +810,10 @@ Uložit změny?</translation>
<source>Root</source> <source>Root</source>
<translation>Kořen</translation> <translation>Kořen</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Nedaří se spočítat hlavní klíč</translation>
</message>
</context> </context>
<context> <context>
<name>KeePass2Reader</name> <name>KeePass2Reader</name>
@ -739,12 +829,16 @@ Uložit změny?</translation>
<source>Wrong key or database file is corrupt.</source> <source>Wrong key or database file is corrupt.</source>
<translation>Chybný klíč nebo je databáze poškozená.</translation> <translation>Chybný klíč nebo je databáze poškozená.</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Nedaří se spočítat hlavní klíč</translation>
</message>
</context> </context>
<context> <context>
<name>Main</name> <name>Main</name>
<message> <message>
<source>Fatal error while testing the cryptographic functions.</source> <source>Fatal error while testing the cryptographic functions.</source>
<translation>Při testování šifrovacích funkcí došlo k fatální chybě.</translation> <translation>Při ověřování šifrovacích funkcí byl zjištěn fatální nedostatek.</translation>
</message> </message>
<message> <message>
<source>KeePassX - Error</source> <source>KeePassX - Error</source>
@ -777,10 +871,6 @@ Uložit změny?</translation>
<source>Groups</source> <source>Groups</source>
<translation>Skupiny</translation> <translation>Skupiny</translation>
</message> </message>
<message>
<source>Extras</source>
<translation>Doplňující</translation>
</message>
<message> <message>
<source>View</source> <source>View</source>
<translation>Zobrazit</translation> <translation>Zobrazit</translation>
@ -847,7 +937,7 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Import KeePass 1 database</source> <source>Import KeePass 1 database</source>
<translation>Importovat databázi aplikace KeePass 1</translation> <translation>Importovat databázi aplikace KeePass verze 1</translation>
</message> </message>
<message> <message>
<source>Clone entry</source> <source>Clone entry</source>
@ -857,18 +947,10 @@ Uložit změny?</translation>
<source>Find</source> <source>Find</source>
<translation>Najít</translation> <translation>Najít</translation>
</message> </message>
<message>
<source>Username</source>
<translation>Uživatelské jméno</translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation>Zkopírovat uživatelské jméno do schránky</translation> <translation>Zkopírovat uživatelské jméno do schránky</translation>
</message> </message>
<message>
<source>Password</source>
<translation>Heslo</translation>
</message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation>Zkopírovat heslo do schránky</translation> <translation>Zkopírovat heslo do schránky</translation>
@ -879,7 +961,7 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Perform Auto-Type</source> <source>Perform Auto-Type</source>
<translation>Provést samočinné vyplnění</translation> <translation>Provést automatické vyplnění</translation>
</message> </message>
<message> <message>
<source>Open URL</source> <source>Open URL</source>
@ -913,6 +995,22 @@ Uložit změny?</translation>
<source>Toggle window</source> <source>Toggle window</source>
<translation>Přepnout okno</translation> <translation>Přepnout okno</translation>
</message> </message>
<message>
<source>Tools</source>
<translation>Nástroje</translation>
</message>
<message>
<source>Copy username</source>
<translation>Zkopírovat uživatelské jméno</translation>
</message>
<message>
<source>Copy password</source>
<translation>Zkopírovat heslo</translation>
</message>
<message>
<source>Export to CSV file</source>
<translation>Exportovat do CSV souboru</translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
@ -942,15 +1040,15 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Special Characters</source> <source>Special Characters</source>
<translation>Speciální znaky</translation> <translation>Zvláštní znaky</translation>
</message> </message>
<message> <message>
<source>Exclude look-alike characters</source> <source>Exclude look-alike characters</source>
<translation>Vynechat podobně vypadající znaky</translation> <translation>Vynechat podobně vypadající znaky (předejití záměně)</translation>
</message> </message>
<message> <message>
<source>Ensure that the password contains characters from every group</source> <source>Ensure that the password contains characters from every group</source>
<translation>Zajistit, aby heslo obsahovalo znaky ze všech zvolených skupin</translation> <translation>Zajistit, aby heslo obsahovalo znaky ze všech zvolených skupin znaků</translation>
</message> </message>
<message> <message>
<source>Accept</source> <source>Accept</source>
@ -969,11 +1067,11 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Unknown option &apos;%1&apos;.</source> <source>Unknown option &apos;%1&apos;.</source>
<translation>Neznámá volba %1.</translation> <translation>Neznámá předvolba %1.</translation>
</message> </message>
<message> <message>
<source>Unknown options: %1.</source> <source>Unknown options: %1.</source>
<translation>Neznámé volby: %1.</translation> <translation>Neznámé předvolby: %1.</translation>
</message> </message>
<message> <message>
<source>Missing value after &apos;%1&apos;.</source> <source>Missing value after &apos;%1&apos;.</source>
@ -985,7 +1083,7 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>[options]</source> <source>[options]</source>
<translation>[volby]</translation> <translation>[předvolby]</translation>
</message> </message>
<message> <message>
<source>Usage: %1</source> <source>Usage: %1</source>
@ -993,7 +1091,7 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Options:</source> <source>Options:</source>
<translation>Volby:</translation> <translation>Předvolby:</translation>
</message> </message>
<message> <message>
<source>Arguments:</source> <source>Arguments:</source>
@ -1004,7 +1102,7 @@ Uložit změny?</translation>
<name>QSaveFile</name> <name>QSaveFile</name>
<message> <message>
<source>Existing file %1 is not writable</source> <source>Existing file %1 is not writable</source>
<translation>Existující soubor %1 není zapisovatelný</translation> <translation>Do stávajícího souboru %1 nelze zapisovat</translation>
</message> </message>
<message> <message>
<source>Writing canceled by application</source> <source>Writing canceled by application</source>
@ -1012,7 +1110,7 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Partial write. Partition full?</source> <source>Partial write. Partition full?</source>
<translation>Zápis nebylo možné dokončit zcela. Nedostatek volného místa?</translation> <translation>Zápis nebylo možné zcela dokončit. Nedostatek volného místa?</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1023,15 +1121,15 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Error writing to underlying device: </source> <source>Error writing to underlying device: </source>
<translation>Chyba při zápisu na zařízení:</translation> <translation>Došlo k chybě při zápisu na zařízení, na kterém se nachází:</translation>
</message> </message>
<message> <message>
<source>Error opening underlying device: </source> <source>Error opening underlying device: </source>
<translation>Chyba při otevírání zařízení:</translation> <translation>Došlo k chybě při otevírání zařízení, na kterém se nachází:</translation>
</message> </message>
<message> <message>
<source>Error reading data from underlying device: </source> <source>Error reading data from underlying device: </source>
<translation>Chyba při čtení dat ze zařízení:</translation> <translation>Došlo k chybě při čtení dat ze zařízení, na kterém se nachází:</translation>
</message> </message>
<message> <message>
<source>Internal zlib error when decompressing: </source> <source>Internal zlib error when decompressing: </source>
@ -1042,7 +1140,7 @@ Uložit změny?</translation>
<name>QtIOCompressor::open</name> <name>QtIOCompressor::open</name>
<message> <message>
<source>The gzip format not supported in this version of zlib.</source> <source>The gzip format not supported in this version of zlib.</source>
<translation>Formát tohoto gzip archivu není podporován touto verzí knihovny zlib.</translation> <translation>Použitý formát gzip komprese není podporován verzí knihovny zlib, která je právě používána na tomto systému.</translation>
</message> </message>
<message> <message>
<source>Internal zlib error: </source> <source>Internal zlib error: </source>
@ -1087,39 +1185,35 @@ Uložit změny?</translation>
<name>SettingsWidgetGeneral</name> <name>SettingsWidgetGeneral</name>
<message> <message>
<source>Remember last databases</source> <source>Remember last databases</source>
<translation>Pamatovat si nedávno otevírané databáze</translation> <translation>Pamatovat si nedávno otevřené databáze</translation>
</message> </message>
<message> <message>
<source>Open previous databases on startup</source> <source>Open previous databases on startup</source>
<translation>Při startu otevřít minule otevřenou databázi</translation> <translation>Při spuštění aplikace otevřít minule otevřené databáze</translation>
</message>
<message>
<source>Mark as modified on expanded state changes</source>
<translation>Při změnách rozšířeného stavu označit jako změněné</translation>
</message> </message>
<message> <message>
<source>Automatically save on exit</source> <source>Automatically save on exit</source>
<translation>Při ukončování samočinně uložit</translation> <translation>Před ukončením aplikace automaticky uložit případné změny</translation>
</message> </message>
<message> <message>
<source>Automatically save after every change</source> <source>Automatically save after every change</source>
<translation>Po každé změně okamžitě samočinně uložit</translation> <translation>Po každé změně hned automaticky uložit</translation>
</message> </message>
<message> <message>
<source>Minimize when copying to clipboard</source> <source>Minimize when copying to clipboard</source>
<translation>Po zkopírování do schránky samočinně zminimalizovat aplikaci</translation> <translation>Po zkopírování údaje do schránky automaticky minimalizovat okno KeePassX (do popředí se tak dostane okno, do kterého se zkopírovaný údaj bude vkládat)</translation>
</message> </message>
<message> <message>
<source>Use group icon on entry creation</source> <source>Use group icon on entry creation</source>
<translation>Při vytváření položky použít ikonu skupiny</translation> <translation>Pro vytvářenou položku použít ikonu skupiny, do které spadá</translation>
</message> </message>
<message> <message>
<source>Global Auto-Type shortcut</source> <source>Global Auto-Type shortcut</source>
<translation>Všeobecná klávesová zkratka pro samočinné vyplňování</translation> <translation>Klávesová zkratka pro všeobecné automatické vyplňování</translation>
</message> </message>
<message> <message>
<source>Use entry title to match windows for global auto-type</source> <source>Use entry title to match windows for global auto-type</source>
<translation>Použít titulek položky pro porovnání s okny pro všeobecné samočinné vyplňování</translation> <translation>Všeobecné automatické vyplňování provádět na základě shody titulku položky s titulkem okna.</translation>
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
@ -1127,22 +1221,26 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Show a system tray icon</source> <source>Show a system tray icon</source>
<translation>Zobrazit ikonu v oznamovací oblasti</translation> <translation>Zobrazit ikonu v oznamovací oblasti systémového panelu</translation>
</message> </message>
<message> <message>
<source>Hide window to system tray when minimized</source> <source>Hide window to system tray when minimized</source>
<translation>Minimalizovat do oznamovací oblasti</translation> <translation>Minimalizovat okno aplikace do oznamovací oblasti systémového panelu</translation>
</message>
<message>
<source>Remember last key files</source>
<translation>Pamatovat si nedávno otevřené soubory s klíči</translation>
</message> </message>
</context> </context>
<context> <context>
<name>SettingsWidgetSecurity</name> <name>SettingsWidgetSecurity</name>
<message> <message>
<source>Clear clipboard after</source> <source>Clear clipboard after</source>
<translation>Vyčistit schránku po uplynutí</translation> <translation>Vymazat obsah schránky po uplynutí</translation>
</message> </message>
<message> <message>
<source> sec</source> <source> sec</source>
<translation>sek</translation> <translation>sek.</translation>
</message> </message>
<message> <message>
<source>Lock databases after inactivity of</source> <source>Lock databases after inactivity of</source>
@ -1150,11 +1248,11 @@ Uložit změny?</translation>
</message> </message>
<message> <message>
<source>Show passwords in cleartext by default</source> <source>Show passwords in cleartext by default</source>
<translation>Vždy zobrazovat hesla</translation> <translation>Hesla vždy viditelná (nezakrývat hvězdičkami)</translation>
</message> </message>
<message> <message>
<source>Always ask before performing auto-type</source> <source>Always ask before performing auto-type</source>
<translation>Před provedením samočinného vyplnění se vždy dotázat</translation> <translation>Před provedením automatického vyplnění se vždy dotázat</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1163,14 +1261,6 @@ Uložit změny?</translation>
<source>Unlock database</source> <source>Unlock database</source>
<translation>Odemknout databázi</translation> <translation>Odemknout databázi</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
<source>Wrong key.</source>
<translation>Chybný klíč.</translation>
</message>
</context> </context>
<context> <context>
<name>WelcomeWidget</name> <name>WelcomeWidget</name>
@ -1183,20 +1273,16 @@ Uložit změny?</translation>
<name>main</name> <name>main</name>
<message> <message>
<source>KeePassX - cross-platform password manager</source> <source>KeePassX - cross-platform password manager</source>
<translation>KeePassX – multiplatformní správce hesel</translation> <translation>KeePassX – správce hesel, fungující napříč rozličnými operačními systémy</translation>
</message> </message>
<message> <message>
<source>filename of the password database to open (*.kdbx)</source> <source>filename of the password database to open (*.kdbx)</source>
<translation>Soubor s databází hesel (*.kdbx), který otevřít</translation> <translation>který soubor s databází hesel (*.kdbx) otevřít</translation>
</message> </message>
<message> <message>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation>umístění souboru s vlastními nastaveními</translation> <translation>umístění souboru s vlastními nastaveními</translation>
</message> </message>
<message>
<source>password of the database (DANGEROUS!)</source>
<translation>heslo databáze (NEBEZPEČNÉ!)</translation>
</message>
<message> <message>
<source>key file of the database</source> <source>key file of the database</source>
<translation>soubor s klíčem k databázi</translation> <translation>soubor s klíčem k databázi</translation>

286
share/translations/keepassx_da.ts
View File

@ -9,12 +9,20 @@
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation>KeePassX distribueres under betingelserne i GNU General Public License (GPL) version 2 eller (efter eget valg) version 3.</translation> <translation>KeePassX distribueres under betingelserne i GNU General Public License (GPL) version 2 eller (efter eget valg) version 3.</translation>
</message> </message>
<message>
<source>Revision</source>
<translation>Revision</translation>
</message>
<message>
<source>Using:</source>
<translation>Bruger:</translation>
</message>
</context> </context>
<context> <context>
<name>AutoType</name> <name>AutoType</name>
<message> <message>
<source>Auto-Type - KeePassX</source> <source>Auto-Type - KeePassX</source>
<translation type="unfinished"/> <translation>Auto-indsæt - KeePassX</translation>
</message> </message>
<message> <message>
<source>Couldn&apos;t find an entry that matches the window title:</source> <source>Couldn&apos;t find an entry that matches the window title:</source>
@ -40,26 +48,26 @@
<name>AutoTypeSelectDialog</name> <name>AutoTypeSelectDialog</name>
<message> <message>
<source>Auto-Type - KeePassX</source> <source>Auto-Type - KeePassX</source>
<translation type="unfinished"/> <translation>Auto-indsæt - KeePassX</translation>
</message> </message>
<message> <message>
<source>Select entry to Auto-Type:</source> <source>Select entry to Auto-Type:</source>
<translation type="unfinished"/> <translation>Vælg post til Auto-Indsæt:</translation>
</message> </message>
</context> </context>
<context> <context>
<name>ChangeMasterKeyWidget</name> <name>ChangeMasterKeyWidget</name>
<message> <message>
<source>Password</source> <source>Password</source>
<translation>Adgangskode</translation> <translation>Kodeord</translation>
</message> </message>
<message> <message>
<source>Enter password:</source> <source>Enter password:</source>
<translation>Indtast adgangskode</translation> <translation>Indtast kodeord</translation>
</message> </message>
<message> <message>
<source>Repeat password:</source> <source>Repeat password:</source>
<translation>Gentag adgangskode</translation> <translation>Gentag kodeord</translation>
</message> </message>
<message> <message>
<source>Key file</source> <source>Key file</source>
@ -103,18 +111,28 @@
</message> </message>
<message> <message>
<source>Do you really want to use an empty string as password?</source> <source>Do you really want to use an empty string as password?</source>
<translation>Vil du virkelig bruge en tom streng som adgangskode?</translation> <translation>Vil du virkelig bruge en tom streng som kodeord?</translation>
</message> </message>
<message> <message>
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Andre adgangskoder leveret.</translation> <translation>Andre kodeord leveret.</translation>
</message>
<message>
<source>Failed to set key file</source>
<translation>Kan ikke sætte nøglefil</translation>
</message>
<message>
<source>Failed to set %1 as the Key file:
%2</source>
<translation>Kunne ikke sætte %1 som Nøglefil:
%2</translation>
</message> </message>
</context> </context>
<context> <context>
<name>DatabaseOpenWidget</name> <name>DatabaseOpenWidget</name>
<message> <message>
<source>Enter master key</source> <source>Enter master key</source>
<translation>Indtast primærnøgle</translation> <translation>Indtast hovednøgle</translation>
</message> </message>
<message> <message>
<source>Key File:</source> <source>Key File:</source>
@ -122,7 +140,7 @@
</message> </message>
<message> <message>
<source>Password:</source> <source>Password:</source>
<translation>Adgangskode:</translation> <translation>Kodeord:</translation>
</message> </message>
<message> <message>
<source>Browse</source> <source>Browse</source>
@ -165,7 +183,7 @@
</message> </message>
<message> <message>
<source>Transform rounds:</source> <source>Transform rounds:</source>
<translation type="unfinished"/> <translation>Transformationsrunder:</translation>
</message> </message>
<message> <message>
<source>Default username:</source> <source>Default username:</source>
@ -185,18 +203,18 @@
</message> </message>
<message> <message>
<source>Max. history items:</source> <source>Max. history items:</source>
<translation type="unfinished"/> <translation>Maks. posthistorik:</translation>
</message> </message>
<message> <message>
<source>Max. history size:</source> <source>Max. history size:</source>
<translation type="unfinished"/> <translation>Maks. historikstørrelse:</translation>
</message> </message>
</context> </context>
<context> <context>
<name>DatabaseTabWidget</name> <name>DatabaseTabWidget</name>
<message> <message>
<source>Root</source> <source>Root</source>
<translation type="unfinished"/> <translation>Rod</translation>
</message> </message>
<message> <message>
<source>KeePass 2 Database</source> <source>KeePass 2 Database</source>
@ -234,11 +252,6 @@
<source>Close?</source> <source>Close?</source>
<translation>Luk?</translation> <translation>Luk?</translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation type="unfinished"/>
</message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
<translation>Gem ændringer?</translation> <translation>Gem ændringer?</translation>
@ -246,7 +259,8 @@ Close anyway?</source>
<message> <message>
<source>&quot;%1&quot; was modified. <source>&quot;%1&quot; was modified.
Save changes?</source> Save changes?</source>
<translation type="unfinished"/> <translation>&quot;%1&quot; blev ændret.
Gem disse ændringer?</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -268,12 +282,66 @@ Save changes?</source>
<source>locked</source> <source>locked</source>
<translation>låst</translation> <translation>låst</translation>
</message> </message>
<message>
<source>The database you are trying to open is locked by another instance of KeePassX.
Do you want to open it anyway? Alternatively the database is opened read-only.</source>
<translation>Den database, du prøver at åbne er låst af en anden forekomst af KeePassX.
Vil du åbne den alligevel? Alternativt åbnes databasen skrivebeskyttet.</translation>
</message>
<message>
<source>Lock database</source>
<translation>Lås database</translation>
</message>
<message>
<source>Can't lock the database as you are currently editing it.
Please press cancel to finish your changes or discard them.</source>
<translation>Kan ikke låse databasen, mens du redigerer i den.
Tryk på Afbryd for at afslutte dine ændringer eller kassere dem.</translation>
</message>
<message>
<source>This database has never been saved.
You can save the database or stop locking it.</source>
<translation>Denne database er aldrig blevet gemt.
Du kan gemme databasen eller stop låsning.</translation>
</message>
<message>
<source>This database has been modified.
Do you want to save the database before locking it?
Otherwise your changes are lost.</source>
<translation>Denne database er blevet ændret.
Vil du gemme databasen før låsning?
Ellers mister du dine ændringer.</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation>&quot;%1&quot; er i redigeringstilstand.
Kassér ændringer og luk alligevel?</translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation>Eksportér databasen til CSV-fil</translation>
</message>
<message>
<source>CSV file</source>
<translation>CSV-fil</translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation>Kan ikke skrive til CSV-fil.</translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassX.
Do you want to save it anyway?</source>
<translation>Databasen som du prøver at gemme er låst af en anden instans af KeePassX.
Vil du alligevel gemme?</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
<message> <message>
<source>Change master key</source> <source>Change master key</source>
<translation>Skift primærnøgle</translation> <translation>Skift hovednøgle</translation>
</message> </message>
<message> <message>
<source>Delete entry?</source> <source>Delete entry?</source>
@ -281,7 +349,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Do you really want to delete the entry &quot;%1&quot; for good?</source> <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
<translation type="unfinished"/> <translation>Vil du virkelig slette posten &quot;%1&quot; permanent?</translation>
</message> </message>
<message> <message>
<source>Delete entries?</source> <source>Delete entries?</source>
@ -289,7 +357,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Do you really want to delete %1 entries for good?</source> <source>Do you really want to delete %1 entries for good?</source>
<translation type="unfinished"/> <translation>Vil du virkelig slette %1 poster permanent?</translation>
</message> </message>
<message> <message>
<source>Move entries to recycle bin?</source> <source>Move entries to recycle bin?</source>
@ -297,7 +365,7 @@ Save changes?</source>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>Do you really want to move %n entry(s) to the recycle bin?</source> <source>Do you really want to move %n entry(s) to the recycle bin?</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> <translation><numerusform>Ønsker du virkelig at flytte %n post over i papirkurven?</numerusform><numerusform>Ønsker du virkelig at flytte %n poster over i papirkurven?</numerusform></translation>
</message> </message>
<message> <message>
<source>Delete group?</source> <source>Delete group?</source>
@ -305,12 +373,20 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Do you really want to delete the group &quot;%1&quot; for good?</source> <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
<translation type="unfinished"/> <translation>Ønsker du at slette gruppen &quot;%1&quot; permanent?</translation>
</message> </message>
<message> <message>
<source>Current group</source> <source>Current group</source>
<translation>Nuværende gruppe</translation> <translation>Nuværende gruppe</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Fejl</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Kan ikke beregne hovednøgle</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidget</name> <name>EditEntryWidget</name>
@ -328,7 +404,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Auto-Type</source> <source>Auto-Type</source>
<translation type="unfinished"/> <translation>Auto-Indsæt</translation>
</message> </message>
<message> <message>
<source>Properties</source> <source>Properties</source>
@ -340,7 +416,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Entry history</source> <source>Entry history</source>
<translation type="unfinished"/> <translation>Indtastningshistorik</translation>
</message> </message>
<message> <message>
<source>Add entry</source> <source>Add entry</source>
@ -356,7 +432,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Andre adgangskoder leveret.</translation> <translation>Andre kodeord leveret.</translation>
</message> </message>
<message> <message>
<source>New attribute</source> <source>New attribute</source>
@ -377,7 +453,7 @@ Save changes?</source>
<message> <message>
<source>Unable to save the attachment: <source>Unable to save the attachment:
</source> </source>
<translation type="unfinished"/> <translation>Kan ikke gemme vedhæftningen:</translation>
</message> </message>
<message> <message>
<source>Tomorrow</source> <source>Tomorrow</source>
@ -422,20 +498,24 @@ Save changes?</source>
<source>Save</source> <source>Save</source>
<translation>Gem</translation> <translation>Gem</translation>
</message> </message>
<message>
<source>Open</source>
<translation>Åben</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAutoType</name> <name>EditEntryWidgetAutoType</name>
<message> <message>
<source>Enable Auto-Type for this entry</source> <source>Enable Auto-Type for this entry</source>
<translation type="unfinished"/> <translation>Aktivér Auto-Indsæt for denne post</translation>
</message> </message>
<message> <message>
<source>Inherit default Auto-Type sequence from the group</source> <source>Inherit default Auto-Type sequence from the group</source>
<translation type="unfinished"/> <translation>Nedarv standard Auto-Indsæt sekvens fra gruppe</translation>
</message> </message>
<message> <message>
<source>Use custom Auto-Type sequence:</source> <source>Use custom Auto-Type sequence:</source>
<translation type="unfinished"/> <translation>Brug brugerdefineret Auto-indsæt sekvens:</translation>
</message> </message>
<message> <message>
<source>+</source> <source>+</source>
@ -451,11 +531,11 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Use default sequence</source> <source>Use default sequence</source>
<translation type="unfinished"/> <translation>Brug standardsekvens</translation>
</message> </message>
<message> <message>
<source>Set custom sequence:</source> <source>Set custom sequence:</source>
<translation type="unfinished"/> <translation>Definér brugervalgt sekvens:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -489,7 +569,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Password:</source> <source>Password:</source>
<translation>Adgangskode:</translation> <translation>Kodeord:</translation>
</message> </message>
<message> <message>
<source>Repeat:</source> <source>Repeat:</source>
@ -497,7 +577,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Gen.</source> <source>Gen.</source>
<translation type="unfinished"/> <translation>Generer</translation>
</message> </message>
<message> <message>
<source>URL:</source> <source>URL:</source>
@ -509,7 +589,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Presets</source> <source>Presets</source>
<translation type="unfinished"/> <translation>Predefinerede</translation>
</message> </message>
<message> <message>
<source>Notes:</source> <source>Notes:</source>
@ -571,7 +651,15 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Auto-type</source> <source>Auto-type</source>
<translation type="unfinished"/> <translation>Auto-indsæt</translation>
</message>
<message>
<source>Use default auto-type sequence of parent group</source>
<translation>Brug standard Auto-Indsæt sekvens fra forældregruppe</translation>
</message>
<message>
<source>Set default auto-type sequence</source>
<translation>Definér standard auto-indsæt sekvens</translation>
</message> </message>
</context> </context>
<context> <context>
@ -610,7 +698,7 @@ Save changes?</source>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>Can&apos;t delete icon. Still used by %n item(s).</source> <source>Can&apos;t delete icon. Still used by %n item(s).</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation> <translation><numerusform>Kan ikke slette ikonet. Det anvendes stadig af %n element.</numerusform><numerusform>Kan ikke slette ikonet. Det anvendes stadig af %n elementer.</numerusform></translation>
</message> </message>
</context> </context>
<context> <context>
@ -719,14 +807,18 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Root</source> <source>Root</source>
<translation type="unfinished"/> <translation>Rod</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Kan ikke beregne hovednøgle</translation>
</message> </message>
</context> </context>
<context> <context>
<name>KeePass2Reader</name> <name>KeePass2Reader</name>
<message> <message>
<source>Not a KeePass database.</source> <source>Not a KeePass database.</source>
<translation>Det er ikke en KeePass database.</translation> <translation>Dette er ikke en KeePass database.</translation>
</message> </message>
<message> <message>
<source>Unsupported KeePass database version.</source> <source>Unsupported KeePass database version.</source>
@ -736,6 +828,20 @@ Save changes?</source>
<source>Wrong key or database file is corrupt.</source> <source>Wrong key or database file is corrupt.</source>
<translation>Forkert nøgle eller databasefil er korrupt.</translation> <translation>Forkert nøgle eller databasefil er korrupt.</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Kan ikke beregne hovednøgle</translation>
</message>
<message>
<source>The selected file is an old KeePass 1 database (.kdb).
You can import it by clicking on Database &gt; 'Import KeePass 1 database'.
This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
<translation>Den valgte fil er en gammel KeePass 1 databasefil (.kdb).
Du kan importere den ved at klikke på Database &gt; &apos;Importér KeePass 1 database&apos;.
Dette er en envejs konvertering. Du vil ikke være i stand til at åbne den importerede database med den gamle KeePassX 0.4 version.</translation>
</message>
</context> </context>
<context> <context>
<name>Main</name> <name>Main</name>
@ -774,10 +880,6 @@ Save changes?</source>
<source>Groups</source> <source>Groups</source>
<translation>Grupper</translation> <translation>Grupper</translation>
</message> </message>
<message>
<source>Extras</source>
<translation type="unfinished"/>
</message>
<message> <message>
<source>View</source> <source>View</source>
<translation>Vis</translation> <translation>Vis</translation>
@ -836,7 +938,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Change master key</source> <source>Change master key</source>
<translation>Skift primærnøgle</translation> <translation>Skift hovednøgle</translation>
</message> </message>
<message> <message>
<source>Database settings</source> <source>Database settings</source>
@ -854,21 +956,13 @@ Save changes?</source>
<source>Find</source> <source>Find</source>
<translation>Find</translation> <translation>Find</translation>
</message> </message>
<message>
<source>Username</source>
<translation>Brugernavn</translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation>Kopiér brugernavn til udklipsholder</translation> <translation>Kopiér brugernavn til udklipsholder</translation>
</message> </message>
<message>
<source>Password</source>
<translation>Adgangskode</translation>
</message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation>Kopiér adgangskode til udklipsholder</translation> <translation>Kopiér kodeord til udklipsholder</translation>
</message> </message>
<message> <message>
<source>Settings</source> <source>Settings</source>
@ -876,7 +970,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Perform Auto-Type</source> <source>Perform Auto-Type</source>
<translation type="unfinished"/> <translation>Udfør Auto-indsæt</translation>
</message> </message>
<message> <message>
<source>Open URL</source> <source>Open URL</source>
@ -910,12 +1004,28 @@ Save changes?</source>
<source>Toggle window</source> <source>Toggle window</source>
<translation>Skift vindue</translation> <translation>Skift vindue</translation>
</message> </message>
<message>
<source>Tools</source>
<translation>Værktøj</translation>
</message>
<message>
<source>Copy username</source>
<translation>Kopiér brugernavn</translation>
</message>
<message>
<source>Copy password</source>
<translation>Kopiér kodeord</translation>
</message>
<message>
<source>Export to CSV file</source>
<translation>Eksportér til CSV-fil</translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
<message> <message>
<source>Password:</source> <source>Password:</source>
<translation>Adgangskode:</translation> <translation>Kodeord:</translation>
</message> </message>
<message> <message>
<source>Length:</source> <source>Length:</source>
@ -923,7 +1033,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Character Types</source> <source>Character Types</source>
<translation type="unfinished"/> <translation>Tegntyper</translation>
</message> </message>
<message> <message>
<source>Upper Case Letters</source> <source>Upper Case Letters</source>
@ -931,7 +1041,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Lower Case Letters</source> <source>Lower Case Letters</source>
<translation type="unfinished"/> <translation>Små Bogstaver</translation>
</message> </message>
<message> <message>
<source>Numbers</source> <source>Numbers</source>
@ -939,15 +1049,15 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Special Characters</source> <source>Special Characters</source>
<translation type="unfinished"/> <translation>Specialtegn</translation>
</message> </message>
<message> <message>
<source>Exclude look-alike characters</source> <source>Exclude look-alike characters</source>
<translation type="unfinished"/> <translation>Udeluk lool-alike tegn</translation>
</message> </message>
<message> <message>
<source>Ensure that the password contains characters from every group</source> <source>Ensure that the password contains characters from every group</source>
<translation type="unfinished"/> <translation>Vær sikker på at dit kodeord indeholder tegn fra alle grupper</translation>
</message> </message>
<message> <message>
<source>Accept</source> <source>Accept</source>
@ -1020,11 +1130,11 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Error writing to underlying device: </source> <source>Error writing to underlying device: </source>
<translation type="unfinished"/> <translation>Fejl ved skrivning til enhed:</translation>
</message> </message>
<message> <message>
<source>Error opening underlying device: </source> <source>Error opening underlying device: </source>
<translation type="unfinished"/> <translation>Fejl ved åbning fra enhed:</translation>
</message> </message>
<message> <message>
<source>Error reading data from underlying device: </source> <source>Error reading data from underlying device: </source>
@ -1032,7 +1142,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Internal zlib error when decompressing: </source> <source>Internal zlib error when decompressing: </source>
<translation type="unfinished"/> <translation>Intern zlib-fejl ved dekomprimering:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1054,7 +1164,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Case sensitive</source> <source>Case sensitive</source>
<translation type="unfinished"/> <translation>Versalfølsom</translation>
</message> </message>
<message> <message>
<source>Current group</source> <source>Current group</source>
@ -1062,7 +1172,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Root group</source> <source>Root group</source>
<translation type="unfinished"/> <translation>Rodgruppe</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1073,7 +1183,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>General</source> <source>General</source>
<translation type="unfinished"/> <translation>Generelt</translation>
</message> </message>
<message> <message>
<source>Security</source> <source>Security</source>
@ -1084,15 +1194,11 @@ Save changes?</source>
<name>SettingsWidgetGeneral</name> <name>SettingsWidgetGeneral</name>
<message> <message>
<source>Remember last databases</source> <source>Remember last databases</source>
<translation type="unfinished"/> <translation>Husk seneste databaser</translation>
</message> </message>
<message> <message>
<source>Open previous databases on startup</source> <source>Open previous databases on startup</source>
<translation type="unfinished"/> <translation>Åben foregående databaser ved opstart</translation>
</message>
<message>
<source>Mark as modified on expanded state changes</source>
<translation type="unfinished"/>
</message> </message>
<message> <message>
<source>Automatically save on exit</source> <source>Automatically save on exit</source>
@ -1108,15 +1214,15 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Use group icon on entry creation</source> <source>Use group icon on entry creation</source>
<translation type="unfinished"/> <translation>Brug gruppeikon ved oprettelse af post</translation>
</message> </message>
<message> <message>
<source>Global Auto-Type shortcut</source> <source>Global Auto-Type shortcut</source>
<translation type="unfinished"/> <translation>Global Auto-Indsæt genvej</translation>
</message> </message>
<message> <message>
<source>Use entry title to match windows for global auto-type</source> <source>Use entry title to match windows for global auto-type</source>
<translation type="unfinished"/> <translation>Brug titel på post til at matche global aito-indsæt</translation>
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
@ -1130,6 +1236,10 @@ Save changes?</source>
<source>Hide window to system tray when minimized</source> <source>Hide window to system tray when minimized</source>
<translation>Skjul vindue i systembakken når det er minimeret</translation> <translation>Skjul vindue i systembakken når det er minimeret</translation>
</message> </message>
<message>
<source>Remember last key files</source>
<translation>Husk de sidste nøglefiler</translation>
</message>
</context> </context>
<context> <context>
<name>SettingsWidgetSecurity</name> <name>SettingsWidgetSecurity</name>
@ -1143,15 +1253,15 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Lock databases after inactivity of</source> <source>Lock databases after inactivity of</source>
<translation type="unfinished"/> <translation>Lås databaserne efter inaktivitet i</translation>
</message> </message>
<message> <message>
<source>Show passwords in cleartext by default</source> <source>Show passwords in cleartext by default</source>
<translation type="unfinished"/> <translation>Vis kodeord i klartekst som standard</translation>
</message> </message>
<message> <message>
<source>Always ask before performing auto-type</source> <source>Always ask before performing auto-type</source>
<translation type="unfinished"/> <translation>Spørg altid før auto-indsæt</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1160,14 +1270,6 @@ Save changes?</source>
<source>Unlock database</source> <source>Unlock database</source>
<translation>Lås database op</translation> <translation>Lås database op</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Fejl</translation>
</message>
<message>
<source>Wrong key.</source>
<translation>Forkert nøgle.</translation>
</message>
</context> </context>
<context> <context>
<name>WelcomeWidget</name> <name>WelcomeWidget</name>
@ -1180,7 +1282,7 @@ Save changes?</source>
<name>main</name> <name>main</name>
<message> <message>
<source>KeePassX - cross-platform password manager</source> <source>KeePassX - cross-platform password manager</source>
<translation type="unfinished"/> <translation>KeePassX - cross-platform password manager</translation>
</message> </message>
<message> <message>
<source>filename of the password database to open (*.kdbx)</source> <source>filename of the password database to open (*.kdbx)</source>
@ -1188,11 +1290,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation type="unfinished"/> <translation>sti til brugerdefineret indstillingsfil</translation>
</message>
<message>
<source>password of the database (DANGEROUS!)</source>
<translation>adgangskode til databasen (FAARLIGT!)</translation>
</message> </message>
<message> <message>
<source>key file of the database</source> <source>key file of the database</source>

152
share/translations/keepassx_de.ts
View File

@ -7,7 +7,11 @@
</message> </message>
<message> <message>
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation>KeePassX ist unter der GNU General Public License (GPL) version 2 (version 3) veröffentlicht.</translation> <translation>KeePassX steht unter der GNU General Public License (GPL) version 2 (version 3).</translation>
</message>
<message>
<source>Revision</source>
<translation>Überarbeitung</translation>
</message> </message>
</context> </context>
<context> <context>
@ -109,6 +113,15 @@
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Unterschiedliche Passwörter eingegeben.</translation> <translation>Unterschiedliche Passwörter eingegeben.</translation>
</message> </message>
<message>
<source>Failed to set key file</source>
<translation>Festlegen der Schlüsseldatei nicht möglich.</translation>
</message>
<message>
<source>Failed to set %1 as the Key file:
%2</source>
<translation>Festlegen von %1 als Schlüsseldatei nicht möglich: %2</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseOpenWidget</name> <name>DatabaseOpenWidget</name>
@ -234,12 +247,6 @@
<source>Close?</source> <source>Close?</source>
<translation>Schließen?</translation> <translation>Schließen?</translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation>&quot;%1&quot; wird bearbeitet.
Trotzdem schließen?</translation>
</message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
<translation>Änderungen speichern?</translation> <translation>Änderungen speichern?</translation>
@ -270,6 +277,59 @@ Save changes?</source>
<source>locked</source> <source>locked</source>
<translation>gesperrt</translation> <translation>gesperrt</translation>
</message> </message>
<message>
<source>The database you are trying to open is locked by another instance of KeePassX.
Do you want to open it anyway? Alternatively the database is opened read-only.</source>
<translation>Die Datenbank, die geöffnet werden soll, ist aktuell von einer anderen Instanz von KeePassX blockiert. Soll sie dennoch geöffnet werden? Andererseits wird die Datenbank schreibgeschützt geöffnet.</translation>
</message>
<message>
<source>Lock database</source>
<translation>Datenbank sperren</translation>
</message>
<message>
<source>Can't lock the database as you are currently editing it.
Please press cancel to finish your changes or discard them.</source>
<translation>Datenbank kann nicht gesperrt werden, da sie gerade bearbeitet wird.
Wählen sie &quot;cancel&quot;, um die Änderungen zu speichern oder sie zurückzunehmen.</translation>
</message>
<message>
<source>This database has never been saved.
You can save the database or stop locking it.</source>
<translation>Diese Datenbank wurde noch nicht gespeichert.
Sie können sie speichern oder Sperre freigeben.</translation>
</message>
<message>
<source>This database has been modified.
Do you want to save the database before locking it?
Otherwise your changes are lost.</source>
<translation>Dieses Datenbank wurde geändert.
Soll sie gespeichert werden bevor sie gesperrt wirt?
Anderenfalls gehen Ihre Änderungen verloren.</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation>&quot;%1&quot; wird bearbeitet.
Änderungen verwerfen und trotzdem schließen?</translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation>Datenbank als CSV Datei exportieren.</translation>
</message>
<message>
<source>CSV file</source>
<translation>CSV Datei</translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation>Die CSV Datei konnte nicht gespeichert werden.</translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassX.
Do you want to save it anyway?</source>
<translation>Die Datenbank, die gespeichert werden soll, ist von einer anderen Instanz von KeePassX blockiert.
Soll sie dennoch gespeichert werden? </translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
@ -313,6 +373,14 @@ Save changes?</source>
<source>Current group</source> <source>Current group</source>
<translation>Aktuelle Gruppe</translation> <translation>Aktuelle Gruppe</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Berechnung des &quot;master keys&quot; gescheitert</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidget</name> <name>EditEntryWidget</name>
@ -424,6 +492,10 @@ Save changes?</source>
<source>Save</source> <source>Save</source>
<translation>Speichern</translation> <translation>Speichern</translation>
</message> </message>
<message>
<source>Open</source>
<translation>Offen</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAutoType</name> <name>EditEntryWidgetAutoType</name>
@ -575,6 +647,14 @@ Save changes?</source>
<source>Auto-type</source> <source>Auto-type</source>
<translation>Auto-type</translation> <translation>Auto-type</translation>
</message> </message>
<message>
<source>Use default auto-type sequence of parent group</source>
<translation>Auto-Type-Sequenz der übergeordneten Gruppe anwenden.</translation>
</message>
<message>
<source>Set default auto-type sequence</source>
<translation>Standard Auto-Type-Sequenz setzen</translation>
</message>
</context> </context>
<context> <context>
<name>EditWidgetIcons</name> <name>EditWidgetIcons</name>
@ -723,6 +803,10 @@ Save changes?</source>
<source>Root</source> <source>Root</source>
<translation>Root</translation> <translation>Root</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Berechnung des &quot;master keys&quot; gescheitert</translation>
</message>
</context> </context>
<context> <context>
<name>KeePass2Reader</name> <name>KeePass2Reader</name>
@ -738,6 +822,10 @@ Save changes?</source>
<source>Wrong key or database file is corrupt.</source> <source>Wrong key or database file is corrupt.</source>
<translation>Falscher Schlüssel oder die Datei ist beschädigt.</translation> <translation>Falscher Schlüssel oder die Datei ist beschädigt.</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Berechnung des &quot;master keys&quot; gescheitert</translation>
</message>
</context> </context>
<context> <context>
<name>Main</name> <name>Main</name>
@ -776,10 +864,6 @@ Save changes?</source>
<source>Groups</source> <source>Groups</source>
<translation>Gruppen</translation> <translation>Gruppen</translation>
</message> </message>
<message>
<source>Extras</source>
<translation>Extras</translation>
</message>
<message> <message>
<source>View</source> <source>View</source>
<translation>Ansicht</translation> <translation>Ansicht</translation>
@ -856,18 +940,10 @@ Save changes?</source>
<source>Find</source> <source>Find</source>
<translation>Suchen</translation> <translation>Suchen</translation>
</message> </message>
<message>
<source>Username</source>
<translation>Benutzername</translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation>Benutzername in die Zwischenablage kopieren</translation> <translation>Benutzername in die Zwischenablage kopieren</translation>
</message> </message>
<message>
<source>Password</source>
<translation>Passwort</translation>
</message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation>Passwort in die Zwischenablage kopieren</translation> <translation>Passwort in die Zwischenablage kopieren</translation>
@ -912,6 +988,22 @@ Save changes?</source>
<source>Toggle window</source> <source>Toggle window</source>
<translation>Fenster zeigen/verstecken</translation> <translation>Fenster zeigen/verstecken</translation>
</message> </message>
<message>
<source>Tools</source>
<translation>Tools</translation>
</message>
<message>
<source>Copy username</source>
<translation>Benutzername kopieren</translation>
</message>
<message>
<source>Copy password</source>
<translation>Passwort kopieren</translation>
</message>
<message>
<source>Export to CSV file</source>
<translation>Als CSV Datei exportieren</translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
@ -1092,10 +1184,6 @@ Save changes?</source>
<source>Open previous databases on startup</source> <source>Open previous databases on startup</source>
<translation>Letzte Datenbank beim Starten öffnen</translation> <translation>Letzte Datenbank beim Starten öffnen</translation>
</message> </message>
<message>
<source>Mark as modified on expanded state changes</source>
<translation>Als erweiterte Zustandsänderungen makieren</translation>
</message>
<message> <message>
<source>Automatically save on exit</source> <source>Automatically save on exit</source>
<translation>Automatisch speichern beim Schließen</translation> <translation>Automatisch speichern beim Schließen</translation>
@ -1140,6 +1228,10 @@ Save changes?</source>
<source>Hide window to system tray on App start</source> <source>Hide window to system tray on App start</source>
<translation>Fenster zu Taskleistensymbol minimieren wenn Programm started</translation> <translation>Fenster zu Taskleistensymbol minimieren wenn Programm started</translation>
</message> </message>
<message>
<source>Remember last key files</source>
<translation>Letzte Schlüsseldateien merken</translation>
</message>
</context> </context>
<context> <context>
<name>SettingsWidgetSecurity</name> <name>SettingsWidgetSecurity</name>
@ -1157,7 +1249,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Show passwords in cleartext by default</source> <source>Show passwords in cleartext by default</source>
<translation>Passwort standartmäßig in Klartext anzeigen</translation> <translation>Passwörter standardmäßig in Klartext anzeigen</translation>
</message> </message>
<message> <message>
<source>Always ask before performing auto-type</source> <source>Always ask before performing auto-type</source>
@ -1170,14 +1262,6 @@ Save changes?</source>
<source>Unlock database</source> <source>Unlock database</source>
<translation>Datenbank entsperren</translation> <translation>Datenbank entsperren</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
<source>Wrong key.</source>
<translation>Falscher Schlüssel.</translation>
</message>
</context> </context>
<context> <context>
<name>WelcomeWidget</name> <name>WelcomeWidget</name>
@ -1200,10 +1284,6 @@ Save changes?</source>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation>Pfad zu einer benutzerdefinierten Konfigurationsdatei</translation> <translation>Pfad zu einer benutzerdefinierten Konfigurationsdatei</translation>
</message> </message>
<message>
<source>password of the database (DANGEROUS!)</source>
<translation>Passwort der Datenbank (GEFÄHRLICH!)</translation>
</message>
<message> <message>
<source>key file of the database</source> <source>key file of the database</source>
<translation>Schlüsseldatei der Datenbank</translation> <translation>Schlüsseldatei der Datenbank</translation>

1286
share/translations/keepassx_el.ts Normal file
View File

File diff suppressed because it is too large Load Diff

126
share/translations/keepassx_en.ts
View File

@ -11,6 +11,14 @@
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Revision</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Using:</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>AutoType</name> <name>AutoType</name>
@ -164,6 +172,42 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>
<context>
<name>DatabaseRepairWidget</name>
<message>
<source>Repair database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Can&apos;t open key file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Database opened fine. Nothing to do.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unable to open the database.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Success</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The database has been successfully repaired
You can now save it.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Unable to repair the database.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context> <context>
<name>DatabaseSettingsWidget</name> <name>DatabaseSettingsWidget</name>
<message> <message>
@ -245,11 +289,6 @@
<source>Close?</source> <source>Close?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -304,6 +343,28 @@ Do you want to save the database before locking it?
Otherwise your changes are lost.</source> Otherwise your changes are lost.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>CSV file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassX.
Do you want to save it anyway?</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
@ -812,6 +873,13 @@ Otherwise your changes are lost.</source>
<source>Unable to calculate master key</source> <source>Unable to calculate master key</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>The selected file is an old KeePass 1 database (.kdb).
You can import it by clicking on Database &gt; &apos;Import KeePass 1 database&apos;.
This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>Main</name> <name>Main</name>
@ -926,18 +994,10 @@ Otherwise your changes are lost.</source>
<source>Find</source> <source>Find</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Username</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Password</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -986,6 +1046,42 @@ Otherwise your changes are lost.</source>
<source>Tools</source> <source>Tools</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Copy username</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Copy password</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Export to CSV file</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Repair database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>KeePass 2 Database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>All files</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save repaired database</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Writing the database failed.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
@ -1266,10 +1362,6 @@ Otherwise your changes are lost.</source>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>password of the database (DANGEROUS!)</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>key file of the database</source> <source>key file of the database</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

150
share/translations/keepassx_es.ts
View File

@ -75,7 +75,7 @@
</message> </message>
<message> <message>
<source>Key files</source> <source>Key files</source>
<translation>Archivos de llaves</translation> <translation>Archivos llave</translation>
</message> </message>
<message> <message>
<source>All files</source> <source>All files</source>
@ -109,6 +109,16 @@
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Las contraseñas ingresadas son distintas.</translation> <translation>Las contraseñas ingresadas son distintas.</translation>
</message> </message>
<message>
<source>Failed to set key file</source>
<translation>No se pudo establecer el archivo llave</translation>
</message>
<message>
<source>Failed to set %1 as the Key file:
%2</source>
<translation>No se pudo establecer %1 como el Archivo llave:
%2</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseOpenWidget</name> <name>DatabaseOpenWidget</name>
@ -118,7 +128,7 @@
</message> </message>
<message> <message>
<source>Key File:</source> <source>Key File:</source>
<translation>Archivo clave:</translation> <translation>Archivo llave:</translation>
</message> </message>
<message> <message>
<source>Password:</source> <source>Password:</source>
@ -196,7 +206,7 @@
<name>DatabaseTabWidget</name> <name>DatabaseTabWidget</name>
<message> <message>
<source>Root</source> <source>Root</source>
<translation type="unfinished"/> <translation>Raíz</translation>
</message> </message>
<message> <message>
<source>KeePass 2 Database</source> <source>KeePass 2 Database</source>
@ -234,12 +244,6 @@
<source>Close?</source> <source>Close?</source>
<translation>¿Cerrar?</translation> <translation>¿Cerrar?</translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation>&quot;%1&quot; está en modo de edición.
¿Cerrar de todas formas?</translation>
</message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
<translation>¿Guardar cambios?</translation> <translation>¿Guardar cambios?</translation>
@ -270,12 +274,60 @@ Save changes?</source>
<source>locked</source> <source>locked</source>
<translation>bloqueado</translation> <translation>bloqueado</translation>
</message> </message>
<message>
<source>The database you are trying to open is locked by another instance of KeePassX.
Do you want to open it anyway? Alternatively the database is opened read-only.</source>
<translation>La base de datos que está intentando abrir está bloqueada por otra instancia de KeePassX.
¿Quiere abrirla de todos modos? Alternativamente, la base de datos se abre como sólo lectura.</translation>
</message>
<message>
<source>Lock database</source>
<translation>Bloquear base de datos</translation>
</message>
<message>
<source>Can't lock the database as you are currently editing it.
Please press cancel to finish your changes or discard them.</source>
<translation>No se puede bloquear la base de datos porque actualmente está editándola.
Por favor, pulse cancelar para terminar sus cambios o descartarlos.</translation>
</message>
<message>
<source>This database has never been saved.
You can save the database or stop locking it.</source>
<translation>Esta base de datos nunca ha sido guardada.
Puede guardar la base de datos o dejar de bloquearla.</translation>
</message>
<message>
<source>This database has been modified.
Do you want to save the database before locking it?
Otherwise your changes are lost.</source>
<translation>Esta base de datos ha sido modificada.
¿Desea guardar la base de datos antes de bloquearla?
De lo contrario se perderán los cambios.</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation>&quot;% 1&quot; está en el modo de edición.
¿Descartar cambios y cerrar de todos modos?</translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation>Exportar base de datos a un archivo CSV</translation>
</message>
<message>
<source>CSV file</source>
<translation>Archivo CSV</translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation>La escritura del archivo CSV falló.</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
<message> <message>
<source>Change master key</source> <source>Change master key</source>
<translation>Cambiar la llave maestra</translation> <translation>Cambiar la clave maestra</translation>
</message> </message>
<message> <message>
<source>Delete entry?</source> <source>Delete entry?</source>
@ -313,6 +365,14 @@ Save changes?</source>
<source>Current group</source> <source>Current group</source>
<translation>Grupo actual</translation> <translation>Grupo actual</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>No se puede calcular la llave maestra</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidget</name> <name>EditEntryWidget</name>
@ -425,6 +485,10 @@ Save changes?</source>
<source>Save</source> <source>Save</source>
<translation>Guardar</translation> <translation>Guardar</translation>
</message> </message>
<message>
<source>Open</source>
<translation>Abrir</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAutoType</name> <name>EditEntryWidgetAutoType</name>
@ -576,6 +640,14 @@ Save changes?</source>
<source>Auto-type</source> <source>Auto-type</source>
<translation>Auto-escritura</translation> <translation>Auto-escritura</translation>
</message> </message>
<message>
<source>Use default auto-type sequence of parent group</source>
<translation>Usar escritura automática por defecto del grupo padre</translation>
</message>
<message>
<source>Set default auto-type sequence</source>
<translation>Establecer escritura automática por defecto</translation>
</message>
</context> </context>
<context> <context>
<name>EditWidgetIcons</name> <name>EditWidgetIcons</name>
@ -722,7 +794,11 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Root</source> <source>Root</source>
<translation type="unfinished"/> <translation>Raíz</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>No se puede calcular la clave maestra</translation>
</message> </message>
</context> </context>
<context> <context>
@ -739,6 +815,10 @@ Save changes?</source>
<source>Wrong key or database file is corrupt.</source> <source>Wrong key or database file is corrupt.</source>
<translation>La contraseña es incorrecta o el archivo está dañado</translation> <translation>La contraseña es incorrecta o el archivo está dañado</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>No se puede calcular la clave maestra</translation>
</message>
</context> </context>
<context> <context>
<name>Main</name> <name>Main</name>
@ -777,10 +857,6 @@ Save changes?</source>
<source>Groups</source> <source>Groups</source>
<translation>Grupos</translation> <translation>Grupos</translation>
</message> </message>
<message>
<source>Extras</source>
<translation>Extras</translation>
</message>
<message> <message>
<source>View</source> <source>View</source>
<translation>Ver</translation> <translation>Ver</translation>
@ -839,7 +915,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Change master key</source> <source>Change master key</source>
<translation>Cambiar la llave maestra</translation> <translation>Cambiar la clave maestra</translation>
</message> </message>
<message> <message>
<source>Database settings</source> <source>Database settings</source>
@ -857,18 +933,10 @@ Save changes?</source>
<source>Find</source> <source>Find</source>
<translation>Buscar</translation> <translation>Buscar</translation>
</message> </message>
<message>
<source>Username</source>
<translation>Usuario</translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation>Copiar nombre de usuario al portapapeles</translation> <translation>Copiar nombre de usuario al portapapeles</translation>
</message> </message>
<message>
<source>Password</source>
<translation>Contraseña</translation>
</message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation>Copiar contraseña al portapapeles</translation> <translation>Copiar contraseña al portapapeles</translation>
@ -913,6 +981,22 @@ Save changes?</source>
<source>Toggle window</source> <source>Toggle window</source>
<translation>Cambiar a ventana</translation> <translation>Cambiar a ventana</translation>
</message> </message>
<message>
<source>Tools</source>
<translation>Herramientas</translation>
</message>
<message>
<source>Copy username</source>
<translation>Copiar nombre de usuario</translation>
</message>
<message>
<source>Copy password</source>
<translation>Copiar contraseña</translation>
</message>
<message>
<source>Export to CSV file</source>
<translation>Exportar a un archivo CSV</translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
@ -1065,7 +1149,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Root group</source> <source>Root group</source>
<translation type="unfinished"/> <translation>Grupo raíz</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1093,10 +1177,6 @@ Save changes?</source>
<source>Open previous databases on startup</source> <source>Open previous databases on startup</source>
<translation>Abrir base de datos anterior al inicio</translation> <translation>Abrir base de datos anterior al inicio</translation>
</message> </message>
<message>
<source>Mark as modified on expanded state changes</source>
<translation>Marcar como modificado en los cambios de estado ampliados</translation>
</message>
<message> <message>
<source>Automatically save on exit</source> <source>Automatically save on exit</source>
<translation>Guardar automáticamente al salir</translation> <translation>Guardar automáticamente al salir</translation>
@ -1133,6 +1213,10 @@ Save changes?</source>
<source>Hide window to system tray when minimized</source> <source>Hide window to system tray when minimized</source>
<translation>Ocultar la ventana a la bandeja del sistema cuando se minimiza</translation> <translation>Ocultar la ventana a la bandeja del sistema cuando se minimiza</translation>
</message> </message>
<message>
<source>Remember last key files</source>
<translation>Recordar últimos archivos clave</translation>
</message>
</context> </context>
<context> <context>
<name>SettingsWidgetSecurity</name> <name>SettingsWidgetSecurity</name>
@ -1163,14 +1247,6 @@ Save changes?</source>
<source>Unlock database</source> <source>Unlock database</source>
<translation>Desbloquear base de datos</translation> <translation>Desbloquear base de datos</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
<source>Wrong key.</source>
<translation>Clave incorrecta.</translation>
</message>
</context> </context>
<context> <context>
<name>WelcomeWidget</name> <name>WelcomeWidget</name>

338
share/translations/keepassx_fr.ts
View File

@ -9,6 +9,14 @@
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation>KeePassX est distribué selon les conditions de la GNU General Public License (GPL) version 2 ou (à votre choix) version 3.</translation> <translation>KeePassX est distribué selon les conditions de la GNU General Public License (GPL) version 2 ou (à votre choix) version 3.</translation>
</message> </message>
<message>
<source>Revision</source>
<translation>Version</translation>
</message>
<message>
<source>Using:</source>
<translation>Utilise :</translation>
</message>
</context> </context>
<context> <context>
<name>AutoType</name> <name>AutoType</name>
@ -25,7 +33,7 @@
<name>AutoTypeAssociationsModel</name> <name>AutoTypeAssociationsModel</name>
<message> <message>
<source>Window</source> <source>Window</source>
<translation>Fenêtre </translation> <translation>Fenêtre</translation>
</message> </message>
<message> <message>
<source>Sequence</source> <source>Sequence</source>
@ -63,7 +71,7 @@
</message> </message>
<message> <message>
<source>Key file</source> <source>Key file</source>
<translation>Fichier de clé</translation> <translation>Fichier-clé</translation>
</message> </message>
<message> <message>
<source>Browse</source> <source>Browse</source>
@ -75,7 +83,7 @@
</message> </message>
<message> <message>
<source>Key files</source> <source>Key files</source>
<translation>Fichiers de clé</translation> <translation>Fichiers-clés</translation>
</message> </message>
<message> <message>
<source>All files</source> <source>All files</source>
@ -83,7 +91,7 @@
</message> </message>
<message> <message>
<source>Create Key File...</source> <source>Create Key File...</source>
<translation>Créer un fichier de clé...</translation> <translation>Créer un fichier-clé...</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -91,11 +99,11 @@
</message> </message>
<message> <message>
<source>Unable to create Key File : </source> <source>Unable to create Key File : </source>
<translation>Incapable de créer un fichier de clé :</translation> <translation>Impossible de créer un fichier-clé :</translation>
</message> </message>
<message> <message>
<source>Select a key file</source> <source>Select a key file</source>
<translation>Choisir un fichier de clé</translation> <translation>Choisir un fichier-clé</translation>
</message> </message>
<message> <message>
<source>Question</source> <source>Question</source>
@ -109,16 +117,26 @@
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Les mots de passe ne sont pas identiques.</translation> <translation>Les mots de passe ne sont pas identiques.</translation>
</message> </message>
<message>
<source>Failed to set key file</source>
<translation>Échec de définition du fichier-clé</translation>
</message>
<message>
<source>Failed to set %1 as the Key file:
%2</source>
<translation>Impossible de définir %1 comme fichier-clé :
%2</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseOpenWidget</name> <name>DatabaseOpenWidget</name>
<message> <message>
<source>Enter master key</source> <source>Enter master key</source>
<translation>Entrez la clé maîtresse</translation> <translation>Entrez la clé maître</translation>
</message> </message>
<message> <message>
<source>Key File:</source> <source>Key File:</source>
<translation>Fichier de clé :</translation> <translation>Fichier-clé :</translation>
</message> </message>
<message> <message>
<source>Password:</source> <source>Password:</source>
@ -138,7 +156,7 @@
</message> </message>
<message> <message>
<source>Can&apos;t open key file</source> <source>Can&apos;t open key file</source>
<translation>Impossible d&apos;ouvrir le fichier de clé</translation> <translation>Impossible d&apos;ouvrir le fichier-clé</translation>
</message> </message>
<message> <message>
<source>All files</source> <source>All files</source>
@ -146,11 +164,11 @@
</message> </message>
<message> <message>
<source>Key files</source> <source>Key files</source>
<translation>Fichiers de clé</translation> <translation>Fichiers-clés</translation>
</message> </message>
<message> <message>
<source>Select key file</source> <source>Select key file</source>
<translation>Choisissez un fichier de clé</translation> <translation>Choisissez un fichier-clé</translation>
</message> </message>
</context> </context>
<context> <context>
@ -177,7 +195,7 @@
</message> </message>
<message> <message>
<source> MiB</source> <source> MiB</source>
<translation>MiB</translation> <translation> MiB</translation>
</message> </message>
<message> <message>
<source>Benchmark</source> <source>Benchmark</source>
@ -208,7 +226,7 @@
</message> </message>
<message> <message>
<source>Open database</source> <source>Open database</source>
<translation>Ovrire la base de données</translation> <translation>Ouvrir la base de données</translation>
</message> </message>
<message> <message>
<source>Warning</source> <source>Warning</source>
@ -216,7 +234,7 @@
</message> </message>
<message> <message>
<source>File not found!</source> <source>File not found!</source>
<translation>Fichier introuvable!</translation> <translation>Fichier introuvable !</translation>
</message> </message>
<message> <message>
<source>Open KeePass 1 database</source> <source>Open KeePass 1 database</source>
@ -232,13 +250,7 @@
</message> </message>
<message> <message>
<source>Close?</source> <source>Close?</source>
<translation>Fermer?</translation> <translation>Fermer ?</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation>&quot;%1&quot; est en cours de modification.
Fermer quand même ?</translation>
</message> </message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
@ -256,7 +268,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Writing the database failed.</source> <source>Writing the database failed.</source>
<translation>Une erreur s&apos;est produite lors de l&apos;écriture de la base de données. </translation> <translation>Une erreur s&apos;est produite lors de l&apos;écriture de la base de données.</translation>
</message> </message>
<message> <message>
<source>Save database as</source> <source>Save database as</source>
@ -270,12 +282,66 @@ Enregistrer les modifications ?</translation>
<source>locked</source> <source>locked</source>
<translation>verrouillée</translation> <translation>verrouillée</translation>
</message> </message>
<message>
<source>The database you are trying to open is locked by another instance of KeePassX.
Do you want to open it anyway? Alternatively the database is opened read-only.</source>
<translation>La base de données que vous essayez d&apos;ouvrir est verrouillée par une autre instance de KeePassX.
Voulez-vous quand même l&apos;ouvrir ? Dans ce cas, elle sera ouverte en lecture seule.</translation>
</message>
<message>
<source>Lock database</source>
<translation>Verrouiller la base de données</translation>
</message>
<message>
<source>Can't lock the database as you are currently editing it.
Please press cancel to finish your changes or discard them.</source>
<translation>Impossible de verrouiller la base de données lors de modifications.
Cliquez sur Annuler pour finir vos modifications ou abandonnez-les.</translation>
</message>
<message>
<source>This database has never been saved.
You can save the database or stop locking it.</source>
<translation>Cette base de données n&apos;a pas encore été sauvegardée.
Vous devez la sauvegarder ou annuler son verrouillage.</translation>
</message>
<message>
<source>This database has been modified.
Do you want to save the database before locking it?
Otherwise your changes are lost.</source>
<translation>La base de données a été modifiée.
Voulez-vous l&apos;enregistrer avant de la verrouiller ?
Autrement, vos modifications seront perdues.</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation>&quot;%1&quot; est en mode édition.
Ignorer les changements et fermer ?</translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation>Exporter la base de données au format CSV</translation>
</message>
<message>
<source>CSV file</source>
<translation>Fichier CSV</translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation>Échec de l&apos;écriture du fichier CSV.</translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassX.
Do you want to save it anyway?</source>
<translation>La base de données que vous essayez de sauvegarder a été verrouillée par une autre instance de KeePassX.
Voulez-vous quand même la sauvegarder ?</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
<message> <message>
<source>Change master key</source> <source>Change master key</source>
<translation>Changer la clé maîtresse</translation> <translation>Changer la clé maître</translation>
</message> </message>
<message> <message>
<source>Delete entry?</source> <source>Delete entry?</source>
@ -311,7 +377,15 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Current group</source> <source>Current group</source>
<translation>Group actif</translation> <translation>Groupe actif</translation>
</message>
<message>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Impossible de calculer la clé maître</translation>
</message> </message>
</context> </context>
<context> <context>
@ -322,7 +396,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Advanced</source> <source>Advanced</source>
<translation>Avancées</translation> <translation>Avancé</translation>
</message> </message>
<message> <message>
<source>Icon</source> <source>Icon</source>
@ -330,11 +404,11 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Auto-Type</source> <source>Auto-Type</source>
<translation>Auto-Type</translation> <translation>Remplissage automatique</translation>
</message> </message>
<message> <message>
<source>Properties</source> <source>Properties</source>
<translation>Propriétés </translation> <translation>Propriétés</translation>
</message> </message>
<message> <message>
<source>History</source> <source>History</source>
@ -379,7 +453,7 @@ Enregistrer les modifications ?</translation>
<message> <message>
<source>Unable to save the attachment: <source>Unable to save the attachment:
</source> </source>
<translation>Impossible de enregistrer le fichier attaché: <translation>Impossible d&apos;enregistrer le fichier attaché :
</translation> </translation>
</message> </message>
<message> <message>
@ -396,14 +470,14 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>1 year</source> <source>1 year</source>
<translation>Une année</translation> <translation>1 an</translation>
</message> </message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAdvanced</name> <name>EditEntryWidgetAdvanced</name>
<message> <message>
<source>Additional attributes</source> <source>Additional attributes</source>
<translation>Attributs additionnel </translation> <translation>Attributs supplémentaires</translation>
</message> </message>
<message> <message>
<source>Add</source> <source>Add</source>
@ -423,22 +497,26 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Save</source> <source>Save</source>
<translation>Enregistrer le fichier </translation> <translation>Enregistrer le fichier</translation>
</message>
<message>
<source>Open</source>
<translation>Ouvrir</translation>
</message> </message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAutoType</name> <name>EditEntryWidgetAutoType</name>
<message> <message>
<source>Enable Auto-Type for this entry</source> <source>Enable Auto-Type for this entry</source>
<translation>Activer l&apos;Auto-Type pour cette entrée</translation> <translation>Activer le remplissage automatique pour cette entrée</translation>
</message> </message>
<message> <message>
<source>Inherit default Auto-Type sequence from the group</source> <source>Inherit default Auto-Type sequence from the group</source>
<translation type="unfinished"/> <translation>Utiliser la séquence de remplissage automatique par défaut du groupe</translation>
</message> </message>
<message> <message>
<source>Use custom Auto-Type sequence:</source> <source>Use custom Auto-Type sequence:</source>
<translation>Utiliser une séquence d&apos;Auto-Type personnalisée :</translation> <translation>Utiliser une séquence de remplissage automatique personnalisée :</translation>
</message> </message>
<message> <message>
<source>+</source> <source>+</source>
@ -450,7 +528,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Window title:</source> <source>Window title:</source>
<translation>Titre de la fenêtre:</translation> <translation>Titre de la fenêtre :</translation>
</message> </message>
<message> <message>
<source>Use default sequence</source> <source>Use default sequence</source>
@ -458,14 +536,14 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Set custom sequence:</source> <source>Set custom sequence:</source>
<translation type="unfinished"/> <translation>Définir une séquence personnalisée :</translation>
</message> </message>
</context> </context>
<context> <context>
<name>EditEntryWidgetHistory</name> <name>EditEntryWidgetHistory</name>
<message> <message>
<source>Show</source> <source>Show</source>
<translation>Exposer</translation> <translation>Afficher</translation>
</message> </message>
<message> <message>
<source>Restore</source> <source>Restore</source>
@ -484,19 +562,19 @@ Enregistrer les modifications ?</translation>
<name>EditEntryWidgetMain</name> <name>EditEntryWidgetMain</name>
<message> <message>
<source>Title:</source> <source>Title:</source>
<translation>Titre:</translation> <translation>Titre :</translation>
</message> </message>
<message> <message>
<source>Username:</source> <source>Username:</source>
<translation>Non d&apos;utilisateur:</translation> <translation>Nom d&apos;utilisateur :</translation>
</message> </message>
<message> <message>
<source>Password:</source> <source>Password:</source>
<translation>Mot de passe:</translation> <translation>Mot de passe :</translation>
</message> </message>
<message> <message>
<source>Repeat:</source> <source>Repeat:</source>
<translation>Confirme: </translation> <translation>Confirmation :</translation>
</message> </message>
<message> <message>
<source>Gen.</source> <source>Gen.</source>
@ -504,7 +582,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>URL:</source> <source>URL:</source>
<translation>URL:</translation> <translation>URL :</translation>
</message> </message>
<message> <message>
<source>Expires</source> <source>Expires</source>
@ -516,7 +594,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Notes:</source> <source>Notes:</source>
<translation>Notes:</translation> <translation>Notes :</translation>
</message> </message>
</context> </context>
<context> <context>
@ -531,15 +609,15 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Properties</source> <source>Properties</source>
<translation>Propriétés </translation> <translation>Propriétés</translation>
</message> </message>
<message> <message>
<source>Add group</source> <source>Add group</source>
<translation>Ajouter un groupe. </translation> <translation>Ajouter un groupe</translation>
</message> </message>
<message> <message>
<source>Edit group</source> <source>Edit group</source>
<translation>Modifie le groupe</translation> <translation>Modifier le groupe</translation>
</message> </message>
<message> <message>
<source>Enable</source> <source>Enable</source>
@ -566,7 +644,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Expires</source> <source>Expires</source>
<translation>Expires</translation> <translation>Expiration</translation>
</message> </message>
<message> <message>
<source>Search</source> <source>Search</source>
@ -574,7 +652,15 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Auto-type</source> <source>Auto-type</source>
<translation>Auto-type</translation> <translation>Remplissage automatique</translation>
</message>
<message>
<source>Use default auto-type sequence of parent group</source>
<translation>Utiliser la séquence de remplissage automatique par défaut du groupe parent</translation>
</message>
<message>
<source>Set default auto-type sequence</source>
<translation>Définir une séquence de remplissage automatique par défaut</translation>
</message> </message>
</context> </context>
<context> <context>
@ -605,7 +691,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Select Image</source> <source>Select Image</source>
<translation>Choisis un image. </translation> <translation>Choisir une image</translation>
</message> </message>
<message> <message>
<source>Can&apos;t delete icon!</source> <source>Can&apos;t delete icon!</source>
@ -632,7 +718,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Uuid:</source> <source>Uuid:</source>
<translation>Uuid:</translation> <translation>Uuid :</translation>
</message> </message>
</context> </context>
<context> <context>
@ -673,7 +759,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Username</source> <source>Username</source>
<translation>Non d&apos;utilisateur</translation> <translation>Nom d&apos;utilisateur</translation>
</message> </message>
<message> <message>
<source>URL</source> <source>URL</source>
@ -684,14 +770,14 @@ Enregistrer les modifications ?</translation>
<name>Group</name> <name>Group</name>
<message> <message>
<source>Recycle Bin</source> <source>Recycle Bin</source>
<translation>Bac de Recyclage</translation> <translation>Corbeille</translation>
</message> </message>
</context> </context>
<context> <context>
<name>KeePass1OpenWidget</name> <name>KeePass1OpenWidget</name>
<message> <message>
<source>Import KeePass1 database</source> <source>Import KeePass1 database</source>
<translation>Importe un KeePass1 bas de données</translation> <translation>Importer une base de données au format KeePass1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -699,18 +785,18 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Unable to open the database.</source> <source>Unable to open the database.</source>
<translation>Impossible d&apos;ouvrir la bas de données.</translation> <translation>Impossible d&apos;ouvrir la base de données.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>KeePass1Reader</name> <name>KeePass1Reader</name>
<message> <message>
<source>Unable to read keyfile.</source> <source>Unable to read keyfile.</source>
<translation>Impossible de lire le fichier de clé.</translation> <translation>Impossible de lire le fichier-clé.</translation>
</message> </message>
<message> <message>
<source>Not a KeePass database.</source> <source>Not a KeePass database.</source>
<translation>Ce n&apos;est pas une base de donnée KeePass.</translation> <translation>Ce n&apos;est pas une base de données KeePass.</translation>
</message> </message>
<message> <message>
<source>Unsupported encryption algorithm.</source> <source>Unsupported encryption algorithm.</source>
@ -718,26 +804,44 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Unsupported KeePass database version.</source> <source>Unsupported KeePass database version.</source>
<translation>Version de base de donnée KeePass non supportée.</translation> <translation>Version de base de données KeePass non supportée.</translation>
</message> </message>
<message> <message>
<source>Root</source> <source>Root</source>
<translation>Racine</translation> <translation>Racine</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Impossible de calculer la clé maître</translation>
</message>
</context> </context>
<context> <context>
<name>KeePass2Reader</name> <name>KeePass2Reader</name>
<message> <message>
<source>Not a KeePass database.</source> <source>Not a KeePass database.</source>
<translation>Ce n&apos;est pas une base de donnée KeePass.</translation> <translation>Ce n&apos;est pas une base de données KeePass.</translation>
</message> </message>
<message> <message>
<source>Unsupported KeePass database version.</source> <source>Unsupported KeePass database version.</source>
<translation>Version de base de donnée KeePass non supportée.</translation> <translation>Version de base de données KeePass non supportée.</translation>
</message> </message>
<message> <message>
<source>Wrong key or database file is corrupt.</source> <source>Wrong key or database file is corrupt.</source>
<translation>Mauvaise clé ou fichier de base de donnée corrompu.</translation> <translation>Mauvaise clé ou fichier de base de données corrompu.</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Impossible de calculer la clé maître</translation>
</message>
<message>
<source>The selected file is an old KeePass 1 database (.kdb).
You can import it by clicking on Database &gt; 'Import KeePass 1 database'.
This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
<translation>Le fichier sélectionné est une ancienne base de données pour KeePass 1 (.kdb).
Vous pouvez l&apos;importer en cliquant sur &quot;Base de données&quot; &gt; &quot;Importer une base de données KeePass 1&quot;.
Ceci est une migration à sens unique. Vous ne serez plus en mesure d&apos;ouvrir la base de données importée avec l&apos;ancienne version KeePassX version 0.4.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -771,16 +875,12 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Copy attribute to clipboard</source> <source>Copy attribute to clipboard</source>
<translation>Copier l&apos;attribut dans le presse-papiers</translation> <translation>Copier l&apos;attribut dans le presse-papier</translation>
</message> </message>
<message> <message>
<source>Groups</source> <source>Groups</source>
<translation>Groupes</translation> <translation>Groupes</translation>
</message> </message>
<message>
<source>Extras</source>
<translation>Extras</translation>
</message>
<message> <message>
<source>View</source> <source>View</source>
<translation>Vue</translation> <translation>Vue</translation>
@ -795,19 +895,19 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Open database</source> <source>Open database</source>
<translation>Ouvrir une base de donnée</translation> <translation>Ouvrir une base de données</translation>
</message> </message>
<message> <message>
<source>Save database</source> <source>Save database</source>
<translation>Enregistrer la base de donnée</translation> <translation>Enregistrer la base de données</translation>
</message> </message>
<message> <message>
<source>Close database</source> <source>Close database</source>
<translation>Fermer la base de donnée</translation> <translation>Fermer la base de données</translation>
</message> </message>
<message> <message>
<source>New database</source> <source>New database</source>
<translation>Nouvelle base de donnée</translation> <translation>Nouvelle base de données</translation>
</message> </message>
<message> <message>
<source>Add new entry</source> <source>Add new entry</source>
@ -835,7 +935,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Save database as</source> <source>Save database as</source>
<translation>Enregistrer la base de donnée sous</translation> <translation>Enregistrer la base de données sous</translation>
</message> </message>
<message> <message>
<source>Change master key</source> <source>Change master key</source>
@ -843,11 +943,11 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Database settings</source> <source>Database settings</source>
<translation>Paramètre de la base de donnée</translation> <translation>Paramètres de la base de données</translation>
</message> </message>
<message> <message>
<source>Import KeePass 1 database</source> <source>Import KeePass 1 database</source>
<translation>Importer une base de donnée KeePass 1</translation> <translation>Importer une base de données KeePass 1</translation>
</message> </message>
<message> <message>
<source>Clone entry</source> <source>Clone entry</source>
@ -857,21 +957,13 @@ Enregistrer les modifications ?</translation>
<source>Find</source> <source>Find</source>
<translation>Chercher</translation> <translation>Chercher</translation>
</message> </message>
<message>
<source>Username</source>
<translation>Nom d&apos;utilisateur</translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation>Copier le nom d&apos;utilisateur dans le presse-papiers</translation> <translation>Copier le nom d&apos;utilisateur dans le presse-papier</translation>
</message>
<message>
<source>Password</source>
<translation>Mot de passe</translation>
</message> </message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation>Copier le mot de passe dans le presse-papiers</translation> <translation>Copier le mot de passe dans le presse-papier</translation>
</message> </message>
<message> <message>
<source>Settings</source> <source>Settings</source>
@ -879,7 +971,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Perform Auto-Type</source> <source>Perform Auto-Type</source>
<translation>Effectuer un Auto-Type</translation> <translation>Effectuer un remplissage automatique</translation>
</message> </message>
<message> <message>
<source>Open URL</source> <source>Open URL</source>
@ -913,12 +1005,28 @@ Enregistrer les modifications ?</translation>
<source>Toggle window</source> <source>Toggle window</source>
<translation>Basculer de fenêtre</translation> <translation>Basculer de fenêtre</translation>
</message> </message>
<message>
<source>Tools</source>
<translation>Outils</translation>
</message>
<message>
<source>Copy username</source>
<translation>Copier le nom d&apos;utilisateur</translation>
</message>
<message>
<source>Copy password</source>
<translation>Copier le mot de passe</translation>
</message>
<message>
<source>Export to CSV file</source>
<translation>Exporter au format CSV</translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
<message> <message>
<source>Password:</source> <source>Password:</source>
<translation>Mot de passe:</translation> <translation>Mot de passe :</translation>
</message> </message>
<message> <message>
<source>Length:</source> <source>Length:</source>
@ -926,7 +1034,7 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Character Types</source> <source>Character Types</source>
<translation>Types de caractère</translation> <translation>Types de caractères</translation>
</message> </message>
<message> <message>
<source>Upper Case Letters</source> <source>Upper Case Letters</source>
@ -961,7 +1069,7 @@ Enregistrer les modifications ?</translation>
<name>QCommandLineParser</name> <name>QCommandLineParser</name>
<message> <message>
<source>Displays version information.</source> <source>Displays version information.</source>
<translation>Afficher les informations de version</translation> <translation>Afficher les informations de version.</translation>
</message> </message>
<message> <message>
<source>Displays this help.</source> <source>Displays this help.</source>
@ -1023,15 +1131,15 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Error writing to underlying device: </source> <source>Error writing to underlying device: </source>
<translation type="unfinished"/> <translation>Erreur d&apos;écriture sur le périphérique concerné :</translation>
</message> </message>
<message> <message>
<source>Error opening underlying device: </source> <source>Error opening underlying device: </source>
<translation type="unfinished"/> <translation>Erreur d&apos;ouverture du périphérique concerné :</translation>
</message> </message>
<message> <message>
<source>Error reading data from underlying device: </source> <source>Error reading data from underlying device: </source>
<translation type="unfinished"/> <translation>Erreur de lecture sur le périphérique concerné :</translation>
</message> </message>
<message> <message>
<source>Internal zlib error when decompressing: </source> <source>Internal zlib error when decompressing: </source>
@ -1072,7 +1180,7 @@ Enregistrer les modifications ?</translation>
<name>SettingsWidget</name> <name>SettingsWidget</name>
<message> <message>
<source>Application Settings</source> <source>Application Settings</source>
<translation>Paramètre de l&apos;application</translation> <translation>Paramètres de l&apos;application</translation>
</message> </message>
<message> <message>
<source>General</source> <source>General</source>
@ -1091,23 +1199,19 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Open previous databases on startup</source> <source>Open previous databases on startup</source>
<translation>Ouvrir les base de données précédentes au démarrage</translation> <translation>Ouvrir les bases de données précédentes au démarrage</translation>
</message>
<message>
<source>Mark as modified on expanded state changes</source>
<translation type="unfinished"/>
</message> </message>
<message> <message>
<source>Automatically save on exit</source> <source>Automatically save on exit</source>
<translation>Sauvegarde automatiquement à la sortie</translation> <translation>Sauvegarder automatiquement à la sortie</translation>
</message> </message>
<message> <message>
<source>Automatically save after every change</source> <source>Automatically save after every change</source>
<translation>Sauvegarde automatiquement après chaque modification</translation> <translation>Sauvegarder automatiquement après chaque modification</translation>
</message> </message>
<message> <message>
<source>Minimize when copying to clipboard</source> <source>Minimize when copying to clipboard</source>
<translation type="unfinished"/> <translation>Réduire lors de la copie dans le presse-papier</translation>
</message> </message>
<message> <message>
<source>Use group icon on entry creation</source> <source>Use group icon on entry creation</source>
@ -1115,11 +1219,11 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Global Auto-Type shortcut</source> <source>Global Auto-Type shortcut</source>
<translation>Raccourci d&apos;Auto-Type global</translation> <translation>Raccourci de remplissage automatique global</translation>
</message> </message>
<message> <message>
<source>Use entry title to match windows for global auto-type</source> <source>Use entry title to match windows for global auto-type</source>
<translation>Utiliser la correspondance entre le titre de l&apos;entrée et de la fenêtre pour l&apos;Auto-Type global</translation> <translation>Utiliser la correspondance entre le titre de l&apos;entrée et de la fenêtre pour le remplissage automatique global</translation>
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
@ -1127,26 +1231,30 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Show a system tray icon</source> <source>Show a system tray icon</source>
<translation type="unfinished"/> <translation>Afficher une icône dans la zone de notification</translation>
</message> </message>
<message> <message>
<source>Hide window to system tray when minimized</source> <source>Hide window to system tray when minimized</source>
<translation type="unfinished"/> <translation>Réduire la fenêtre vers la zone de notification lors de sa réduction</translation>
</message>
<message>
<source>Remember last key files</source>
<translation>Se rappeler les derniers fichiers-clés ouverts</translation>
</message> </message>
</context> </context>
<context> <context>
<name>SettingsWidgetSecurity</name> <name>SettingsWidgetSecurity</name>
<message> <message>
<source>Clear clipboard after</source> <source>Clear clipboard after</source>
<translation>Vider le presse-papiers après</translation> <translation>Vider le presse-papier après</translation>
</message> </message>
<message> <message>
<source> sec</source> <source> sec</source>
<translation>s</translation> <translation> s</translation>
</message> </message>
<message> <message>
<source>Lock databases after inactivity of</source> <source>Lock databases after inactivity of</source>
<translation>Verrouiller les bases de donnée après une inactivité de</translation> <translation>Verrouiller les bases de données après une inactivité de</translation>
</message> </message>
<message> <message>
<source>Show passwords in cleartext by default</source> <source>Show passwords in cleartext by default</source>
@ -1154,22 +1262,14 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>Always ask before performing auto-type</source> <source>Always ask before performing auto-type</source>
<translation>Toujours demander avant d&apos;effectuer un auto-type</translation> <translation>Toujours demander avant d&apos;effectuer un remplissage automatique</translation>
</message> </message>
</context> </context>
<context> <context>
<name>UnlockDatabaseWidget</name> <name>UnlockDatabaseWidget</name>
<message> <message>
<source>Unlock database</source> <source>Unlock database</source>
<translation>Déverrouiller la base de donnée</translation> <translation>Déverrouiller la base de données</translation>
</message>
<message>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
<source>Wrong key.</source>
<translation>Mauvaise clé.</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1187,19 +1287,15 @@ Enregistrer les modifications ?</translation>
</message> </message>
<message> <message>
<source>filename of the password database to open (*.kdbx)</source> <source>filename of the password database to open (*.kdbx)</source>
<translation>Nom de fichier de la base de donnée de mot de pass à ouvrir (*.kdbx)</translation> <translation>Nom de fichier de la base de données de mot de passe à ouvrir (*.kdbx)</translation>
</message> </message>
<message> <message>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation>Chemin vers un fichier de configuration personnalisé</translation> <translation>Chemin vers un fichier de configuration personnalisé</translation>
</message> </message>
<message>
<source>password of the database (DANGEROUS!)</source>
<translation>Mot de passe de la base de donnée (DANGEREUX !)</translation>
</message>
<message> <message>
<source>key file of the database</source> <source>key file of the database</source>
<translation>Fichier de clé de la base de donnée</translation> <translation>Fichier-clé de la base de données</translation>
</message> </message>
</context> </context>
</TS> </TS>

348
share/translations/keepassx_id.ts
View File

@ -7,7 +7,15 @@
</message> </message>
<message> <message>
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation type="unfinished"/> <translation>KeePassX disebarluaskan dibawah ketentuan dari Lisensi Publik Umum GNU (GPL) versi 2 atau (sesuai pilihan Anda) versi 3.</translation>
</message>
<message>
<source>Revision</source>
<translation>Revisi</translation>
</message>
<message>
<source>Using:</source>
<translation>Menggunakan:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -18,7 +26,7 @@
</message> </message>
<message> <message>
<source>Couldn&apos;t find an entry that matches the window title:</source> <source>Couldn&apos;t find an entry that matches the window title:</source>
<translation>Tidak dapat menemukan entri yang cocok dengan judul jendela</translation> <translation>Tidak bisa menemukan entri yang cocok dengan judul jendela:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -51,15 +59,15 @@
<name>ChangeMasterKeyWidget</name> <name>ChangeMasterKeyWidget</name>
<message> <message>
<source>Password</source> <source>Password</source>
<translation>Kata Sandi</translation> <translation>Sandi</translation>
</message> </message>
<message> <message>
<source>Enter password:</source> <source>Enter password:</source>
<translation>Masukan kata sandi:</translation> <translation>Masukkan sandi:</translation>
</message> </message>
<message> <message>
<source>Repeat password:</source> <source>Repeat password:</source>
<translation>Ulangi kata sandi:</translation> <translation>Ulangi sandi:</translation>
</message> </message>
<message> <message>
<source>Key file</source> <source>Key file</source>
@ -75,7 +83,7 @@
</message> </message>
<message> <message>
<source>Key files</source> <source>Key files</source>
<translation>Berkas Kunci</translation> <translation>Berkas kunci</translation>
</message> </message>
<message> <message>
<source>All files</source> <source>All files</source>
@ -91,11 +99,11 @@
</message> </message>
<message> <message>
<source>Unable to create Key File : </source> <source>Unable to create Key File : </source>
<translation>Tidak dapat membuat Berkas Kunci :</translation> <translation>Tidak bisa membuat Berkas Kunci :</translation>
</message> </message>
<message> <message>
<source>Select a key file</source> <source>Select a key file</source>
<translation>Pilih sebuah berkas kunci</translation> <translation>Pilih berkas kunci</translation>
</message> </message>
<message> <message>
<source>Question</source> <source>Question</source>
@ -103,18 +111,28 @@
</message> </message>
<message> <message>
<source>Do you really want to use an empty string as password?</source> <source>Do you really want to use an empty string as password?</source>
<translation>Apakah anda ingin menggunakan string kosong sebagai kata sandi?</translation> <translation>Apakah Anda benar-benar ingin menggunakan lema kosong sebagai sandi?</translation>
</message> </message>
<message> <message>
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Kata sandi yang berbeda diberikan.</translation> <translation>Sandi berbeda.</translation>
</message>
<message>
<source>Failed to set key file</source>
<translation>Gagal menetapkan berkas kunci</translation>
</message>
<message>
<source>Failed to set %1 as the Key file:
%2</source>
<translation>Gagal menetapkan %1 sebagai berkas Kunci:
%2</translation>
</message> </message>
</context> </context>
<context> <context>
<name>DatabaseOpenWidget</name> <name>DatabaseOpenWidget</name>
<message> <message>
<source>Enter master key</source> <source>Enter master key</source>
<translation>Masukan kunci utama</translation> <translation>Masukkan kunci utama</translation>
</message> </message>
<message> <message>
<source>Key File:</source> <source>Key File:</source>
@ -122,7 +140,7 @@
</message> </message>
<message> <message>
<source>Password:</source> <source>Password:</source>
<translation>Kata sandi:</translation> <translation>Sandi:</translation>
</message> </message>
<message> <message>
<source>Browse</source> <source>Browse</source>
@ -134,11 +152,11 @@
</message> </message>
<message> <message>
<source>Unable to open the database.</source> <source>Unable to open the database.</source>
<translation>Tidak dapat membuka basis data</translation> <translation>Tidak bisa membuka basis data.</translation>
</message> </message>
<message> <message>
<source>Can&apos;t open key file</source> <source>Can&apos;t open key file</source>
<translation>Tidak dapat membuka berkas kunci</translation> <translation>Tidak bisa membuka berkas kunci</translation>
</message> </message>
<message> <message>
<source>All files</source> <source>All files</source>
@ -173,7 +191,7 @@
</message> </message>
<message> <message>
<source>Use recycle bin:</source> <source>Use recycle bin:</source>
<translation type="unfinished"/> <translation>Gunakan tong sampah:</translation>
</message> </message>
<message> <message>
<source> MiB</source> <source> MiB</source>
@ -196,7 +214,7 @@
<name>DatabaseTabWidget</name> <name>DatabaseTabWidget</name>
<message> <message>
<source>Root</source> <source>Root</source>
<translation type="unfinished"/> <translation>Root</translation>
</message> </message>
<message> <message>
<source>KeePass 2 Database</source> <source>KeePass 2 Database</source>
@ -234,12 +252,6 @@
<source>Close?</source> <source>Close?</source>
<translation>Tutup?</translation> <translation>Tutup?</translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation>&quot;%1&quot; dalam berada mode sunting.
Tetap tutup?</translation>
</message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
<translation>Simpan perubahan?</translation> <translation>Simpan perubahan?</translation>
@ -256,7 +268,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Writing the database failed.</source> <source>Writing the database failed.</source>
<translation>Menulis basis data gagal.</translation> <translation>Gagal membuat basis data.</translation>
</message> </message>
<message> <message>
<source>Save database as</source> <source>Save database as</source>
@ -270,6 +282,60 @@ Simpan perubahan?</translation>
<source>locked</source> <source>locked</source>
<translation>terkunci</translation> <translation>terkunci</translation>
</message> </message>
<message>
<source>The database you are trying to open is locked by another instance of KeePassX.
Do you want to open it anyway? Alternatively the database is opened read-only.</source>
<translation>Basis data yang Anda coba buka terkunci oleh KeePassX lain yang sedang berjalan.
Apakah Anda tetap ingin membukanya? Alternatif lain buka basis data baca-saja.</translation>
</message>
<message>
<source>Lock database</source>
<translation>Kunci basis data</translation>
</message>
<message>
<source>Can't lock the database as you are currently editing it.
Please press cancel to finish your changes or discard them.</source>
<translation>Tidak bisa mengunci basis data karena Anda sedang menyuntingnya.
Harap tekan batal untuk menyelesaikan ubahan Anda atau membuangnya.</translation>
</message>
<message>
<source>This database has never been saved.
You can save the database or stop locking it.</source>
<translation>Basis data ini belum pernah disimpan.
Anda bisa menyimpan basis data atau berhenti menguncinya.</translation>
</message>
<message>
<source>This database has been modified.
Do you want to save the database before locking it?
Otherwise your changes are lost.</source>
<translation>Basis data ini telah dimodifikasi.
Apakah Anda ingin menyimpan basis data sebelum menguncinya?
Kalau tidak, ubahan Anda akan hilang.</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation>&quot;%1&quot; dalam mode penyuntingan.
Tetap buang ubahan dan tutup?</translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation>Ekspor basis data ke berkas CSV</translation>
</message>
<message>
<source>CSV file</source>
<translation>Berkas CSV</translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation>Gagal membuat berkas CSV.</translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassX.
Do you want to save it anyway?</source>
<translation>Basis data yang Anda coba buka terkunci oleh KeePassX lain yang sedang berjalan.
Apakah Anda tetap ingin menyimpannya?</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
@ -283,7 +349,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Do you really want to delete the entry &quot;%1&quot; for good?</source> <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
<translation>Apakah anda ingin menghapus entri &quot;%1&quot; untuk selamanya?</translation> <translation>Apakah Anda benar-benar ingin menghapus entri &quot;%1&quot; untuk selamanya?</translation>
</message> </message>
<message> <message>
<source>Delete entries?</source> <source>Delete entries?</source>
@ -291,15 +357,15 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Do you really want to delete %1 entries for good?</source> <source>Do you really want to delete %1 entries for good?</source>
<translation>Apakah anda ingin menghapus entri %1 untuk selamanya?</translation> <translation>Apakah Anda benar-benar ingin menghapus entri %1 untuk selamanya?</translation>
</message> </message>
<message> <message>
<source>Move entries to recycle bin?</source> <source>Move entries to recycle bin?</source>
<translation type="unfinished"/> <translation>Pindah entri ke tong sampah?</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>Do you really want to move %n entry(s) to the recycle bin?</source> <source>Do you really want to move %n entry(s) to the recycle bin?</source>
<translation type="unfinished"><numerusform></numerusform></translation> <translation><numerusform>Apakah Anda benar-benar ingin memindahkan %n entri ke tong sampah?</numerusform></translation>
</message> </message>
<message> <message>
<source>Delete group?</source> <source>Delete group?</source>
@ -307,12 +373,20 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Do you really want to delete the group &quot;%1&quot; for good?</source> <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
<translation>Apakah anda ingin menghapus grup &quot;%1&quot; untuk selamanya?</translation> <translation>Apakah Anda benar-benar ingin menghapus grup &quot;%1&quot; untuk selamanya?</translation>
</message> </message>
<message> <message>
<source>Current group</source> <source>Current group</source>
<translation>Grup saat ini</translation> <translation>Grup saat ini</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Galat</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Tidak bisa mengkalkulasi kunci utama</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidget</name> <name>EditEntryWidget</name>
@ -342,7 +416,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Entry history</source> <source>Entry history</source>
<translation>Entri riwayat</translation> <translation>Riwayat entri</translation>
</message> </message>
<message> <message>
<source>Add entry</source> <source>Add entry</source>
@ -358,7 +432,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Kata sandi yang berbeda diberikan.</translation> <translation>Sandi berbeda.</translation>
</message> </message>
<message> <message>
<source>New attribute</source> <source>New attribute</source>
@ -370,7 +444,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Unable to open file</source> <source>Unable to open file</source>
<translation>Tidak dapat membuka berkas</translation> <translation>Tidak bisa membuka berkas</translation>
</message> </message>
<message> <message>
<source>Save attachment</source> <source>Save attachment</source>
@ -379,7 +453,7 @@ Simpan perubahan?</translation>
<message> <message>
<source>Unable to save the attachment: <source>Unable to save the attachment:
</source> </source>
<translation>Tidak dapat menyimpan lampiran: <translation>Tidak bisa menyimpan lampiran:
</translation> </translation>
</message> </message>
<message> <message>
@ -388,11 +462,11 @@ Simpan perubahan?</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>%n week(s)</source> <source>%n week(s)</source>
<translation><numerusform>%n minggu(s)</numerusform></translation> <translation><numerusform>%n minggu</numerusform></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>%n month(s)</source> <source>%n month(s)</source>
<translation><numerusform>%n bulan(s)</numerusform></translation> <translation><numerusform>%n bulan</numerusform></translation>
</message> </message>
<message> <message>
<source>1 year</source> <source>1 year</source>
@ -415,7 +489,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Remove</source> <source>Remove</source>
<translation>Hapus</translation> <translation>Buang</translation>
</message> </message>
<message> <message>
<source>Attachments</source> <source>Attachments</source>
@ -425,6 +499,10 @@ Simpan perubahan?</translation>
<source>Save</source> <source>Save</source>
<translation>Simpan</translation> <translation>Simpan</translation>
</message> </message>
<message>
<source>Open</source>
<translation>Buka</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAutoType</name> <name>EditEntryWidgetAutoType</name>
@ -434,11 +512,11 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Inherit default Auto-Type sequence from the group</source> <source>Inherit default Auto-Type sequence from the group</source>
<translation type="unfinished"/> <translation>Mengikuti urutan Ketik-Otomatis baku grup</translation>
</message> </message>
<message> <message>
<source>Use custom Auto-Type sequence:</source> <source>Use custom Auto-Type sequence:</source>
<translation type="unfinished"/> <translation>Gunakan urutan Ketik-Otomatis ubahsuai:</translation>
</message> </message>
<message> <message>
<source>+</source> <source>+</source>
@ -458,7 +536,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Set custom sequence:</source> <source>Set custom sequence:</source>
<translation>Tetapkan urutan kustom:</translation> <translation>Tetapkan urutan ubahsuai:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -492,7 +570,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Password:</source> <source>Password:</source>
<translation>Kata sandi:</translation> <translation>Sandi:</translation>
</message> </message>
<message> <message>
<source>Repeat:</source> <source>Repeat:</source>
@ -508,11 +586,11 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Expires</source> <source>Expires</source>
<translation>Kadaluarsa</translation> <translation>Kedaluwarsa</translation>
</message> </message>
<message> <message>
<source>Presets</source> <source>Presets</source>
<translation type="unfinished"/> <translation>Prasetel</translation>
</message> </message>
<message> <message>
<source>Notes:</source> <source>Notes:</source>
@ -551,7 +629,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Inherit from parent group (%1)</source> <source>Inherit from parent group (%1)</source>
<translation type="unfinished"/> <translation>Mengikuti grup induk (%1)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -566,7 +644,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Expires</source> <source>Expires</source>
<translation>Kadaluarsa</translation> <translation>Kedaluwarsa</translation>
</message> </message>
<message> <message>
<source>Search</source> <source>Search</source>
@ -576,6 +654,14 @@ Simpan perubahan?</translation>
<source>Auto-type</source> <source>Auto-type</source>
<translation>Ketik-otomatis</translation> <translation>Ketik-otomatis</translation>
</message> </message>
<message>
<source>Use default auto-type sequence of parent group</source>
<translation>Gunakan urutan ketik-otomatis baku grup induk</translation>
</message>
<message>
<source>Set default auto-type sequence</source>
<translation>Tetapkan urutan ketik-otomatis baku</translation>
</message>
</context> </context>
<context> <context>
<name>EditWidgetIcons</name> <name>EditWidgetIcons</name>
@ -585,15 +671,15 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Use custom icon</source> <source>Use custom icon</source>
<translation>Gunakan ikon kustom</translation> <translation>Gunakan ikon ubahsuai</translation>
</message> </message>
<message> <message>
<source>Add custom icon</source> <source>Add custom icon</source>
<translation>Tambah ikon kustom</translation> <translation>Tambah ikon ubahsuai</translation>
</message> </message>
<message> <message>
<source>Delete custom icon</source> <source>Delete custom icon</source>
<translation>Hapus ikon kustom</translation> <translation>Hapus ikon ubahsuai</translation>
</message> </message>
<message> <message>
<source>Images</source> <source>Images</source>
@ -609,11 +695,11 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Can&apos;t delete icon!</source> <source>Can&apos;t delete icon!</source>
<translation>Tidak dapat menghapus ikon!</translation> <translation>Tidak bisa menghapus ikon!</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>Can&apos;t delete icon. Still used by %n item(s).</source> <source>Can&apos;t delete icon. Still used by %n item(s).</source>
<translation><numerusform>Can&apos;t delete icon. Still used by %n item(s).</numerusform></translation> <translation><numerusform>Tidak bisa menghapus ikon. Masih digunakan oleh %n item.</numerusform></translation>
</message> </message>
</context> </context>
<context> <context>
@ -684,7 +770,7 @@ Simpan perubahan?</translation>
<name>Group</name> <name>Group</name>
<message> <message>
<source>Recycle Bin</source> <source>Recycle Bin</source>
<translation type="unfinished"/> <translation>Tong Sampah</translation>
</message> </message>
</context> </context>
<context> <context>
@ -699,52 +785,70 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Unable to open the database.</source> <source>Unable to open the database.</source>
<translation>Tidak dapat membuka basis data</translation> <translation>Tidak bisa membuka basis data.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>KeePass1Reader</name> <name>KeePass1Reader</name>
<message> <message>
<source>Unable to read keyfile.</source> <source>Unable to read keyfile.</source>
<translation>Tidak dapat membaca berkas kunci.</translation> <translation>Tidak bisa membaca berkas kunci.</translation>
</message> </message>
<message> <message>
<source>Not a KeePass database.</source> <source>Not a KeePass database.</source>
<translation>Bukan basis data KeePass</translation> <translation>Bukan basis data KeePass.</translation>
</message> </message>
<message> <message>
<source>Unsupported encryption algorithm.</source> <source>Unsupported encryption algorithm.</source>
<translation>Algoritma enkripsi tidak didukung</translation> <translation>Algoritma enkripsi tidak didukung.</translation>
</message> </message>
<message> <message>
<source>Unsupported KeePass database version.</source> <source>Unsupported KeePass database version.</source>
<translation>Versi Basis data KeePass tidak didukung</translation> <translation>Versi basis data KeePass tidak didukung.</translation>
</message> </message>
<message> <message>
<source>Root</source> <source>Root</source>
<translation type="unfinished"/> <translation>Root</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Tidak bisa mengkalkulasi kunci utama</translation>
</message> </message>
</context> </context>
<context> <context>
<name>KeePass2Reader</name> <name>KeePass2Reader</name>
<message> <message>
<source>Not a KeePass database.</source> <source>Not a KeePass database.</source>
<translation>Bukan basis data KeePass</translation> <translation>Bukan basis data KeePass.</translation>
</message> </message>
<message> <message>
<source>Unsupported KeePass database version.</source> <source>Unsupported KeePass database version.</source>
<translation>Versi basis data KeePass tidak didukung</translation> <translation>Versi basis data KeePass tidak didukung.</translation>
</message> </message>
<message> <message>
<source>Wrong key or database file is corrupt.</source> <source>Wrong key or database file is corrupt.</source>
<translation>Kunci salah atau berkas basis data korup.</translation> <translation>Kunci salah atau berkas basis data rusak.</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Tidak bisa mengkalkulasi kunci utama</translation>
</message>
<message>
<source>The selected file is an old KeePass 1 database (.kdb).
You can import it by clicking on Database &gt; 'Import KeePass 1 database'.
This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
<translation>Berkas yang dipilih adalah basis data KeePass 1 yang lama (.kdb).
Anda bisa mengimpornya dengan mengklik Basis Data &gt; &apos;Impor basis data KeePass 1&apos;.
Ini adalah migrasi satu arah. Anda tidak akan bisa lagi membuka basis data yang diimpor dengan versi lama KeePassX 0.4.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>Main</name> <name>Main</name>
<message> <message>
<source>Fatal error while testing the cryptographic functions.</source> <source>Fatal error while testing the cryptographic functions.</source>
<translation type="unfinished"/> <translation>Galat saat menguji fungsi kriptografi.</translation>
</message> </message>
<message> <message>
<source>KeePassX - Error</source> <source>KeePassX - Error</source>
@ -759,7 +863,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Recent databases</source> <source>Recent databases</source>
<translation type="unfinished"/> <translation>Basis data baru-baru ini</translation>
</message> </message>
<message> <message>
<source>Help</source> <source>Help</source>
@ -777,13 +881,9 @@ Simpan perubahan?</translation>
<source>Groups</source> <source>Groups</source>
<translation>Grup</translation> <translation>Grup</translation>
</message> </message>
<message>
<source>Extras</source>
<translation>Ekstra</translation>
</message>
<message> <message>
<source>View</source> <source>View</source>
<translation type="unfinished"/> <translation>Lihat</translation>
</message> </message>
<message> <message>
<source>Quit</source> <source>Quit</source>
@ -815,7 +915,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>View/Edit entry</source> <source>View/Edit entry</source>
<translation>Tampil/Sunting entri</translation> <translation>Lihat/Sunting entri</translation>
</message> </message>
<message> <message>
<source>Delete entry</source> <source>Delete entry</source>
@ -851,27 +951,19 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Clone entry</source> <source>Clone entry</source>
<translation type="unfinished"/> <translation>Duplikat entri</translation>
</message> </message>
<message> <message>
<source>Find</source> <source>Find</source>
<translation>Temukan</translation> <translation>Temukan</translation>
</message> </message>
<message>
<source>Username</source>
<translation>Nama pengguna</translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation>Salin nama pengguna ke papan klip</translation> <translation>Salin nama pengguna ke papan klip</translation>
</message> </message>
<message>
<source>Password</source>
<translation>Kata sandi</translation>
</message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation>Salin kata sandi ke papan klip</translation> <translation>Salin sandi ke papan klip</translation>
</message> </message>
<message> <message>
<source>Settings</source> <source>Settings</source>
@ -879,7 +971,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Perform Auto-Type</source> <source>Perform Auto-Type</source>
<translation>Melakukan Ketik-Otomatis</translation> <translation>Lakukan Ketik-Otomatis</translation>
</message> </message>
<message> <message>
<source>Open URL</source> <source>Open URL</source>
@ -907,18 +999,34 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>read-only</source> <source>read-only</source>
<translation>hanya-baca</translation> <translation>baca-saja</translation>
</message> </message>
<message> <message>
<source>Toggle window</source> <source>Toggle window</source>
<translation type="unfinished"/> <translation>Jungkit jendela</translation>
</message>
<message>
<source>Tools</source>
<translation>Perkakas</translation>
</message>
<message>
<source>Copy username</source>
<translation>Salin nama pengguna</translation>
</message>
<message>
<source>Copy password</source>
<translation>Salin sandi</translation>
</message>
<message>
<source>Export to CSV file</source>
<translation>Ekspor ke berkas CSV</translation>
</message> </message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
<message> <message>
<source>Password:</source> <source>Password:</source>
<translation>Kata sandi:</translation> <translation>Sandi:</translation>
</message> </message>
<message> <message>
<source>Length:</source> <source>Length:</source>
@ -926,15 +1034,15 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Character Types</source> <source>Character Types</source>
<translation>Tipe karakter</translation> <translation>Tipe Karakter</translation>
</message> </message>
<message> <message>
<source>Upper Case Letters</source> <source>Upper Case Letters</source>
<translation type="unfinished"/> <translation>Huruf Besar</translation>
</message> </message>
<message> <message>
<source>Lower Case Letters</source> <source>Lower Case Letters</source>
<translation type="unfinished"/> <translation>Huruf Kecil</translation>
</message> </message>
<message> <message>
<source>Numbers</source> <source>Numbers</source>
@ -946,11 +1054,11 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Exclude look-alike characters</source> <source>Exclude look-alike characters</source>
<translation type="unfinished"/> <translation>Kecualikan karakter mirip</translation>
</message> </message>
<message> <message>
<source>Ensure that the password contains characters from every group</source> <source>Ensure that the password contains characters from every group</source>
<translation>Pastikan kata sandi berisi karakter dari setiap grup</translation> <translation>Pastikan sandi berisi karakter dari setiap grup</translation>
</message> </message>
<message> <message>
<source>Accept</source> <source>Accept</source>
@ -961,11 +1069,11 @@ Simpan perubahan?</translation>
<name>QCommandLineParser</name> <name>QCommandLineParser</name>
<message> <message>
<source>Displays version information.</source> <source>Displays version information.</source>
<translation>Tampilkan informasi versi</translation> <translation>Tampilkan informasi versi.</translation>
</message> </message>
<message> <message>
<source>Displays this help.</source> <source>Displays this help.</source>
<translation>Tampilkan bantuan ini</translation> <translation>Tampilkan bantuan ini.</translation>
</message> </message>
<message> <message>
<source>Unknown option &apos;%1&apos;.</source> <source>Unknown option &apos;%1&apos;.</source>
@ -997,29 +1105,29 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Arguments:</source> <source>Arguments:</source>
<translation>Argumen</translation> <translation>Argumen:</translation>
</message> </message>
</context> </context>
<context> <context>
<name>QSaveFile</name> <name>QSaveFile</name>
<message> <message>
<source>Existing file %1 is not writable</source> <source>Existing file %1 is not writable</source>
<translation>Berkas yang ada %1 tidak dapat ditulis</translation> <translation>Berkas yang ada %1 tidak bisa ditulis</translation>
</message> </message>
<message> <message>
<source>Writing canceled by application</source> <source>Writing canceled by application</source>
<translation>Menulis dibatalkan oleh aplikasi</translation> <translation>Penulisan dibatalkan oleh aplikasi</translation>
</message> </message>
<message> <message>
<source>Partial write. Partition full?</source> <source>Partial write. Partition full?</source>
<translation type="unfinished"/> <translation>Penulisan parsial. Partisi penuh?</translation>
</message> </message>
</context> </context>
<context> <context>
<name>QtIOCompressor</name> <name>QtIOCompressor</name>
<message> <message>
<source>Internal zlib error when compressing: </source> <source>Internal zlib error when compressing: </source>
<translation>Galat zlib internal ketika mengkompress: </translation> <translation>Galat zlib internal ketika memampatkan:</translation>
</message> </message>
<message> <message>
<source>Error writing to underlying device: </source> <source>Error writing to underlying device: </source>
@ -1035,7 +1143,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Internal zlib error when decompressing: </source> <source>Internal zlib error when decompressing: </source>
<translation>Galat zlib internal ketika dekompress</translation> <translation>Galat zlib internal ketika dekompres:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1057,15 +1165,15 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Case sensitive</source> <source>Case sensitive</source>
<translation type="unfinished"/> <translation>Sensitif besar kecil huruf</translation>
</message> </message>
<message> <message>
<source>Current group</source> <source>Current group</source>
<translation type="unfinished"/> <translation>Grup saat ini</translation>
</message> </message>
<message> <message>
<source>Root group</source> <source>Root group</source>
<translation type="unfinished"/> <translation>Grup root</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1093,10 +1201,6 @@ Simpan perubahan?</translation>
<source>Open previous databases on startup</source> <source>Open previous databases on startup</source>
<translation>Buka basis data sebelumnya saat mulai</translation> <translation>Buka basis data sebelumnya saat mulai</translation>
</message> </message>
<message>
<source>Mark as modified on expanded state changes</source>
<translation type="unfinished"/>
</message>
<message> <message>
<source>Automatically save on exit</source> <source>Automatically save on exit</source>
<translation>Otomatis simpan ketika keluar</translation> <translation>Otomatis simpan ketika keluar</translation>
@ -1107,7 +1211,7 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Minimize when copying to clipboard</source> <source>Minimize when copying to clipboard</source>
<translation>Kecilkan ketika menyalin ke papan klip</translation> <translation>Minimalkan ketika menyalin ke papan klip</translation>
</message> </message>
<message> <message>
<source>Use group icon on entry creation</source> <source>Use group icon on entry creation</source>
@ -1115,11 +1219,11 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Global Auto-Type shortcut</source> <source>Global Auto-Type shortcut</source>
<translation>Jalan pintas global Ketik-Otomatis</translation> <translation>Pintasan global Ketik-Otomatis</translation>
</message> </message>
<message> <message>
<source>Use entry title to match windows for global auto-type</source> <source>Use entry title to match windows for global auto-type</source>
<translation type="unfinished"/> <translation>Gunakan judul entri untuk mencocokkan jendela untuk ketik-otomatis global</translation>
</message> </message>
<message> <message>
<source>Language</source> <source>Language</source>
@ -1127,18 +1231,22 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Show a system tray icon</source> <source>Show a system tray icon</source>
<translation>Tampilkan sebuah ikon baki sistem</translation> <translation>Tampilkan ikon baki sistem</translation>
</message> </message>
<message> <message>
<source>Hide window to system tray when minimized</source> <source>Hide window to system tray when minimized</source>
<translation>Sembunyikan jendela ke baki sistem ketika dikecilkan</translation> <translation>Sembunyikan jendela ke baki sistem ketika diminimalkan</translation>
</message>
<message>
<source>Remember last key files</source>
<translation>Ingat berkas kunci terakhir</translation>
</message> </message>
</context> </context>
<context> <context>
<name>SettingsWidgetSecurity</name> <name>SettingsWidgetSecurity</name>
<message> <message>
<source>Clear clipboard after</source> <source>Clear clipboard after</source>
<translation>Bersihkan papan klip setelaj</translation> <translation>Kosongkan papan klip setelah</translation>
</message> </message>
<message> <message>
<source> sec</source> <source> sec</source>
@ -1146,56 +1254,44 @@ Simpan perubahan?</translation>
</message> </message>
<message> <message>
<source>Lock databases after inactivity of</source> <source>Lock databases after inactivity of</source>
<translation type="unfinished"/> <translation>Kunci basis data setelah tidak aktif selama</translation>
</message> </message>
<message> <message>
<source>Show passwords in cleartext by default</source> <source>Show passwords in cleartext by default</source>
<translation type="unfinished"/> <translation>Tampilkan teks sandi secara baku</translation>
</message> </message>
<message> <message>
<source>Always ask before performing auto-type</source> <source>Always ask before performing auto-type</source>
<translation type="unfinished"/> <translation>Selalu tanya sebelum melakukan ketik-otomatis</translation>
</message> </message>
</context> </context>
<context> <context>
<name>UnlockDatabaseWidget</name> <name>UnlockDatabaseWidget</name>
<message> <message>
<source>Unlock database</source> <source>Unlock database</source>
<translation type="unfinished"/> <translation>Buka kunci basis data</translation>
</message>
<message>
<source>Error</source>
<translation>Galat</translation>
</message>
<message>
<source>Wrong key.</source>
<translation>Kunci salah.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>WelcomeWidget</name> <name>WelcomeWidget</name>
<message> <message>
<source>Welcome!</source> <source>Welcome!</source>
<translation>Selamat Datang.</translation> <translation>Selamat datang!</translation>
</message> </message>
</context> </context>
<context> <context>
<name>main</name> <name>main</name>
<message> <message>
<source>KeePassX - cross-platform password manager</source> <source>KeePassX - cross-platform password manager</source>
<translation>KeePassX - manajer kata sandi cross-platform</translation> <translation>KeePassX - pengelola sandi lintas platform</translation>
</message> </message>
<message> <message>
<source>filename of the password database to open (*.kdbx)</source> <source>filename of the password database to open (*.kdbx)</source>
<translation>nama berkasi dari basis data kata sandi untuk dibuka (*.kdbx)</translation> <translation>nama berkas dari basis data sandi untuk dibuka (*.kdbx)</translation>
</message> </message>
<message> <message>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation type="unfinished"/> <translation>jalur ke berkas konfig ubahsuai</translation>
</message>
<message>
<source>password of the database (DANGEROUS!)</source>
<translation>kata sandi dari basis data (BERBAHAYA!)</translation>
</message> </message>
<message> <message>
<source>key file of the database</source> <source>key file of the database</source>

420
share/translations/keepassx_it.ts
View File

@ -3,12 +3,19 @@
<name>AboutDialog</name> <name>AboutDialog</name>
<message> <message>
<source>About KeePassX</source> <source>About KeePassX</source>
<translation>A proposito di KeePassX</translation> <translation>Informazioni su KeePassX</translation>
</message> </message>
<message> <message>
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation>KeePassX è distribuito sotto i termini della licenza <translation>KeePassX è distribuito sotto i termini della licenza GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</translation>
GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</translation> </message>
<message>
<source>Revision</source>
<translation>Revisione</translation>
</message>
<message>
<source>Using:</source>
<translation>In uso:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -18,7 +25,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
<translation>Auto-Type - KeePassX</translation> <translation>Auto-Type - KeePassX</translation>
</message> </message>
<message> <message>
<source>Couldn&apos;t find an entry that matches the window title.</source> <source>Couldn&apos;t find an entry that matches the window title:</source>
<translation>Impossibile trovare una voce che corrisponda al titolo della finestra</translation> <translation>Impossibile trovare una voce che corrisponda al titolo della finestra</translation>
</message> </message>
</context> </context>
@ -45,7 +52,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
</message> </message>
<message> <message>
<source>Select entry to Auto-Type:</source> <source>Select entry to Auto-Type:</source>
<translation>Selezionare una voce per Auto-Type:</translation> <translation>Seleziona una voce per Auto-Type:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -56,11 +63,11 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
</message> </message>
<message> <message>
<source>Enter password:</source> <source>Enter password:</source>
<translation>Inserire password:</translation> <translation>Inserisci password:</translation>
</message> </message>
<message> <message>
<source>Repeat password:</source> <source>Repeat password:</source>
<translation>Ripetere password:</translation> <translation>Ripeti password:</translation>
</message> </message>
<message> <message>
<source>Key file</source> <source>Key file</source>
@ -68,11 +75,11 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
</message> </message>
<message> <message>
<source>Browse</source> <source>Browse</source>
<translation>Sfogliare</translation> <translation>Sfoglia</translation>
</message> </message>
<message> <message>
<source>Create</source> <source>Create</source>
<translation>Creare</translation> <translation>Crea</translation>
</message> </message>
<message> <message>
<source>Key files</source> <source>Key files</source>
@ -84,7 +91,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
</message> </message>
<message> <message>
<source>Create Key File...</source> <source>Create Key File...</source>
<translation>Creare file chiave...</translation> <translation>Crea file chiave...</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -96,7 +103,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
</message> </message>
<message> <message>
<source>Select a key file</source> <source>Select a key file</source>
<translation>Selezionare file chiave</translation> <translation>Seleziona il file chiave</translation>
</message> </message>
<message> <message>
<source>Question</source> <source>Question</source>
@ -110,16 +117,26 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Sono state fornite password differenti.</translation> <translation>Sono state fornite password differenti.</translation>
</message> </message>
<message>
<source>Failed to set key file</source>
<translation>Impossibile impostare il file chiave</translation>
</message>
<message>
<source>Failed to set %1 as the Key file:
%2</source>
<translation>Impossibile impostare %1 come file chiave:
%2</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseOpenWidget</name> <name>DatabaseOpenWidget</name>
<message> <message>
<source>Enter master key</source> <source>Enter master key</source>
<translation>Inserire password</translation> <translation>Inserisci la chiave principale</translation>
</message> </message>
<message> <message>
<source>Key File:</source> <source>Key File:</source>
<translation>File Chiave:</translation> <translation>File chiave:</translation>
</message> </message>
<message> <message>
<source>Password:</source> <source>Password:</source>
@ -127,7 +144,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
</message> </message>
<message> <message>
<source>Browse</source> <source>Browse</source>
<translation>Sfogliare</translation> <translation>Sfoglia</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -151,18 +168,18 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
</message> </message>
<message> <message>
<source>Select key file</source> <source>Select key file</source>
<translation>Selezionare file chiave</translation> <translation>Seleziona file chiave</translation>
</message> </message>
</context> </context>
<context> <context>
<name>DatabaseSettingsWidget</name> <name>DatabaseSettingsWidget</name>
<message> <message>
<source>Database name:</source> <source>Database name:</source>
<translation>Nome database:</translation> <translation>Nome del database:</translation>
</message> </message>
<message> <message>
<source>Database description:</source> <source>Database description:</source>
<translation>Descrizione database:</translation> <translation>Descrizione del database:</translation>
</message> </message>
<message> <message>
<source>Transform rounds:</source> <source>Transform rounds:</source>
@ -174,7 +191,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
</message> </message>
<message> <message>
<source>Use recycle bin:</source> <source>Use recycle bin:</source>
<translation>Utilizzare cestino:</translation> <translation>Utilizza cestino:</translation>
</message> </message>
<message> <message>
<source> MiB</source> <source> MiB</source>
@ -182,7 +199,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
</message> </message>
<message> <message>
<source>Benchmark</source> <source>Benchmark</source>
<translation>Benchmark</translation> <translation>Prestazione</translation>
</message> </message>
<message> <message>
<source>Max. history items:</source> <source>Max. history items:</source>
@ -209,7 +226,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
</message> </message>
<message> <message>
<source>Open database</source> <source>Open database</source>
<translation>Aprire database</translation> <translation>Apri database</translation>
</message> </message>
<message> <message>
<source>Warning</source> <source>Warning</source>
@ -221,7 +238,7 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
</message> </message>
<message> <message>
<source>Open KeePass 1 database</source> <source>Open KeePass 1 database</source>
<translation>Aprire database KeePass 1</translation> <translation>Apri database KeePass 1</translation>
</message> </message>
<message> <message>
<source>KeePass 1 database</source> <source>KeePass 1 database</source>
@ -235,12 +252,6 @@ GNU General Public License (GPL) versione 2 o, a tua scelta, della versione 3.</
<source>Close?</source> <source>Close?</source>
<translation>Chiudere?</translation> <translation>Chiudere?</translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation>&quot;%1&quot; è in modalità modifica.
Chiudere comunque?</translation>
</message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
<translation>Salvare modifiche?</translation> <translation>Salvare modifiche?</translation>
@ -248,7 +259,7 @@ Chiudere comunque?</translation>
<message> <message>
<source>&quot;%1&quot; was modified. <source>&quot;%1&quot; was modified.
Save changes?</source> Save changes?</source>
<translation>&quot;%1&quot; è stata modificata. <translation>&quot;%1&quot; è stata modificato.
Salvare le modifiche?</translation> Salvare le modifiche?</translation>
</message> </message>
<message> <message>
@ -257,11 +268,11 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Writing the database failed.</source> <source>Writing the database failed.</source>
<translation>Scrittura del database fallita.</translation> <translation>Scrittura del database non riuscita.</translation>
</message> </message>
<message> <message>
<source>Save database as</source> <source>Save database as</source>
<translation>Salvare database come</translation> <translation>Salva database come</translation>
</message> </message>
<message> <message>
<source>New database</source> <source>New database</source>
@ -271,12 +282,66 @@ Salvare le modifiche?</translation>
<source>locked</source> <source>locked</source>
<translation>bloccato</translation> <translation>bloccato</translation>
</message> </message>
<message>
<source>The database you are trying to open is locked by another instance of KeePassX.
Do you want to open it anyway? Alternatively the database is opened read-only.</source>
<translation>Il database che stai tentando di aprire è bloccato da un&apos;altra istanza di KeePassX.
Vuoi aprirlo comunque? Altrimenti il database verrà aperto in sola lettura.</translation>
</message>
<message>
<source>Lock database</source>
<translation>Blocca database</translation>
</message>
<message>
<source>Can't lock the database as you are currently editing it.
Please press cancel to finish your changes or discard them.</source>
<translation>Non è possibile bloccare il database dato che lo stai modificando.
Premere Annulla per completare le modifiche o scartarle.</translation>
</message>
<message>
<source>This database has never been saved.
You can save the database or stop locking it.</source>
<translation>Questo database non è mai stato salvato.
È possibile salvare il database o interrompere il blocco.</translation>
</message>
<message>
<source>This database has been modified.
Do you want to save the database before locking it?
Otherwise your changes are lost.</source>
<translation>Questo database è stato modificato.
Vuoi salvare il database prima di bloccarlo?
Altrimenti le modifiche verranno perse.</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation>&quot;%1&quot; è in modalità modifica.
Annullare le modifiche e chiudere comunque?</translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation>Esporta il database come file CSV</translation>
</message>
<message>
<source>CSV file</source>
<translation>file CSV</translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation>Scrittura del file CSV non riuscita.</translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassX.
Do you want to save it anyway?</source>
<translation>Il database che stai tentando di salvare è bloccato da un&apos;altra istanza di KeePassX.
Vuoi salvare comunque?</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
<message> <message>
<source>Change master key</source> <source>Change master key</source>
<translation>Cambiare password principale</translation> <translation>Cambia chiave principale</translation>
</message> </message>
<message> <message>
<source>Delete entry?</source> <source>Delete entry?</source>
@ -314,6 +379,14 @@ Salvare le modifiche?</translation>
<source>Current group</source> <source>Current group</source>
<translation>Gruppo corrente</translation> <translation>Gruppo corrente</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Impossibile calcolare la chiave principale</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidget</name> <name>EditEntryWidget</name>
@ -367,7 +440,7 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Select file</source> <source>Select file</source>
<translation>Selezionare file</translation> <translation>Seleziona file</translation>
</message> </message>
<message> <message>
<source>Unable to open file</source> <source>Unable to open file</source>
@ -380,7 +453,7 @@ Salvare le modifiche?</translation>
<message> <message>
<source>Unable to save the attachment: <source>Unable to save the attachment:
</source> </source>
<translation>Impossibile salvare l&apos;allegato <translation>Impossibile salvare l&apos;allegato:
</translation> </translation>
</message> </message>
<message> <message>
@ -389,15 +462,15 @@ Salvare le modifiche?</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>%n week(s)</source> <source>%n week(s)</source>
<translation><numerusform>%n settimana(e)</numerusform><numerusform>%n settimana(e)</numerusform></translation> <translation><numerusform>%n settimana</numerusform><numerusform>%n settimane</numerusform></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>%n month(s)</source> <source>%n month(s)</source>
<translation><numerusform>%n mese(i)</numerusform><numerusform>%n mese(i)</numerusform></translation> <translation><numerusform>%n mese</numerusform><numerusform>%n mesi</numerusform></translation>
</message> </message>
<message> <message>
<source>1 year</source> <source>1 year</source>
<translation>1 anno</translation> <translation>Un anno</translation>
</message> </message>
</context> </context>
<context> <context>
@ -408,15 +481,15 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Add</source> <source>Add</source>
<translation>Aggiungere</translation> <translation>Aggiungi</translation>
</message> </message>
<message> <message>
<source>Edit</source> <source>Edit</source>
<translation>Modificare</translation> <translation>Modifica</translation>
</message> </message>
<message> <message>
<source>Remove</source> <source>Remove</source>
<translation>Rimuovere</translation> <translation>Rimuovi</translation>
</message> </message>
<message> <message>
<source>Attachments</source> <source>Attachments</source>
@ -424,22 +497,26 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Save</source> <source>Save</source>
<translation>Salvare</translation> <translation>Salva</translation>
</message>
<message>
<source>Open</source>
<translation>Apri</translation>
</message> </message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAutoType</name> <name>EditEntryWidgetAutoType</name>
<message> <message>
<source>Enable Auto-Type for this entry</source> <source>Enable Auto-Type for this entry</source>
<translation>Abilitare Auto-Type per questa voce</translation> <translation>Abilita Auto-Type per questa voce</translation>
</message> </message>
<message> <message>
<source>Inherit default Auto-Type sequence from the group</source> <source>Inherit default Auto-Type sequence from the group</source>
<translation>Ereditare la sequenza predefinita di Auto-Type dal gruppo</translation> <translation>Eredita la sequenza predefinita di Auto-Type dal gruppo</translation>
</message> </message>
<message> <message>
<source>Use custom Auto-Type sequence:</source> <source>Use custom Auto-Type sequence:</source>
<translation>Usare sequenza personalizzata di Auto-Type:</translation> <translation>Usa sequenza personalizzata di Auto-Type:</translation>
</message> </message>
<message> <message>
<source>+</source> <source>+</source>
@ -455,30 +532,30 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Use default sequence</source> <source>Use default sequence</source>
<translation>Usare sequenza predefinita</translation> <translation>Usa sequenza predefinita</translation>
</message> </message>
<message> <message>
<source>Set custom sequence:</source> <source>Set custom sequence:</source>
<translation>Impostare sequenza personalizzata:</translation> <translation>Imposta sequenza personalizzata:</translation>
</message> </message>
</context> </context>
<context> <context>
<name>EditEntryWidgetHistory</name> <name>EditEntryWidgetHistory</name>
<message> <message>
<source>Show</source> <source>Show</source>
<translation>Mostrare</translation> <translation>Mostra</translation>
</message> </message>
<message> <message>
<source>Restore</source> <source>Restore</source>
<translation>Ripristinare</translation> <translation>Ripristina</translation>
</message> </message>
<message> <message>
<source>Delete</source> <source>Delete</source>
<translation>Eliminare</translation> <translation>Elimina</translation>
</message> </message>
<message> <message>
<source>Delete all</source> <source>Delete all</source>
<translation>Eliminare tutti</translation> <translation>Elimina tutti</translation>
</message> </message>
</context> </context>
<context> <context>
@ -497,7 +574,7 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Repeat:</source> <source>Repeat:</source>
<translation>Ripetere:</translation> <translation>Ripeti:</translation>
</message> </message>
<message> <message>
<source>Gen.</source> <source>Gen.</source>
@ -513,7 +590,7 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Presets</source> <source>Presets</source>
<translation>Programmare</translation> <translation>Preimpostazioni</translation>
</message> </message>
<message> <message>
<source>Notes:</source> <source>Notes:</source>
@ -536,23 +613,23 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Add group</source> <source>Add group</source>
<translation>Aggiungere gruppo</translation> <translation>Aggiungi gruppo</translation>
</message> </message>
<message> <message>
<source>Edit group</source> <source>Edit group</source>
<translation>Modificare gruppo</translation> <translation>Modifica gruppo</translation>
</message> </message>
<message> <message>
<source>Enable</source> <source>Enable</source>
<translation>Abilitare</translation> <translation>Abilita</translation>
</message> </message>
<message> <message>
<source>Disable</source> <source>Disable</source>
<translation>Disabilitare</translation> <translation>Disabilita</translation>
</message> </message>
<message> <message>
<source>Inherit from parent group (%1)</source> <source>Inherit from parent group (%1)</source>
<translation>Ereditare dal gruppo genitore (%1)</translation> <translation>Eredita dal gruppo genitore (%1)</translation>
</message> </message>
</context> </context>
<context> <context>
@ -571,30 +648,38 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Search</source> <source>Search</source>
<translation>Cercare</translation> <translation>Cerca</translation>
</message> </message>
<message> <message>
<source>Auto-type</source> <source>Auto-type</source>
<translation>Auto-Type</translation> <translation>Auto-Type</translation>
</message> </message>
<message>
<source>Use default auto-type sequence of parent group</source>
<translation>Eredita la sequenza predefinita di auto-type dal gruppo</translation>
</message>
<message>
<source>Set default auto-type sequence</source>
<translation>Usa sequenza di auto-type predefinita</translation>
</message>
</context> </context>
<context> <context>
<name>EditWidgetIcons</name> <name>EditWidgetIcons</name>
<message> <message>
<source>Use default icon</source> <source>Use default icon</source>
<translation>Usare icona predefinita</translation> <translation>Usa icona predefinita</translation>
</message> </message>
<message> <message>
<source>Use custom icon</source> <source>Use custom icon</source>
<translation>Usare icona personalizzata</translation> <translation>Usa icona personalizzata</translation>
</message> </message>
<message> <message>
<source>Add custom icon</source> <source>Add custom icon</source>
<translation>Aggiungere icona personalizzata</translation> <translation>Aggiungi icona personalizzata</translation>
</message> </message>
<message> <message>
<source>Delete custom icon</source> <source>Delete custom icon</source>
<translation>Rimuovere icona personalizzata</translation> <translation>Rimuovi icona personalizzata</translation>
</message> </message>
<message> <message>
<source>Images</source> <source>Images</source>
@ -606,26 +691,26 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Select Image</source> <source>Select Image</source>
<translation>Selezionare Immagine</translation> <translation>Seleziona immagine</translation>
</message> </message>
<message> <message>
<source>Can&apos;t delete icon!</source> <source>Can&apos;t delete icon!</source>
<translation>Impossibile eliminare icona!</translation> <translation>Impossibile eliminare l&apos;icona!</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>Can&apos;t delete icon. Still used by %n item(s).</source> <source>Can&apos;t delete icon. Still used by %n item(s).</source>
<translation><numerusform>Impossibile eliminare l&apos;icona in quanto è in uso da %n voce(i).</numerusform><numerusform>Impossibile eliminare l&apos;icona in quanto è in uso da %n voce(i).</numerusform></translation> <translation><numerusform>Impossibile eliminare l&apos;icona in quanto è in uso da %n voce.</numerusform><numerusform>Impossibile eliminare l&apos;icona in quanto è in uso da %n voci.</numerusform></translation>
</message> </message>
</context> </context>
<context> <context>
<name>EditWidgetProperties</name> <name>EditWidgetProperties</name>
<message> <message>
<source>Created:</source> <source>Created:</source>
<translation>Creato:</translation> <translation>Creazione:</translation>
</message> </message>
<message> <message>
<source>Modified:</source> <source>Modified:</source>
<translation>Modificato:</translation> <translation>Modifica:</translation>
</message> </message>
<message> <message>
<source>Accessed:</source> <source>Accessed:</source>
@ -633,7 +718,7 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Uuid:</source> <source>Uuid:</source>
<translation>Uuid:</translation> <translation>UUID:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -674,7 +759,7 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Username</source> <source>Username</source>
<translation>Nome Utente</translation> <translation>Nome utente</translation>
</message> </message>
<message> <message>
<source>URL</source> <source>URL</source>
@ -685,14 +770,14 @@ Salvare le modifiche?</translation>
<name>Group</name> <name>Group</name>
<message> <message>
<source>Recycle Bin</source> <source>Recycle Bin</source>
<translation>Cestino (Gruppo)</translation> <translation>Cestino</translation>
</message> </message>
</context> </context>
<context> <context>
<name>KeePass1OpenWidget</name> <name>KeePass1OpenWidget</name>
<message> <message>
<source>Import KeePass1 database</source> <source>Import KeePass1 database</source>
<translation>Importare database KeePass1</translation> <translation>Importa database KeePass1</translation>
</message> </message>
<message> <message>
<source>Error</source> <source>Error</source>
@ -707,7 +792,7 @@ Salvare le modifiche?</translation>
<name>KeePass1Reader</name> <name>KeePass1Reader</name>
<message> <message>
<source>Unable to read keyfile.</source> <source>Unable to read keyfile.</source>
<translation>Impossibile leggere il file chiave.</translation> <translation>Impossibile leggere il file della chiave.</translation>
</message> </message>
<message> <message>
<source>Not a KeePass database.</source> <source>Not a KeePass database.</source>
@ -719,11 +804,15 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Unsupported KeePass database version.</source> <source>Unsupported KeePass database version.</source>
<translation>Versione database non supportata</translation> <translation>Versione database KeePass non supportata.</translation>
</message> </message>
<message> <message>
<source>Root</source> <source>Root</source>
<translation>Root (KeePass1Reader)</translation> <translation>Root</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Impossibile calcolare la chiave principale</translation>
</message> </message>
</context> </context>
<context> <context>
@ -734,11 +823,36 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Unsupported KeePass database version.</source> <source>Unsupported KeePass database version.</source>
<translation>Versione database non supportata</translation> <translation>Versione database KeePass non supportata.</translation>
</message> </message>
<message> <message>
<source>Wrong key or database file is corrupt.</source> <source>Wrong key or database file is corrupt.</source>
<translation>Password errata o database corrotto.</translation> <translation>Chiave errata o file del database danneggiato.</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Impossibile calcolare la chiave principale</translation>
</message>
<message>
<source>The selected file is an old KeePass 1 database (.kdb).
You can import it by clicking on Database &gt; 'Import KeePass 1 database'.
This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
<translation>Il file selezionato è un vecchio database KeePass 1 (.kdb).
Puoi importarlo facendo clic su Database &gt; &apos;Importa database KeePass 1&apos;.
Questa è una migrazione in una sola direzione. Non potrai aprire il database importato con la vecchia versione 0.4 di KeePassX. </translation>
</message>
</context>
<context>
<name>Main</name>
<message>
<source>Fatal error while testing the cryptographic functions.</source>
<translation>Errore fatale durante il test delle funzioni di crittografia.</translation>
</message>
<message>
<source>KeePassX - Error</source>
<translation>KeePassx - Errore</translation>
</message> </message>
</context> </context>
<context> <context>
@ -761,39 +875,35 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Copy attribute to clipboard</source> <source>Copy attribute to clipboard</source>
<translation>Copiare attributi negli appunti</translation> <translation>Copia attributi negli appunti</translation>
</message> </message>
<message> <message>
<source>Groups</source> <source>Groups</source>
<translation>Gruppi</translation> <translation>Gruppi</translation>
</message> </message>
<message>
<source>Extras</source>
<translation>Extra</translation>
</message>
<message> <message>
<source>View</source> <source>View</source>
<translation>Visualizzare</translation> <translation>Visualizza</translation>
</message> </message>
<message> <message>
<source>Quit</source> <source>Quit</source>
<translation>Uscire</translation> <translation>Esci</translation>
</message> </message>
<message> <message>
<source>About</source> <source>About</source>
<translation>A Proposito</translation> <translation>Informazioni</translation>
</message> </message>
<message> <message>
<source>Open database</source> <source>Open database</source>
<translation>Aprire database</translation> <translation>Apri database</translation>
</message> </message>
<message> <message>
<source>Save database</source> <source>Save database</source>
<translation>Salvare database</translation> <translation>Salva database</translation>
</message> </message>
<message> <message>
<source>Close database</source> <source>Close database</source>
<translation>Chiudere database</translation> <translation>Chiudi database</translation>
</message> </message>
<message> <message>
<source>New database</source> <source>New database</source>
@ -801,35 +911,35 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Add new entry</source> <source>Add new entry</source>
<translation>Aggiungere nuova voce</translation> <translation>Aggiungi nuova voce</translation>
</message> </message>
<message> <message>
<source>View/Edit entry</source> <source>View/Edit entry</source>
<translation>Visualizzare/Modificare voce</translation> <translation>Visualizza/modifica voce</translation>
</message> </message>
<message> <message>
<source>Delete entry</source> <source>Delete entry</source>
<translation>Eliminare voce</translation> <translation>Elimina voce</translation>
</message> </message>
<message> <message>
<source>Add new group</source> <source>Add new group</source>
<translation>Aggiungere nuovo gruppo</translation> <translation>Aggiungi nuovo gruppo</translation>
</message> </message>
<message> <message>
<source>Edit group</source> <source>Edit group</source>
<translation>Modificare gruppo</translation> <translation>Modifica gruppo</translation>
</message> </message>
<message> <message>
<source>Delete group</source> <source>Delete group</source>
<translation>Eliminare gruppo</translation> <translation>Elimina gruppo</translation>
</message> </message>
<message> <message>
<source>Save database as</source> <source>Save database as</source>
<translation>Salvare database come</translation> <translation>Salva database come</translation>
</message> </message>
<message> <message>
<source>Change master key</source> <source>Change master key</source>
<translation>Cambiare password principale</translation> <translation>Cambia chiave principale</translation>
</message> </message>
<message> <message>
<source>Database settings</source> <source>Database settings</source>
@ -837,7 +947,7 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Import KeePass 1 database</source> <source>Import KeePass 1 database</source>
<translation>Importare database KeePass 1</translation> <translation>Importa database KeePass 1</translation>
</message> </message>
<message> <message>
<source>Clone entry</source> <source>Clone entry</source>
@ -845,23 +955,15 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Find</source> <source>Find</source>
<translation>Trovare</translation> <translation>Trova</translation>
</message>
<message>
<source>Username</source>
<translation>Nome Utente</translation>
</message> </message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation>Copiare nome utente negli appunti</translation> <translation>Copia nome utente negli appunti</translation>
</message>
<message>
<source>Password</source>
<translation>Password</translation>
</message> </message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation>Copiare password negli appunti</translation> <translation>Copia password negli appunti</translation>
</message> </message>
<message> <message>
<source>Settings</source> <source>Settings</source>
@ -869,15 +971,15 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Perform Auto-Type</source> <source>Perform Auto-Type</source>
<translation>Eseguire Auto-Type</translation> <translation>Esegui Auto-Type</translation>
</message> </message>
<message> <message>
<source>Open URL</source> <source>Open URL</source>
<translation>Aprire URL</translation> <translation>Apri URL</translation>
</message> </message>
<message> <message>
<source>Lock databases</source> <source>Lock databases</source>
<translation>Bloccare database</translation> <translation>Blocca database</translation>
</message> </message>
<message> <message>
<source>Title</source> <source>Title</source>
@ -893,12 +995,32 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Show toolbar</source> <source>Show toolbar</source>
<translation>Mostrare barra degli strumenti</translation> <translation>Mostra barra degli strumenti</translation>
</message> </message>
<message> <message>
<source>read-only</source> <source>read-only</source>
<translation>sola lettura</translation> <translation>sola lettura</translation>
</message> </message>
<message>
<source>Toggle window</source>
<translation>Cambia finestra</translation>
</message>
<message>
<source>Tools</source>
<translation>Strumenti</translation>
</message>
<message>
<source>Copy username</source>
<translation>Copia nome utente</translation>
</message>
<message>
<source>Copy password</source>
<translation>Copia password</translation>
</message>
<message>
<source>Export to CSV file</source>
<translation>Esporta in un file CSV</translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
@ -932,26 +1054,26 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Exclude look-alike characters</source> <source>Exclude look-alike characters</source>
<translation>Escludere caratteri simili</translation> <translation>Escludi caratteri simili</translation>
</message> </message>
<message> <message>
<source>Ensure that the password contains characters from every group</source> <source>Ensure that the password contains characters from every group</source>
<translation>Assicurare che la password contenga caratteri di ogni gruppo</translation> <translation>Verifica che la password contenga caratteri di ogni gruppo</translation>
</message> </message>
<message> <message>
<source>Accept</source> <source>Accept</source>
<translation>Accettare</translation> <translation>Accetta</translation>
</message> </message>
</context> </context>
<context> <context>
<name>QCommandLineParser</name> <name>QCommandLineParser</name>
<message> <message>
<source>Displays version information.</source> <source>Displays version information.</source>
<translation>Mostrare informazioni sulla versione.</translation> <translation>Mostra informazioni sulla versione.</translation>
</message> </message>
<message> <message>
<source>Displays this help.</source> <source>Displays this help.</source>
<translation>Mostrare questo aiuto.</translation> <translation>Mostra questo aiuto.</translation>
</message> </message>
<message> <message>
<source>Unknown option &apos;%1&apos;.</source> <source>Unknown option &apos;%1&apos;.</source>
@ -994,7 +1116,7 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Writing canceled by application</source> <source>Writing canceled by application</source>
<translation>Scrittura cancellata dall&apos;applicazione</translation> <translation>Scrittura annullata dall&apos;applicazione</translation>
</message> </message>
<message> <message>
<source>Partial write. Partition full?</source> <source>Partial write. Partition full?</source>
@ -1039,11 +1161,11 @@ Salvare le modifiche?</translation>
<name>SearchWidget</name> <name>SearchWidget</name>
<message> <message>
<source>Find:</source> <source>Find:</source>
<translation>Trovare:</translation> <translation>Trova:</translation>
</message> </message>
<message> <message>
<source>Case sensitive</source> <source>Case sensitive</source>
<translation>Case sensitive</translation> <translation>Riconoscimento di maiuscole e minuscole</translation>
</message> </message>
<message> <message>
<source>Current group</source> <source>Current group</source>
@ -1073,31 +1195,27 @@ Salvare le modifiche?</translation>
<name>SettingsWidgetGeneral</name> <name>SettingsWidgetGeneral</name>
<message> <message>
<source>Remember last databases</source> <source>Remember last databases</source>
<translation>Ricordare ultimo database</translation> <translation>Ricorda ultimo database</translation>
</message> </message>
<message> <message>
<source>Open previous databases on startup</source> <source>Open previous databases on startup</source>
<translation>Aprire precedente database all&apos;avvio</translation> <translation>Apri il database precedente all&apos;avvio</translation>
</message>
<message>
<source>Mark as modified on expanded state changes</source>
<translation>Marcare come modificata quando la voce viene espansa</translation>
</message> </message>
<message> <message>
<source>Automatically save on exit</source> <source>Automatically save on exit</source>
<translation>Salvare automaticamente all&apos;uscita</translation> <translation>Salva automaticamente all&apos;uscita</translation>
</message> </message>
<message> <message>
<source>Automatically save after every change</source> <source>Automatically save after every change</source>
<translation>Salvare automaticamente dopo ogni modifica</translation> <translation>Salva automaticamente dopo ogni modifica</translation>
</message> </message>
<message> <message>
<source>Minimize when copying to clipboard</source> <source>Minimize when copying to clipboard</source>
<translation>Minimizzare quando si copia negli appunti</translation> <translation>Minimizza quando si copia negli appunti</translation>
</message> </message>
<message> <message>
<source>Use group icon on entry creation</source> <source>Use group icon on entry creation</source>
<translation>Usare l&apos;icona del gruppo alla creazione di una voce</translation> <translation>Usa l&apos;icona del gruppo alla creazione di una voce</translation>
</message> </message>
<message> <message>
<source>Global Auto-Type shortcut</source> <source>Global Auto-Type shortcut</source>
@ -1105,14 +1223,30 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Use entry title to match windows for global auto-type</source> <source>Use entry title to match windows for global auto-type</source>
<translation>Utilizzare il titolo della voce per abbinare la finestra per auto-type globale</translation> <translation>Utilizza il titolo della voce per abbinare la finestra per auto-type globale</translation>
</message>
<message>
<source>Language</source>
<translation>Lingua</translation>
</message>
<message>
<source>Show a system tray icon</source>
<translation>Mostra un&apos;icona nell&apos;area di notifica del sistema</translation>
</message>
<message>
<source>Hide window to system tray when minimized</source>
<translation>Nascondi la finestra nell&apos;area di notifica del sistema quando viene minimizzata</translation>
</message>
<message>
<source>Remember last key files</source>
<translation>Ricorda gli ultimi file di chiavi</translation>
</message> </message>
</context> </context>
<context> <context>
<name>SettingsWidgetSecurity</name> <name>SettingsWidgetSecurity</name>
<message> <message>
<source>Clear clipboard after</source> <source>Clear clipboard after</source>
<translation>Pulire appunti dopo</translation> <translation>Pulisci appunti dopo</translation>
</message> </message>
<message> <message>
<source> sec</source> <source> sec</source>
@ -1120,57 +1254,45 @@ Salvare le modifiche?</translation>
</message> </message>
<message> <message>
<source>Lock databases after inactivity of</source> <source>Lock databases after inactivity of</source>
<translation>Bloccare database dopo un&apos;inattività di</translation> <translation>Blocca i database dopo un&apos;inattività di</translation>
</message> </message>
<message> <message>
<source>Show passwords in cleartext by default</source> <source>Show passwords in cleartext by default</source>
<translation>Mostrare la password in chiaro in maniera predefinita</translation> <translation>Mostra la password in chiaro in maniera predefinita</translation>
</message> </message>
<message> <message>
<source>Always ask before performing auto-type</source> <source>Always ask before performing auto-type</source>
<translation>Chiedere sempre prima di eseguire auto-type</translation> <translation>Chiedi sempre prima di eseguire auto-type</translation>
</message> </message>
</context> </context>
<context> <context>
<name>UnlockDatabaseWidget</name> <name>UnlockDatabaseWidget</name>
<message> <message>
<source>Unlock database</source> <source>Unlock database</source>
<translation>Sbloccare database</translation> <translation>Sblocca database</translation>
</message>
<message>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
<source>Wrong key.</source>
<translation>Password errata.</translation>
</message> </message>
</context> </context>
<context> <context>
<name>WelcomeWidget</name> <name>WelcomeWidget</name>
<message> <message>
<source>Welcome!</source> <source>Welcome!</source>
<translation>Benvenuto/a!</translation> <translation>Benvenuto!</translation>
</message> </message>
</context> </context>
<context> <context>
<name>main</name> <name>main</name>
<message> <message>
<source>KeePassX - cross-platform password manager</source> <source>KeePassX - cross-platform password manager</source>
<translation>KeePassX - gestore di password cross-platform</translation> <translation>KeePassX - gestore di password multipiattafroma</translation>
</message> </message>
<message> <message>
<source>filename of the password database to open (*.kdbx)</source> <source>filename of the password database to open (*.kdbx)</source>
<translation>nome del file del database da aprire (*.kdbx)</translation> <translation>nome del file di database da aprire (*.kdbx)</translation>
</message> </message>
<message> <message>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation>percorso ad un file di configurazione personalizzato</translation> <translation>percorso ad un file di configurazione personalizzato</translation>
</message> </message>
<message>
<source>password of the database (DANGEROUS!)</source>
<translation>password del database (PERICOLOSO!)</translation>
</message>
<message> <message>
<source>key file of the database</source> <source>key file of the database</source>
<translation>file chiave del database</translation> <translation>file chiave del database</translation>

1275
share/translations/keepassx_ja.ts Normal file
View File

File diff suppressed because it is too large Load Diff

1284
share/translations/keepassx_ko.ts Normal file
View File

File diff suppressed because it is too large Load Diff

1287
share/translations/keepassx_lt.ts Normal file
View File

File diff suppressed because it is too large Load Diff

150
share/translations/keepassx_nl_NL.ts
View File

@ -9,6 +9,10 @@
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation>KeePassX wordt verspreid onder de bepalingen van de GNU General Public License (GPL) versie 2 of (als u wenst) versie 3.</translation> <translation>KeePassX wordt verspreid onder de bepalingen van de GNU General Public License (GPL) versie 2 of (als u wenst) versie 3.</translation>
</message> </message>
<message>
<source>Revision</source>
<translation>Revisie</translation>
</message>
</context> </context>
<context> <context>
<name>AutoType</name> <name>AutoType</name>
@ -109,6 +113,16 @@
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Verschillende wachtwoorden opgegeven.</translation> <translation>Verschillende wachtwoorden opgegeven.</translation>
</message> </message>
<message>
<source>Failed to set key file</source>
<translation>Niet gelukt het sleutelbestand in te stellen</translation>
</message>
<message>
<source>Failed to set %1 as the Key file:
%2</source>
<translation>Niet gelukt %1 als sleutelbestand in te stellen:
%2</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseOpenWidget</name> <name>DatabaseOpenWidget</name>
@ -234,12 +248,6 @@
<source>Close?</source> <source>Close?</source>
<translation>Sluiten?</translation> <translation>Sluiten?</translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation>&quot;%1&quot; is in bewerkmodus.
Toch sluiten?</translation>
</message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
<translation>Wijzigingen opslaan?</translation> <translation>Wijzigingen opslaan?</translation>
@ -270,6 +278,60 @@ Opslaan?</translation>
<source>locked</source> <source>locked</source>
<translation>vergrendeld</translation> <translation>vergrendeld</translation>
</message> </message>
<message>
<source>The database you are trying to open is locked by another instance of KeePassX.
Do you want to open it anyway? Alternatively the database is opened read-only.</source>
<translation>De database die u probeert te openen is vergrendeld door een andere instantie van KeePassX.
Wilt u toch doorgaan met openen? U kunt de database ook alleen-lezen openen.</translation>
</message>
<message>
<source>Lock database</source>
<translation>Database vergrendelen</translation>
</message>
<message>
<source>Can't lock the database as you are currently editing it.
Please press cancel to finish your changes or discard them.</source>
<translation>Kan de database niet vergrendelen omdat u deze momenteel aan het bewerken bent.
Druk op annuleren om uw wijzigingen aan te passen of gooi de wijzigingen weg.</translation>
</message>
<message>
<source>This database has never been saved.
You can save the database or stop locking it.</source>
<translation>Deze database is nog niet opgeslagen.
U kunt de database opslaan of het vergrendelen annuleren.</translation>
</message>
<message>
<source>This database has been modified.
Do you want to save the database before locking it?
Otherwise your changes are lost.</source>
<translation>Deze database is gewijzigd.
Wilt u de database opslaan voordat u deze vergrendelt?
Zo nee, dan gaan de wijzigingen verloren.</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation>&quot;%1&quot; is gewijzigd.
Wijzigingen ongedaan maken en doorgaan met sluiten?</translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation>Database exporteren naar CSV-bestand</translation>
</message>
<message>
<source>CSV file</source>
<translation>CSV-bestand</translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation>Schrijven van het CSV-bestand mislukt.</translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassX.
Do you want to save it anyway?</source>
<translation>De database die u op probeert te slaan is vergrendeld door een andere instantie van KeePassX.
Wilt u toch doorgaan met opslaan?</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
@ -313,6 +375,14 @@ Opslaan?</translation>
<source>Current group</source> <source>Current group</source>
<translation>Huidige groep</translation> <translation>Huidige groep</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidget</name> <name>EditEntryWidget</name>
@ -425,6 +495,10 @@ Opslaan?</translation>
<source>Save</source> <source>Save</source>
<translation>Opslaan</translation> <translation>Opslaan</translation>
</message> </message>
<message>
<source>Open</source>
<translation>Open</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAutoType</name> <name>EditEntryWidgetAutoType</name>
@ -576,6 +650,14 @@ Opslaan?</translation>
<source>Auto-type</source> <source>Auto-type</source>
<translation>Auto-typen</translation> <translation>Auto-typen</translation>
</message> </message>
<message>
<source>Use default auto-type sequence of parent group</source>
<translation>Gebruik standaard auto-typevolgorde van bovenliggende groep</translation>
</message>
<message>
<source>Set default auto-type sequence</source>
<translation>Stel standaard auto-typevolgorde in</translation>
</message>
</context> </context>
<context> <context>
<name>EditWidgetIcons</name> <name>EditWidgetIcons</name>
@ -724,6 +806,10 @@ Opslaan?</translation>
<source>Root</source> <source>Root</source>
<translation>Alles</translation> <translation>Alles</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
</message>
</context> </context>
<context> <context>
<name>KeePass2Reader</name> <name>KeePass2Reader</name>
@ -739,6 +825,10 @@ Opslaan?</translation>
<source>Wrong key or database file is corrupt.</source> <source>Wrong key or database file is corrupt.</source>
<translation>Verkeerde sleutel of corrupte database.</translation> <translation>Verkeerde sleutel of corrupte database.</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
</message>
</context> </context>
<context> <context>
<name>Main</name> <name>Main</name>
@ -777,10 +867,6 @@ Opslaan?</translation>
<source>Groups</source> <source>Groups</source>
<translation>Groepen</translation> <translation>Groepen</translation>
</message> </message>
<message>
<source>Extras</source>
<translation>Extra&apos;s</translation>
</message>
<message> <message>
<source>View</source> <source>View</source>
<translation>Beeld</translation> <translation>Beeld</translation>
@ -857,18 +943,10 @@ Opslaan?</translation>
<source>Find</source> <source>Find</source>
<translation>Vind</translation> <translation>Vind</translation>
</message> </message>
<message>
<source>Username</source>
<translation>Gebruikersnaam</translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation>Kopieer gebruikersnaam naar klembord</translation> <translation>Kopieer gebruikersnaam naar klembord</translation>
</message> </message>
<message>
<source>Password</source>
<translation>Wachtwoord</translation>
</message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation>Kopieer wachtwoord naar klembord</translation> <translation>Kopieer wachtwoord naar klembord</translation>
@ -913,6 +991,22 @@ Opslaan?</translation>
<source>Toggle window</source> <source>Toggle window</source>
<translation>Wissel venster</translation> <translation>Wissel venster</translation>
</message> </message>
<message>
<source>Tools</source>
<translation>Hulpmiddelen</translation>
</message>
<message>
<source>Copy username</source>
<translation>Gebruikersnaam kopieren</translation>
</message>
<message>
<source>Copy password</source>
<translation>Wachtwoord kopiëren</translation>
</message>
<message>
<source>Export to CSV file</source>
<translation>Naar CSV-bestand exporteren</translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
@ -1093,10 +1187,6 @@ Opslaan?</translation>
<source>Open previous databases on startup</source> <source>Open previous databases on startup</source>
<translation>Open vorige databases bij starten</translation> <translation>Open vorige databases bij starten</translation>
</message> </message>
<message>
<source>Mark as modified on expanded state changes</source>
<translation>Markeer database als gewijzigd bij wijzigen van de status</translation>
</message>
<message> <message>
<source>Automatically save on exit</source> <source>Automatically save on exit</source>
<translation>Automatisch opslaan bij afsluiten</translation> <translation>Automatisch opslaan bij afsluiten</translation>
@ -1133,6 +1223,10 @@ Opslaan?</translation>
<source>Hide window to system tray when minimized</source> <source>Hide window to system tray when minimized</source>
<translation>Bij minimaliseren enkel icoon in systray tonen</translation> <translation>Bij minimaliseren enkel icoon in systray tonen</translation>
</message> </message>
<message>
<source>Remember last key files</source>
<translation>Onthoud laatste sleutelbestanden</translation>
</message>
</context> </context>
<context> <context>
<name>SettingsWidgetSecurity</name> <name>SettingsWidgetSecurity</name>
@ -1163,14 +1257,6 @@ Opslaan?</translation>
<source>Unlock database</source> <source>Unlock database</source>
<translation>Database ontgrendelen</translation> <translation>Database ontgrendelen</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
<source>Wrong key.</source>
<translation>Verkeerd wachtwoord</translation>
</message>
</context> </context>
<context> <context>
<name>WelcomeWidget</name> <name>WelcomeWidget</name>
@ -1193,10 +1279,6 @@ Opslaan?</translation>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation>pad naar een configuratiebestand</translation> <translation>pad naar een configuratiebestand</translation>
</message> </message>
<message>
<source>password of the database (DANGEROUS!)</source>
<translation>wachtwoord van de database (GEVAARLIJK!)</translation>
</message>
<message> <message>
<source>key file of the database</source> <source>key file of the database</source>
<translation>sleutelbestand van de database</translation> <translation>sleutelbestand van de database</translation>

1278
share/translations/keepassx_pl.ts Normal file
View File

File diff suppressed because it is too large Load Diff

1282
share/translations/keepassx_pt_BR.ts Normal file
View File

File diff suppressed because it is too large Load Diff

1280
share/translations/keepassx_pt_PT.ts Normal file
View File

File diff suppressed because it is too large Load Diff

191
share/translations/keepassx_ru.ts
View File

@ -9,6 +9,10 @@
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation>KeePassX распространяется на условиях Стандартной общественной лицензии GNU (GPL) версии 2 или (на ваше усмотрение) версии 3.</translation> <translation>KeePassX распространяется на условиях Стандартной общественной лицензии GNU (GPL) версии 2 или (на ваше усмотрение) версии 3.</translation>
</message> </message>
<message>
<source>Revision</source>
<translation>Ревизия</translation>
</message>
</context> </context>
<context> <context>
<name>AutoType</name> <name>AutoType</name>
@ -44,7 +48,7 @@
</message> </message>
<message> <message>
<source>Select entry to Auto-Type:</source> <source>Select entry to Auto-Type:</source>
<translation>Выберете запись для автоввода:</translation> <translation>Выберите запись для автоввода:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -103,12 +107,22 @@
</message> </message>
<message> <message>
<source>Do you really want to use an empty string as password?</source> <source>Do you really want to use an empty string as password?</source>
<translation>Вы действительно хотите использовать пустую строку как пароль?</translation> <translation>Вы действительно хотите использовать в качестве пароля пустую строку?</translation>
</message> </message>
<message> <message>
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Пароли не совпадают.</translation> <translation>Пароли не совпадают.</translation>
</message> </message>
<message>
<source>Failed to set key file</source>
<translation>Не удалось установить файл-ключ</translation>
</message>
<message>
<source>Failed to set %1 as the Key file:
%2</source>
<translation>Не удалось установить %1 как файл-ключ:
%2</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseOpenWidget</name> <name>DatabaseOpenWidget</name>
@ -150,7 +164,7 @@
</message> </message>
<message> <message>
<source>Select key file</source> <source>Select key file</source>
<translation>Выберете файл-ключ</translation> <translation>Выберите файл-ключ</translation>
</message> </message>
</context> </context>
<context> <context>
@ -169,7 +183,7 @@
</message> </message>
<message> <message>
<source>Default username:</source> <source>Default username:</source>
<translation>Имя пользователя по-умолчанию:</translation> <translation>Имя пользователя по умолчанию:</translation>
</message> </message>
<message> <message>
<source>Use recycle bin:</source> <source>Use recycle bin:</source>
@ -234,12 +248,6 @@
<source>Close?</source> <source>Close?</source>
<translation>Закрыть?</translation> <translation>Закрыть?</translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation>«%1» в режиме редактирования.
Всё равно закрыть?</translation>
</message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
<translation>Сохранить изменения?</translation> <translation>Сохранить изменения?</translation>
@ -268,14 +276,65 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>locked</source> <source>locked</source>
<translation>заблокированно</translation> <translation>заблокировано</translation>
</message>
<message>
<source>The database you are trying to open is locked by another instance of KeePassX.
Do you want to open it anyway? Alternatively the database is opened read-only.</source>
<translation>Хранилище, которое Вы хотите открыть, заблокировано другой запущенной копией KeePassX. Всё равно открыть? В качестве альтернативы хранилище будет открыто в режиме для чтения.</translation>
</message>
<message>
<source>Lock database</source>
<translation>Заблокировать хранилище</translation>
</message>
<message>
<source>Can't lock the database as you are currently editing it.
Please press cancel to finish your changes or discard them.</source>
<translation type="unfinished"/>
</message>
<message>
<source>This database has never been saved.
You can save the database or stop locking it.</source>
<translation type="unfinished"/>
</message>
<message>
<source>This database has been modified.
Do you want to save the database before locking it?
Otherwise your changes are lost.</source>
<translation>Хранилище было изменено.
Вы хотите сохранить его перед тем, как заблокировать?
В противном случае все изменения будут потеряны.</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation>&quot;%1&quot; в режиме редактирования.
Отменить изменения и всё равно закрыть?</translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation>Экспортировать хранилище в файл CSV</translation>
</message>
<message>
<source>CSV file</source>
<translation>Файл CSV</translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation>Не удалось записать CSV файл.</translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassX.
Do you want to save it anyway?</source>
<translation>Данное хранилище заблокировано другой запущенной копией KeePassX.
Вы уверены, что хотите продолжить сохранение?</translation>
</message> </message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
<message> <message>
<source>Change master key</source> <source>Change master key</source>
<translation>Сменить мастер-пароль</translation> <translation>Изменить мастер-пароль</translation>
</message> </message>
<message> <message>
<source>Delete entry?</source> <source>Delete entry?</source>
@ -313,6 +372,14 @@ Save changes?</source>
<source>Current group</source> <source>Current group</source>
<translation>Текущая группа</translation> <translation>Текущая группа</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Невозможно вычислить мастер-пароль</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidget</name> <name>EditEntryWidget</name>
@ -326,7 +393,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Icon</source> <source>Icon</source>
<translation>Иконка</translation> <translation>Значок</translation>
</message> </message>
<message> <message>
<source>Auto-Type</source> <source>Auto-Type</source>
@ -425,6 +492,10 @@ Save changes?</source>
<source>Save</source> <source>Save</source>
<translation>Сохранить</translation> <translation>Сохранить</translation>
</message> </message>
<message>
<source>Open</source>
<translation>Открыть</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAutoType</name> <name>EditEntryWidgetAutoType</name>
@ -527,7 +598,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Icon</source> <source>Icon</source>
<translation>Иконка</translation> <translation>Значок</translation>
</message> </message>
<message> <message>
<source>Properties</source> <source>Properties</source>
@ -574,26 +645,34 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Auto-type</source> <source>Auto-type</source>
<translation>автоввод</translation> <translation>Автоввод</translation>
</message>
<message>
<source>Use default auto-type sequence of parent group</source>
<translation type="unfinished"/>
</message>
<message>
<source>Set default auto-type sequence</source>
<translation type="unfinished"/>
</message> </message>
</context> </context>
<context> <context>
<name>EditWidgetIcons</name> <name>EditWidgetIcons</name>
<message> <message>
<source>Use default icon</source> <source>Use default icon</source>
<translation>Использовать стандартную иконку</translation> <translation>Использовать стандартный значок</translation>
</message> </message>
<message> <message>
<source>Use custom icon</source> <source>Use custom icon</source>
<translation>Использовать свою иконку</translation> <translation>Использовать свой значок</translation>
</message> </message>
<message> <message>
<source>Add custom icon</source> <source>Add custom icon</source>
<translation>Добавить свою иконку</translation> <translation>Добавить свой значок</translation>
</message> </message>
<message> <message>
<source>Delete custom icon</source> <source>Delete custom icon</source>
<translation>Удалить свою иконку</translation> <translation>Удалить свой значок</translation>
</message> </message>
<message> <message>
<source>Images</source> <source>Images</source>
@ -609,11 +688,11 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Can&apos;t delete icon!</source> <source>Can&apos;t delete icon!</source>
<translation>Не могу удалить иконку!</translation> <translation>Не могу удалить значок!</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<source>Can&apos;t delete icon. Still used by %n item(s).</source> <source>Can&apos;t delete icon. Still used by %n item(s).</source>
<translation><numerusform>Не могу удалить иконку, %n запись всё ещё использует её.</numerusform><numerusform>Не могу удалить иконку, %n записи всё ещё использует её.</numerusform><numerusform>Не могу удалить иконку, %n записей всё ещё использует её.</numerusform><numerusform>Не могу удалить иконку, %n записей всё ещё использует её.</numerusform></translation> <translation><numerusform>Не могу удалить иконку, %n запись всё ещё использует её.</numerusform><numerusform>Не могу удалить иконку, %n записи всё ещё использует её.</numerusform><numerusform>Не могу удалить иконку, %n записей всё ещё использует её.</numerusform><numerusform>Не могу удалить значок, %n записей всё ещё использует его.</numerusform></translation>
</message> </message>
</context> </context>
<context> <context>
@ -724,6 +803,10 @@ Save changes?</source>
<source>Root</source> <source>Root</source>
<translation>Корень</translation> <translation>Корень</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Невозможно вычислить мастер-пароль</translation>
</message>
</context> </context>
<context> <context>
<name>KeePass2Reader</name> <name>KeePass2Reader</name>
@ -739,6 +822,10 @@ Save changes?</source>
<source>Wrong key or database file is corrupt.</source> <source>Wrong key or database file is corrupt.</source>
<translation>Неверный ключ или файл хранилища повреждён.</translation> <translation>Неверный ключ или файл хранилища повреждён.</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Невозможно вычислить мастер-пароль</translation>
</message>
</context> </context>
<context> <context>
<name>Main</name> <name>Main</name>
@ -777,10 +864,6 @@ Save changes?</source>
<source>Groups</source> <source>Groups</source>
<translation>Группы</translation> <translation>Группы</translation>
</message> </message>
<message>
<source>Extras</source>
<translation>Дополнительно</translation>
</message>
<message> <message>
<source>View</source> <source>View</source>
<translation>Вид</translation> <translation>Вид</translation>
@ -857,18 +940,10 @@ Save changes?</source>
<source>Find</source> <source>Find</source>
<translation>Найти</translation> <translation>Найти</translation>
</message> </message>
<message>
<source>Username</source>
<translation>Имя пользователя</translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation>Скопировать имя пользователя в буфер обмена</translation> <translation>Скопировать имя пользователя в буфер обмена</translation>
</message> </message>
<message>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation>Скопировать пароль в буфер обмена</translation> <translation>Скопировать пароль в буфер обмена</translation>
@ -913,6 +988,22 @@ Save changes?</source>
<source>Toggle window</source> <source>Toggle window</source>
<translation>Переключить окно</translation> <translation>Переключить окно</translation>
</message> </message>
<message>
<source>Tools</source>
<translation>Инструменты</translation>
</message>
<message>
<source>Copy username</source>
<translation>Скопировать имя пользователя</translation>
</message>
<message>
<source>Copy password</source>
<translation>Скопировать пароль</translation>
</message>
<message>
<source>Export to CSV file</source>
<translation>Экспортировать в файл CSV</translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
@ -950,7 +1041,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Ensure that the password contains characters from every group</source> <source>Ensure that the password contains characters from every group</source>
<translation>Пожалуйста, пусть пароль будет содержать символы всех видов</translation> <translation>Убедитесь, что пароль содержит символы всех видов</translation>
</message> </message>
<message> <message>
<source>Accept</source> <source>Accept</source>
@ -1023,19 +1114,19 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Error writing to underlying device: </source> <source>Error writing to underlying device: </source>
<translation>Ошибка записи на нижлежащее устройство:</translation> <translation>Ошибка записи на низлежащее устройство:</translation>
</message> </message>
<message> <message>
<source>Error opening underlying device: </source> <source>Error opening underlying device: </source>
<translation>Ошибка открытия нижлежащего устройства:</translation> <translation>Ошибка открытия низлежащего устройства:</translation>
</message> </message>
<message> <message>
<source>Error reading data from underlying device: </source> <source>Error reading data from underlying device: </source>
<translation>Ошибка чтения с нижлежащего устройства:</translation> <translation>Ошибка чтения с низлежащего устройства:</translation>
</message> </message>
<message> <message>
<source>Internal zlib error when decompressing: </source> <source>Internal zlib error when decompressing: </source>
<translation>Внутренняя ошибка zlib при расжатии:</translation> <translation>Внутренняя ошибка zlib при распаковке:</translation>
</message> </message>
</context> </context>
<context> <context>
@ -1093,10 +1184,6 @@ Save changes?</source>
<source>Open previous databases on startup</source> <source>Open previous databases on startup</source>
<translation>Открывать предыдущее хранилище при запуске</translation> <translation>Открывать предыдущее хранилище при запуске</translation>
</message> </message>
<message>
<source>Mark as modified on expanded state changes</source>
<translation type="unfinished"/>
</message>
<message> <message>
<source>Automatically save on exit</source> <source>Automatically save on exit</source>
<translation>Автоматически сохранять при выходе</translation> <translation>Автоматически сохранять при выходе</translation>
@ -1133,12 +1220,16 @@ Save changes?</source>
<source>Hide window to system tray when minimized</source> <source>Hide window to system tray when minimized</source>
<translation>При сворачивании прятать окно в область системных уведомлений</translation> <translation>При сворачивании прятать окно в область системных уведомлений</translation>
</message> </message>
<message>
<source>Remember last key files</source>
<translation>Запоминать последние файл-ключи</translation>
</message>
</context> </context>
<context> <context>
<name>SettingsWidgetSecurity</name> <name>SettingsWidgetSecurity</name>
<message> <message>
<source>Clear clipboard after</source> <source>Clear clipboard after</source>
<translation>Потом почтистить буфер обмена</translation> <translation>Очищать буфер обмена через</translation>
</message> </message>
<message> <message>
<source> sec</source> <source> sec</source>
@ -1150,7 +1241,7 @@ Save changes?</source>
</message> </message>
<message> <message>
<source>Show passwords in cleartext by default</source> <source>Show passwords in cleartext by default</source>
<translation>Показывать пароль в открытую по-умолчанию</translation> <translation>По умолчанию показывать пароль в открытую</translation>
</message> </message>
<message> <message>
<source>Always ask before performing auto-type</source> <source>Always ask before performing auto-type</source>
@ -1163,14 +1254,6 @@ Save changes?</source>
<source>Unlock database</source> <source>Unlock database</source>
<translation>Разблокировать хранилище</translation> <translation>Разблокировать хранилище</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
<source>Wrong key.</source>
<translation>Неверный ключ.</translation>
</message>
</context> </context>
<context> <context>
<name>WelcomeWidget</name> <name>WelcomeWidget</name>
@ -1193,10 +1276,6 @@ Save changes?</source>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation>путь к своему файлу настроек</translation> <translation>путь к своему файлу настроек</translation>
</message> </message>
<message>
<source>password of the database (DANGEROUS!)</source>
<translation>пароль от хранилища (ОПАСНО!)</translation>
</message>
<message> <message>
<source>key file of the database</source> <source>key file of the database</source>
<translation>файл-ключ хранилища</translation> <translation>файл-ключ хранилища</translation>

1285
share/translations/keepassx_sl_SI.ts Normal file
View File

File diff suppressed because it is too large Load Diff

167
share/translations/keepassx_sv.ts
View File

@ -9,6 +9,14 @@
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation>Keepassx distribueras enligt villkoren i GNU General Public License (GPL) version 2 eller (om du vill) version 3.</translation> <translation>Keepassx distribueras enligt villkoren i GNU General Public License (GPL) version 2 eller (om du vill) version 3.</translation>
</message> </message>
<message>
<source>Revision</source>
<translation>Revision</translation>
</message>
<message>
<source>Using:</source>
<translation>Använder:</translation>
</message>
</context> </context>
<context> <context>
<name>AutoType</name> <name>AutoType</name>
@ -109,6 +117,16 @@
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>Olika lösenord angivna</translation> <translation>Olika lösenord angivna</translation>
</message> </message>
<message>
<source>Failed to set key file</source>
<translation>Kunde inte sätta nyckel-fil</translation>
</message>
<message>
<source>Failed to set %1 as the Key file:
%2</source>
<translation>Kunde inte sätta %1 som nyckel-fil:
%2</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseOpenWidget</name> <name>DatabaseOpenWidget</name>
@ -234,12 +252,6 @@
<source>Close?</source> <source>Close?</source>
<translation>Stäng?</translation> <translation>Stäng?</translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation>&quot;%1&quot; är i redigerar-läge.
Stäng ändå?</translation>
</message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
<translation>Spara ändringar?</translation> <translation>Spara ändringar?</translation>
@ -270,6 +282,60 @@ Spara ändringarna?</translation>
<source>locked</source> <source>locked</source>
<translation>låst</translation> <translation>låst</translation>
</message> </message>
<message>
<source>The database you are trying to open is locked by another instance of KeePassX.
Do you want to open it anyway? Alternatively the database is opened read-only.</source>
<translation>Databasen som du försöker öppna är låst av en annan instans av KeePassX.
Vill du öppna den ändå? Databasen kommer då att öppnas skrivskyddad.</translation>
</message>
<message>
<source>Lock database</source>
<translation>Lås databasen</translation>
</message>
<message>
<source>Can't lock the database as you are currently editing it.
Please press cancel to finish your changes or discard them.</source>
<translation>Kan inte låsa databasen eftersom du håller på att redigera den.
Tryck avbryt för att ansluta dina ändringar alternativt kasta dem.</translation>
</message>
<message>
<source>This database has never been saved.
You can save the database or stop locking it.</source>
<translation>Databasen has aldrig sparats.
Spara databasen eller sluta lås den.</translation>
</message>
<message>
<source>This database has been modified.
Do you want to save the database before locking it?
Otherwise your changes are lost.</source>
<translation>Databasen har ändrats.
Vill du spara databasen innen du låser den?
I annat fall försvinner ändringarna.</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation>&quot;%1&quot; är i redigeringsläge.
Kasta ändringarna och stäng endå?</translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation>Exportera databasen till en CSV-fil</translation>
</message>
<message>
<source>CSV file</source>
<translation>CSV-fil</translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation>Kunde inte skriva till CSV-filen</translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassX.
Do you want to save it anyway?</source>
<translation>Databasen du försöker spara som är låst av en annan instans av KeePassX.
Vill du spara endå?</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
@ -313,6 +379,14 @@ Spara ändringarna?</translation>
<source>Current group</source> <source>Current group</source>
<translation>Nuvarande grupp</translation> <translation>Nuvarande grupp</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>Kunde inte räkna nu master-nyckeln</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidget</name> <name>EditEntryWidget</name>
@ -425,6 +499,10 @@ Spara ändringarna?</translation>
<source>Save</source> <source>Save</source>
<translation>Spara</translation> <translation>Spara</translation>
</message> </message>
<message>
<source>Open</source>
<translation>Öppna</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAutoType</name> <name>EditEntryWidgetAutoType</name>
@ -576,6 +654,14 @@ Spara ändringarna?</translation>
<source>Auto-type</source> <source>Auto-type</source>
<translation>Auto-skriv</translation> <translation>Auto-skriv</translation>
</message> </message>
<message>
<source>Use default auto-type sequence of parent group</source>
<translation>Använd standard auto-skriv sekvensen från föräldergruppen</translation>
</message>
<message>
<source>Set default auto-type sequence</source>
<translation>Ange standard auto-skriv sekvens</translation>
</message>
</context> </context>
<context> <context>
<name>EditWidgetIcons</name> <name>EditWidgetIcons</name>
@ -724,6 +810,10 @@ Spara ändringarna?</translation>
<source>Root</source> <source>Root</source>
<translation>Root</translation> <translation>Root</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Kunde inte räkna nu master-nyckeln</translation>
</message>
</context> </context>
<context> <context>
<name>KeePass2Reader</name> <name>KeePass2Reader</name>
@ -739,6 +829,17 @@ Spara ändringarna?</translation>
<source>Wrong key or database file is corrupt.</source> <source>Wrong key or database file is corrupt.</source>
<translation>Fel lösenord eller korrupt databas-fil</translation> <translation>Fel lösenord eller korrupt databas-fil</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>Kunde inte räkna nu master-nyckeln</translation>
</message>
<message>
<source>The selected file is an old KeePass 1 database (.kdb).
You can import it by clicking on Database &gt; 'Import KeePass 1 database'.
This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
<translation type="unfinished"/>
</message>
</context> </context>
<context> <context>
<name>Main</name> <name>Main</name>
@ -759,7 +860,7 @@ Spara ändringarna?</translation>
</message> </message>
<message> <message>
<source>Recent databases</source> <source>Recent databases</source>
<translation>Senast använda databser</translation> <translation>Senast använda databaser</translation>
</message> </message>
<message> <message>
<source>Help</source> <source>Help</source>
@ -777,10 +878,6 @@ Spara ändringarna?</translation>
<source>Groups</source> <source>Groups</source>
<translation>Grupper</translation> <translation>Grupper</translation>
</message> </message>
<message>
<source>Extras</source>
<translation>Extra</translation>
</message>
<message> <message>
<source>View</source> <source>View</source>
<translation>Vy</translation> <translation>Vy</translation>
@ -857,18 +954,10 @@ Spara ändringarna?</translation>
<source>Find</source> <source>Find</source>
<translation>Sök</translation> <translation>Sök</translation>
</message> </message>
<message>
<source>Username</source>
<translation>Användarnamn</translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation>Kopiera användarnamn</translation> <translation>Kopiera användarnamn</translation>
</message> </message>
<message>
<source>Password</source>
<translation>Lösenord</translation>
</message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation>Kopiera lösenord</translation> <translation>Kopiera lösenord</translation>
@ -913,6 +1002,22 @@ Spara ändringarna?</translation>
<source>Toggle window</source> <source>Toggle window</source>
<translation>Visa/dölj fönster</translation> <translation>Visa/dölj fönster</translation>
</message> </message>
<message>
<source>Tools</source>
<translation>Verktyg</translation>
</message>
<message>
<source>Copy username</source>
<translation>Kopiera användarnamn</translation>
</message>
<message>
<source>Copy password</source>
<translation>Kopiera lösenord</translation>
</message>
<message>
<source>Export to CSV file</source>
<translation>Exportera till CSV-fil</translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
@ -1091,15 +1196,11 @@ Spara ändringarna?</translation>
</message> </message>
<message> <message>
<source>Open previous databases on startup</source> <source>Open previous databases on startup</source>
<translation>Öppna senaste databasen är programmet startar</translation> <translation>Öppna senaste databasen när programmet startar</translation>
</message>
<message>
<source>Mark as modified on expanded state changes</source>
<translation>Markera som ändrad när utökat läge ändras</translation>
</message> </message>
<message> <message>
<source>Automatically save on exit</source> <source>Automatically save on exit</source>
<translation>Spara automatiskt är applikationen anslutas</translation> <translation>Spara automatiskt när applikationen anslutas</translation>
</message> </message>
<message> <message>
<source>Automatically save after every change</source> <source>Automatically save after every change</source>
@ -1133,6 +1234,10 @@ Spara ändringarna?</translation>
<source>Hide window to system tray when minimized</source> <source>Hide window to system tray when minimized</source>
<translation>Vid minimering, minimera fönstret till systemfältet</translation> <translation>Vid minimering, minimera fönstret till systemfältet</translation>
</message> </message>
<message>
<source>Remember last key files</source>
<translation>Komihåg senaste nyckel-filen</translation>
</message>
</context> </context>
<context> <context>
<name>SettingsWidgetSecurity</name> <name>SettingsWidgetSecurity</name>
@ -1163,14 +1268,6 @@ Spara ändringarna?</translation>
<source>Unlock database</source> <source>Unlock database</source>
<translation>Lås upp databas</translation> <translation>Lås upp databas</translation>
</message> </message>
<message>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
<source>Wrong key.</source>
<translation>Fel lösenord</translation>
</message>
</context> </context>
<context> <context>
<name>WelcomeWidget</name> <name>WelcomeWidget</name>
@ -1193,10 +1290,6 @@ Spara ändringarna?</translation>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation>Sökväg till egen konfigurations-fil</translation> <translation>Sökväg till egen konfigurations-fil</translation>
</message> </message>
<message>
<source>password of the database (DANGEROUS!)</source>
<translation>lösenord för databasen (FARLIGT!)</translation>
</message>
<message> <message>
<source>key file of the database</source> <source>key file of the database</source>
<translation>nyckel-fil för databas</translation> <translation>nyckel-fil för databas</translation>

1300
share/translations/keepassx_uk.ts Normal file
View File

File diff suppressed because it is too large Load Diff

1280
share/translations/keepassx_zh_CN.ts Normal file
View File

File diff suppressed because it is too large Load Diff

149
share/translations/keepassx_zh_TW.ts
View File

@ -9,6 +9,10 @@
<source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source> <source>KeePassX is distributed under the term of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
<translation>KeePassX 是使用第 2 版 GNU 通用公共授權條款所發佈的 (或者，可根據你的選擇選用第 3 版)</translation> <translation>KeePassX 是使用第 2 版 GNU 通用公共授權條款所發佈的 (或者，可根據你的選擇選用第 3 版)</translation>
</message> </message>
<message>
<source>Revision</source>
<translation>修改紀錄</translation>
</message>
</context> </context>
<context> <context>
<name>AutoType</name> <name>AutoType</name>
@ -109,6 +113,16 @@
<source>Different passwords supplied.</source> <source>Different passwords supplied.</source>
<translation>提供了不同的密碼</translation> <translation>提供了不同的密碼</translation>
</message> </message>
<message>
<source>Failed to set key file</source>
<translation>無法設定金鑰檔案</translation>
</message>
<message>
<source>Failed to set %1 as the Key file:
%2</source>
<translation>無法設定 %1 成為金鑰檔案：
%2</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseOpenWidget</name> <name>DatabaseOpenWidget</name>
@ -234,11 +248,6 @@
<source>Close?</source> <source>Close?</source>
<translation>關閉？</translation> <translation>關閉？</translation>
</message> </message>
<message>
<source>&quot;%1&quot; is in edit mode.
Close anyway?</source>
<translation>&quot;%1&quot; 正在編輯中。仍然要關閉嗎？</translation>
</message>
<message> <message>
<source>Save changes?</source> <source>Save changes?</source>
<translation>儲存修改？</translation> <translation>儲存修改？</translation>
@ -268,6 +277,60 @@ Save changes?</source>
<source>locked</source> <source>locked</source>
<translation>已鎖住</translation> <translation>已鎖住</translation>
</message> </message>
<message>
<source>The database you are trying to open is locked by another instance of KeePassX.
Do you want to open it anyway? Alternatively the database is opened read-only.</source>
<translation>你嘗試要打開的資料庫已經被另一個正在執行的 KeePassX 鎖定
你要打開它嗎？或者，打開唯讀的資料庫</translation>
</message>
<message>
<source>Lock database</source>
<translation>鎖定資料庫</translation>
</message>
<message>
<source>Can't lock the database as you are currently editing it.
Please press cancel to finish your changes or discard them.</source>
<translation>無法鎖定資料庫，因為目前你正在編輯它
請按下取消完成修改或放棄</translation>
</message>
<message>
<source>This database has never been saved.
You can save the database or stop locking it.</source>
<translation>這個資料庫尚未被儲存
你能儲存資料庫或不再鎖定它</translation>
</message>
<message>
<source>This database has been modified.
Do you want to save the database before locking it?
Otherwise your changes are lost.</source>
<translation>這個資料庫已經被修改
想要在鎖定之前，儲存資料庫嗎？
否則，這次修改將會遺失</translation>
</message>
<message>
<source>&quot;%1&quot; is in edit mode.
Discard changes and close anyway?</source>
<translation>&quot;%1&quot; 正在編輯模式。
是否要放棄編輯及關閉？</translation>
</message>
<message>
<source>Export database to CSV file</source>
<translation>將資料庫輸出成 CSV 檔案</translation>
</message>
<message>
<source>CSV file</source>
<translation>CSV 檔案</translation>
</message>
<message>
<source>Writing the CSV file failed.</source>
<translation>寫入 CSV 檔案失敗</translation>
</message>
<message>
<source>The database you are trying to save as is locked by another instance of KeePassX.
Do you want to save it anyway?</source>
<translation>你嘗試要打開的資料庫已經被另一個正在執行的 KeePassX 鎖定
還要儲存嗎？</translation>
</message>
</context> </context>
<context> <context>
<name>DatabaseWidget</name> <name>DatabaseWidget</name>
@ -311,6 +374,14 @@ Save changes?</source>
<source>Current group</source> <source>Current group</source>
<translation>目前的群組</translation> <translation>目前的群組</translation>
</message> </message>
<message>
<source>Error</source>
<translation>錯誤</translation>
</message>
<message>
<source>Unable to calculate master key</source>
<translation>無法計算主金鑰</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidget</name> <name>EditEntryWidget</name>
@ -423,6 +494,10 @@ Save changes?</source>
<source>Save</source> <source>Save</source>
<translation>儲存</translation> <translation>儲存</translation>
</message> </message>
<message>
<source>Open</source>
<translation>打開</translation>
</message>
</context> </context>
<context> <context>
<name>EditEntryWidgetAutoType</name> <name>EditEntryWidgetAutoType</name>
@ -574,6 +649,14 @@ Save changes?</source>
<source>Auto-type</source> <source>Auto-type</source>
<translation>自動輸入</translation> <translation>自動輸入</translation>
</message> </message>
<message>
<source>Use default auto-type sequence of parent group</source>
<translation>使用預設的父群組自動輸入序列</translation>
</message>
<message>
<source>Set default auto-type sequence</source>
<translation>設定預設自動輸入序列</translation>
</message>
</context> </context>
<context> <context>
<name>EditWidgetIcons</name> <name>EditWidgetIcons</name>
@ -722,6 +805,10 @@ Save changes?</source>
<source>Root</source> <source>Root</source>
<translation>根</translation> <translation>根</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>無法計算主金鑰</translation>
</message>
</context> </context>
<context> <context>
<name>KeePass2Reader</name> <name>KeePass2Reader</name>
@ -737,6 +824,10 @@ Save changes?</source>
<source>Wrong key or database file is corrupt.</source> <source>Wrong key or database file is corrupt.</source>
<translation>無法的金鑰或資料庫損壞</translation> <translation>無法的金鑰或資料庫損壞</translation>
</message> </message>
<message>
<source>Unable to calculate master key</source>
<translation>無法計算主金鑰</translation>
</message>
</context> </context>
<context> <context>
<name>Main</name> <name>Main</name>
@ -775,10 +866,6 @@ Save changes?</source>
<source>Groups</source> <source>Groups</source>
<translation>群組</translation> <translation>群組</translation>
</message> </message>
<message>
<source>Extras</source>
<translation>其它</translation>
</message>
<message> <message>
<source>View</source> <source>View</source>
<translation>顯示</translation> <translation>顯示</translation>
@ -855,18 +942,10 @@ Save changes?</source>
<source>Find</source> <source>Find</source>
<translation>尋找</translation> <translation>尋找</translation>
</message> </message>
<message>
<source>Username</source>
<translation>使用者名稱</translation>
</message>
<message> <message>
<source>Copy username to clipboard</source> <source>Copy username to clipboard</source>
<translation>將使用者名稱複製到剪貼簿</translation> <translation>將使用者名稱複製到剪貼簿</translation>
</message> </message>
<message>
<source>Password</source>
<translation>密碼</translation>
</message>
<message> <message>
<source>Copy password to clipboard</source> <source>Copy password to clipboard</source>
<translation>將密碼複製到剪貼簿</translation> <translation>將密碼複製到剪貼簿</translation>
@ -911,6 +990,22 @@ Save changes?</source>
<source>Toggle window</source> <source>Toggle window</source>
<translation>切換視窗</translation> <translation>切換視窗</translation>
</message> </message>
<message>
<source>Tools</source>
<translation>工具</translation>
</message>
<message>
<source>Copy username</source>
<translation>複製使用者名稱</translation>
</message>
<message>
<source>Copy password</source>
<translation>複製密碼</translation>
</message>
<message>
<source>Export to CSV file</source>
<translation>輸出成 CSV 檔案</translation>
</message>
</context> </context>
<context> <context>
<name>PasswordGeneratorWidget</name> <name>PasswordGeneratorWidget</name>
@ -1091,10 +1186,6 @@ Save changes?</source>
<source>Open previous databases on startup</source> <source>Open previous databases on startup</source>
<translation>在啟動時開啟最近的資料庫</translation> <translation>在啟動時開啟最近的資料庫</translation>
</message> </message>
<message>
<source>Mark as modified on expanded state changes</source>
<translation>擴展狀態發生變化時，標記為已修改</translation>
</message>
<message> <message>
<source>Automatically save on exit</source> <source>Automatically save on exit</source>
<translation>離開時，自動儲存</translation> <translation>離開時，自動儲存</translation>
@ -1131,6 +1222,10 @@ Save changes?</source>
<source>Hide window to system tray when minimized</source> <source>Hide window to system tray when minimized</source>
<translation>將視窗最小化至工作列 </translation> <translation>將視窗最小化至工作列 </translation>
</message> </message>
<message>
<source>Remember last key files</source>
<translation>記住最近的金鑰檔案</translation>
</message>
</context> </context>
<context> <context>
<name>SettingsWidgetSecurity</name> <name>SettingsWidgetSecurity</name>
@ -1161,14 +1256,6 @@ Save changes?</source>
<source>Unlock database</source> <source>Unlock database</source>
<translation>解鎖資料庫</translation> <translation>解鎖資料庫</translation>
</message> </message>
<message>
<source>Error</source>
<translation>錯誤</translation>
</message>
<message>
<source>Wrong key.</source>
<translation>錯誤的金鑰</translation>
</message>
</context> </context>
<context> <context>
<name>WelcomeWidget</name> <name>WelcomeWidget</name>
@ -1191,10 +1278,6 @@ Save changes?</source>
<source>path to a custom config file</source> <source>path to a custom config file</source>
<translation>自定設定檔的路徑</translation> <translation>自定設定檔的路徑</translation>
</message> </message>
<message>
<source>password of the database (DANGEROUS!)</source>
<translation>資料庫的密碼(危險！)</translation>
</message>
<message> <message>
<source>key file of the database</source> <source>key file of the database</source>
<translation>資料庫的金鑰</translation> <translation>資料庫的金鑰</translation>

119
src/CMakeLists.txt
View File

@ -17,6 +17,17 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
configure_file(config-keepassx.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-keepassx.h) configure_file(config-keepassx.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-keepassx.h)
include(GetGitRevisionDescription)
get_git_head_revision(GIT_REFSPEC GIT_HEAD)
git_describe(GIT_DESCRIBE --long)
if (NOT GIT_HEAD OR NOT GIT_DESCRIBE)
set(GIT_HEAD "")
set(GIT_DESCRIBE "")
endif()
configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
set(keepassx_SOURCES set(keepassx_SOURCES
autotype/AutoType.cpp autotype/AutoType.cpp
autotype/AutoTypeAction.cpp autotype/AutoTypeAction.cpp
@ -43,9 +54,6 @@ set(keepassx_SOURCES
core/ListDeleter.h core/ListDeleter.h
core/Metadata.cpp core/Metadata.cpp
core/PasswordGenerator.cpp core/PasswordGenerator.cpp
core/qlockfile.cpp
core/qsavefile.cpp
core/qsavefile_p.h
core/SignalMultiplexer.cpp core/SignalMultiplexer.cpp
core/TimeDelta.cpp core/TimeDelta.cpp
core/TimeInfo.cpp core/TimeInfo.cpp
@ -53,19 +61,19 @@ set(keepassx_SOURCES
core/Tools.cpp core/Tools.cpp
core/Translator.cpp core/Translator.cpp
core/Uuid.cpp core/Uuid.cpp
core/qcommandlineoption.cpp
core/qcommandlineparser.cpp
crypto/Crypto.cpp crypto/Crypto.cpp
crypto/CryptoHash.cpp crypto/CryptoHash.cpp
crypto/Random.cpp crypto/Random.cpp
crypto/SymmetricCipher.cpp crypto/SymmetricCipher.cpp
crypto/SymmetricCipherBackend.h crypto/SymmetricCipherBackend.h
crypto/SymmetricCipherGcrypt.cpp crypto/SymmetricCipherGcrypt.cpp
format/CsvExporter.cpp
format/KeePass1.h format/KeePass1.h
format/KeePass1Reader.cpp format/KeePass1Reader.cpp
format/KeePass2.h format/KeePass2.h
format/KeePass2RandomStream.cpp format/KeePass2RandomStream.cpp
format/KeePass2Reader.cpp format/KeePass2Reader.cpp
format/KeePass2Repair.cpp
format/KeePass2Writer.cpp format/KeePass2Writer.cpp
format/KeePass2XmlReader.cpp format/KeePass2XmlReader.cpp
format/KeePass2XmlWriter.cpp format/KeePass2XmlWriter.cpp
@ -74,6 +82,7 @@ set(keepassx_SOURCES
gui/ChangeMasterKeyWidget.cpp gui/ChangeMasterKeyWidget.cpp
gui/Clipboard.cpp gui/Clipboard.cpp
gui/DatabaseOpenWidget.cpp gui/DatabaseOpenWidget.cpp
gui/DatabaseRepairWidget.cpp
gui/DatabaseSettingsWidget.cpp gui/DatabaseSettingsWidget.cpp
gui/DatabaseTabWidget.cpp gui/DatabaseTabWidget.cpp
gui/DatabaseWidget.cpp gui/DatabaseWidget.cpp
@ -127,85 +136,11 @@ set(keepassx_SOURCES
streams/SymmetricCipherStream.cpp streams/SymmetricCipherStream.cpp
) )
if(NOT GCRYPT_HAS_SALSA20)
set(keepassx_SOURCES
${keepassx_SOURCES}
crypto/salsa20/ecrypt-config.h
crypto/salsa20/ecrypt-machine.h
crypto/salsa20/ecrypt-portable.h
crypto/salsa20/ecrypt-sync.h
crypto/salsa20/salsa20.c
crypto/SymmetricCipherSalsa20.cpp
)
endif()
if(UNIX)
set(keepassx_SOURCES
${keepassx_SOURCES}
core/qlockfile_unix.cpp
)
elseif(MINGW)
set(keepassx_SOURCES
${keepassx_SOURCES}
core/qlockfile_win.cpp
)
endif()
set(keepassx_SOURCES_MAINEXE set(keepassx_SOURCES_MAINEXE
main.cpp main.cpp
) )
set(keepassx_MOC set(keepassx_MOC
autotype/AutoType.h
autotype/AutoTypeSelectDialog.h
autotype/AutoTypeSelectView.h
autotype/ShortcutWidget.h
autotype/WindowSelectComboBox.h
core/AutoTypeAssociations.h
core/Config.h
core/Database.h
core/Entry.h
core/EntryAttachments.h
core/EntryAttributes.h
core/Group.h
core/InactivityTimer.h
core/Metadata.h
core/qsavefile.h
gui/AboutDialog.h
gui/Application.h
gui/ChangeMasterKeyWidget.h
gui/Clipboard.h
gui/DatabaseOpenWidget.h
gui/DatabaseSettingsWidget.h
gui/DatabaseTabWidget.h
gui/DatabaseWidget.h
gui/DatabaseWidgetStateSync.h
gui/DialogyWidget.h
gui/DragTabBar.h
gui/EditWidget.h
gui/EditWidgetIcons.h
gui/EditWidgetProperties.h
gui/IconModels.h
gui/KeePass1OpenWidget.h
gui/LineEdit.h
gui/MainWindow.h
gui/PasswordEdit.h
gui/PasswordGeneratorWidget.h
gui/PasswordComboBox.h
gui/SettingsWidget.h
gui/SortFilterHideProxyModel.h
gui/UnlockDatabaseWidget.h
gui/WelcomeWidget.h
gui/entry/AutoTypeAssociationsModel.h
gui/entry/EditEntryWidget.h
gui/entry/EntryAttachmentsModel.h
gui/entry/EntryAttributesModel.h
gui/entry/EntryHistoryModel.h
gui/entry/EntryModel.h
gui/entry/EntryView.h
gui/group/EditGroupWidget.h
gui/group/GroupModel.h
gui/group/GroupView.h
http/AccessControlDialog.h http/AccessControlDialog.h
http/EntryConfig.h http/EntryConfig.h
http/HttpPasswordGeneratorWidget.h http/HttpPasswordGeneratorWidget.h
@ -213,12 +148,6 @@ set(keepassx_MOC
http/Protocol.h http/Protocol.h
http/Server.h http/Server.h
http/Service.h http/Service.h
keys/CompositeKey_p.h
streams/HashedBlockStream.h
streams/LayeredStream.h
streams/qtiocompressor.h
streams/StoreDataStream.h
streams/SymmetricCipherStream.h
) )
set(keepassx_FORMS set(keepassx_FORMS
@ -251,27 +180,21 @@ if(MINGW)
${CMAKE_SOURCE_DIR}/share/windows/icon.rc) ${CMAKE_SOURCE_DIR}/share/windows/icon.rc)
endif() endif()
qt4_wrap_ui(keepassx_SOURCES ${keepassx_FORMS}) qt5_wrap_ui(keepassx_SOURCES ${keepassx_FORMS})
qt4_wrap_cpp(keepassx_SOURCES ${keepassx_MOC})
add_library(keepassx_core STATIC ${keepassx_SOURCES}) add_library(keepassx_core STATIC ${keepassx_SOURCES})
set_target_properties(keepassx_core PROPERTIES COMPILE_DEFINITIONS KEEPASSX_BUILDING_CORE) set_target_properties(keepassx_core PROPERTIES COMPILE_DEFINITIONS KEEPASSX_BUILDING_CORE)
target_link_libraries(keepassx_core Qt5::Core Qt5::Concurrent Qt5::Widgets)
add_executable(${PROGNAME} WIN32 MACOSX_BUNDLE ${keepassx_SOURCES_MAINEXE}) add_executable(${PROGNAME} WIN32 MACOSX_BUNDLE ${keepassx_SOURCES_MAINEXE})
target_link_libraries(${PROGNAME} target_link_libraries(${PROGNAME}
keepassx_core keepassx_core
qjson Qt5::Core
${MHD_LIBRARIES} Qt5::Concurrent
${QT_QTCORE_LIBRARY} Qt5::Widgets
${QT_QTGUI_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${GCRYPT_LIBRARIES} ${GCRYPT_LIBRARIES}
${ZLIB_LIBRARIES}) ${ZLIB_LIBRARIES})
if(UNIX AND NOT APPLE)
target_link_libraries(${PROGNAME} ${QT_QTDBUS_LIBRARY})
endif()
set_target_properties(${PROGNAME} PROPERTIES ENABLE_EXPORTS ON) set_target_properties(${PROGNAME} PROPERTIES ENABLE_EXPORTS ON)
if(APPLE) if(APPLE)
@ -286,7 +209,7 @@ install(TARGETS ${PROGNAME}
add_subdirectory(autotype) add_subdirectory(autotype)
if(APPLE AND NOT (${CMAKE_VERSION} VERSION_LESS 2.8.8)) if(APPLE)
if(QT_MAC_USE_COCOA AND EXISTS "${QT_LIBRARY_DIR}/Resources/qt_menu.nib") if(QT_MAC_USE_COCOA AND EXISTS "${QT_LIBRARY_DIR}/Resources/qt_menu.nib")
install(DIRECTORY "${QT_LIBRARY_DIR}/Resources/qt_menu.nib" install(DIRECTORY "${QT_LIBRARY_DIR}/Resources/qt_menu.nib"
DESTINATION "${DATA_INSTALL_DIR}") DESTINATION "${DATA_INSTALL_DIR}")
@ -304,7 +227,7 @@ if(APPLE AND NOT (${CMAKE_VERSION} VERSION_LESS 2.8.8))
install_qt4_executable(${PROGNAME}.app "qjpeg;qgif;qico;qtaccessiblewidgets") install_qt4_executable(${PROGNAME}.app "qjpeg;qgif;qico;qtaccessiblewidgets")
endif() endif()
if(MINGW AND NOT (${CMAKE_VERSION} VERSION_LESS 2.8.8)) if(MINGW )
set(CPACK_GENERATOR "ZIP") set(CPACK_GENERATOR "ZIP")
set(CPACK_STRIP_FILES ON) set(CPACK_STRIP_FILES ON)
set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}") set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSX_VERSION_NUM}")

35
src/autotype/AutoType.cpp
View File

@ -32,7 +32,7 @@
#include "core/Tools.h" #include "core/Tools.h"
#include "gui/MessageBox.h" #include "gui/MessageBox.h"
AutoType* AutoType::m_instance = Q_NULLPTR; AutoType* AutoType::m_instance = nullptr;
AutoType::AutoType(QObject* parent, bool test) AutoType::AutoType(QObject* parent, bool test)
: QObject(parent) : QObject(parent)
@ -40,8 +40,8 @@ AutoType::AutoType(QObject* parent, bool test)
, m_currentGlobalKey(static_cast<Qt::Key>(0)) , m_currentGlobalKey(static_cast<Qt::Key>(0))
, m_currentGlobalModifiers(0) , m_currentGlobalModifiers(0)
, m_pluginLoader(new QPluginLoader(this)) , m_pluginLoader(new QPluginLoader(this))
, m_plugin(Q_NULLPTR) , m_plugin(nullptr)
, m_executor(Q_NULLPTR) , m_executor(nullptr)
, m_windowFromGlobal(0) , m_windowFromGlobal(0)
{ {
// prevent crash when the plugin has unresolved symbols // prevent crash when the plugin has unresolved symbols
@ -49,7 +49,7 @@ AutoType::AutoType(QObject* parent, bool test)
QString pluginName = "keepassx-autotype-"; QString pluginName = "keepassx-autotype-";
if (!test) { if (!test) {
pluginName += Tools::platform(); pluginName += QApplication::platformName();
} }
else { else {
pluginName += "test"; pluginName += "test";
@ -68,7 +68,7 @@ AutoType::~AutoType()
{ {
if (m_executor) { if (m_executor) {
delete m_executor; delete m_executor;
m_executor = Q_NULLPTR; m_executor = nullptr;
} }
} }
@ -79,9 +79,16 @@ void AutoType::loadPlugin(const QString& pluginPath)
QObject* pluginInstance = m_pluginLoader->instance(); QObject* pluginInstance = m_pluginLoader->instance();
if (pluginInstance) { if (pluginInstance) {
m_plugin = qobject_cast<AutoTypePlatformInterface*>(pluginInstance); m_plugin = qobject_cast<AutoTypePlatformInterface*>(pluginInstance);
m_executor = nullptr;
if (m_plugin) { if (m_plugin) {
m_executor = m_plugin->createExecutor(); if (m_plugin->isAvailable()) {
connect(pluginInstance, SIGNAL(globalShortcutTriggered()), SIGNAL(globalShortcutTriggered())); m_executor = m_plugin->createExecutor();
connect(pluginInstance, SIGNAL(globalShortcutTriggered()), SIGNAL(globalShortcutTriggered()));
}
else {
unloadPlugin();
}
} }
} }
@ -195,11 +202,11 @@ void AutoType::performGlobalAutoType(const QList<Database*>& dbList)
QString message = tr("Couldn't find an entry that matches the window title:"); QString message = tr("Couldn't find an entry that matches the window title:");
message.append("\n\n"); message.append("\n\n");
message.append(windowTitle); message.append(windowTitle);
MessageBox::information(Q_NULLPTR, tr("Auto-Type - KeePassX"), message); MessageBox::information(nullptr, tr("Auto-Type - KeePassX"), message);
} }
else if ((entryList.size() == 1) && !config()->get("security/autotypeask").toBool()) { else if ((entryList.size() == 1) && !config()->get("security/autotypeask").toBool()) {
m_inAutoType = false; m_inAutoType = false;
performAutoType(entryList.first(), Q_NULLPTR, sequenceHash[entryList.first()]); performAutoType(entryList.first(), nullptr, sequenceHash[entryList.first()]);
} }
else { else {
m_windowFromGlobal = m_plugin->activeWindow(); m_windowFromGlobal = m_plugin->activeWindow();
@ -218,8 +225,10 @@ void AutoType::performAutoTypeFromGlobal(Entry* entry, const QString& sequence)
{ {
Q_ASSERT(m_inAutoType); Q_ASSERT(m_inAutoType);
m_plugin->raiseWindow(m_windowFromGlobal);
m_inAutoType = false; m_inAutoType = false;
performAutoType(entry, Q_NULLPTR, sequence, m_windowFromGlobal); performAutoType(entry, nullptr, sequence, m_windowFromGlobal);
} }
void AutoType::resetInAutoType() void AutoType::resetInAutoType()
@ -233,12 +242,12 @@ void AutoType::unloadPlugin()
{ {
if (m_executor) { if (m_executor) {
delete m_executor; delete m_executor;
m_executor = Q_NULLPTR; m_executor = nullptr;
} }
if (m_plugin) { if (m_plugin) {
m_plugin->unload(); m_plugin->unload();
m_plugin = Q_NULLPTR; m_plugin = nullptr;
} }
} }
@ -566,7 +575,7 @@ bool AutoType::windowMatches(const QString& windowTitle, const QString& windowPa
{ {
if (windowPattern.startsWith("//") && windowPattern.endsWith("//") && windowPattern.size() >= 4) { if (windowPattern.startsWith("//") && windowPattern.endsWith("//") && windowPattern.size() >= 4) {
QRegExp regExp(windowPattern.mid(2, windowPattern.size() - 4), Qt::CaseInsensitive, QRegExp::RegExp2); QRegExp regExp(windowPattern.mid(2, windowPattern.size() - 4), Qt::CaseInsensitive, QRegExp::RegExp2);
return regExp.exactMatch(windowTitle); return (regExp.indexIn(windowTitle) != -1);
} }
else { else {
return WildcardMatcher(windowTitle).match(windowPattern); return WildcardMatcher(windowTitle).match(windowPattern);

6
src/autotype/AutoType.h
View File

@ -22,8 +22,6 @@
#include <QStringList> #include <QStringList>
#include <QWidget> #include <QWidget>
#include "core/Global.h"
class AutoTypeAction; class AutoTypeAction;
class AutoTypeExecutor; class AutoTypeExecutor;
class AutoTypePlatformInterface; class AutoTypePlatformInterface;
@ -37,7 +35,7 @@ class AutoType : public QObject
public: public:
QStringList windowTitles(); QStringList windowTitles();
void performAutoType(const Entry* entry, QWidget* hideWindow = Q_NULLPTR, void performAutoType(const Entry* entry, QWidget* hideWindow = nullptr,
const QString& customSequence = QString(), WId window = 0); const QString& customSequence = QString(), WId window = 0);
bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers); bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers);
void unregisterGlobalShortcut(); void unregisterGlobalShortcut();
@ -62,7 +60,7 @@ private Q_SLOTS:
void unloadPlugin(); void unloadPlugin();
private: private:
explicit AutoType(QObject* parent = Q_NULLPTR, bool test = false); explicit AutoType(QObject* parent = nullptr, bool test = false);
~AutoType(); ~AutoType();
void loadPlugin(const QString& pluginPath); void loadPlugin(const QString& pluginPath);
bool parseActions(const QString& sequence, const Entry* entry, QList<AutoTypeAction*>& actions); bool parseActions(const QString& sequence, const Entry* entry, QList<AutoTypeAction*>& actions);

2
src/autotype/AutoTypeAction.h
View File

@ -66,7 +66,7 @@ public:
class KEEPASSX_EXPORT AutoTypeClearField : public AutoTypeAction class KEEPASSX_EXPORT AutoTypeClearField : public AutoTypeAction
{ {
public: public:
explicit AutoTypeClearField(); AutoTypeClearField();
AutoTypeAction* clone(); AutoTypeAction* clone();
void accept(AutoTypeExecutor* executor); void accept(AutoTypeExecutor* executor);
}; };

2
src/autotype/AutoTypePlatformPlugin.h
View File

@ -26,6 +26,7 @@ class AutoTypePlatformInterface
{ {
public: public:
virtual ~AutoTypePlatformInterface() {} virtual ~AutoTypePlatformInterface() {}
virtual bool isAvailable() = 0;
virtual QStringList windowTitles() = 0; virtual QStringList windowTitles() = 0;
virtual WId activeWindow() = 0; virtual WId activeWindow() = 0;
virtual QString activeWindowTitle() = 0; virtual QString activeWindowTitle() = 0;
@ -33,6 +34,7 @@ public:
virtual void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) = 0; virtual void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) = 0;
virtual int platformEventFilter(void* event) = 0; virtual int platformEventFilter(void* event) = 0;
virtual int initialTimeout() = 0; virtual int initialTimeout() = 0;
virtual bool raiseWindow(WId window) = 0;
virtual void unload() {} virtual void unload() {}
virtual AutoTypeExecutor* createExecutor() = 0; virtual AutoTypeExecutor* createExecutor() = 0;

4
src/autotype/AutoTypeSelectDialog.cpp
View File

@ -33,6 +33,8 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
, m_entryActivatedEmitted(false) , m_entryActivatedEmitted(false)
{ {
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
// Places the window on the active (virtual) desktop instead of where the main window is.
setAttribute(Qt::WA_X11BypassTransientForHint);
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint); setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
setWindowTitle(tr("Auto-Type - KeePassX")); setWindowTitle(tr("Auto-Type - KeePassX"));
setWindowIcon(filePath()->applicationIcon()); setWindowIcon(filePath()->applicationIcon());
@ -41,7 +43,7 @@ AutoTypeSelectDialog::AutoTypeSelectDialog(QWidget* parent)
resize(size); resize(size);
// move dialog to the center of the screen // move dialog to the center of the screen
QPoint screenCenter = QApplication::desktop()->screenGeometry(QCursor::pos()).center(); QPoint screenCenter = QApplication::desktop()->availableGeometry(QCursor::pos()).center();
move(screenCenter.x() - (size.width() / 2), screenCenter.y() - (size.height() / 2)); move(screenCenter.x() - (size.width() / 2), screenCenter.y() - (size.height() / 2));
QVBoxLayout* layout = new QVBoxLayout(this); QVBoxLayout* layout = new QVBoxLayout(this);

4
src/autotype/AutoTypeSelectDialog.h
View File

@ -22,8 +22,6 @@
#include <QDialog> #include <QDialog>
#include <QHash> #include <QHash>
#include "core/Global.h"
class AutoTypeSelectView; class AutoTypeSelectView;
class Entry; class Entry;
@ -32,7 +30,7 @@ class AutoTypeSelectDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
explicit AutoTypeSelectDialog(QWidget* parent = Q_NULLPTR); explicit AutoTypeSelectDialog(QWidget* parent = nullptr);
void setEntries(const QList<Entry*>& entries, const QHash<Entry*, QString>& sequences); void setEntries(const QList<Entry*>& entries, const QHash<Entry*, QString>& sequences);
Q_SIGNALS: Q_SIGNALS:

5
src/autotype/AutoTypeSelectView.h
View File

@ -18,7 +18,6 @@
#ifndef KEEPASSX_AUTOTYPESELECTVIEW_H #ifndef KEEPASSX_AUTOTYPESELECTVIEW_H
#define KEEPASSX_AUTOTYPESELECTVIEW_H #define KEEPASSX_AUTOTYPESELECTVIEW_H
#include "core/Global.h"
#include "gui/entry/EntryView.h" #include "gui/entry/EntryView.h"
class Entry; class Entry;
@ -28,10 +27,10 @@ class AutoTypeSelectView : public EntryView
Q_OBJECT Q_OBJECT
public: public:
explicit AutoTypeSelectView(QWidget* parent = Q_NULLPTR); explicit AutoTypeSelectView(QWidget* parent = nullptr);
protected: protected:
void mouseMoveEvent(QMouseEvent* event) Q_DECL_OVERRIDE; void mouseMoveEvent(QMouseEvent* event) override;
private Q_SLOTS: private Q_SLOTS:
void selectFirstEntry(); void selectFirstEntry();

13
src/autotype/CMakeLists.txt
View File

@ -1,11 +1,12 @@
if(Q_WS_X11) if(UNIX AND NOT APPLE)
find_package(X11) find_package(X11)
if(PRINT_SUMMARY) find_package(Qt5X11Extras 5.2)
add_feature_info(libXtest X11_XTest_FOUND "The X11 XTEST Protocol library is required for auto-type") add_feature_info(libXi X11_Xi_FOUND "The X11 Xi Protocol library is required for auto-type")
endif() add_feature_info(libXtest X11_XTest_FOUND "The X11 XTEST Protocol library is required for auto-type")
add_feature_info(Qt5X11Extras Qt5X11Extras_FOUND "The Qt5X11Extras library is required for auto-type")
if(X11_FOUND AND X11_XTest_FOUND) if(X11_FOUND AND X11_Xi_FOUND AND X11_XTest_FOUND AND Qt5X11Extras_FOUND)
add_subdirectory(x11) add_subdirectory(xcb)
endif() endif()
endif() endif()

8
src/autotype/ShortcutWidget.h
View File

@ -20,21 +20,19 @@
#include <QLineEdit> #include <QLineEdit>
#include "core/Global.h"
class ShortcutWidget : public QLineEdit class ShortcutWidget : public QLineEdit
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit ShortcutWidget(QWidget* parent = Q_NULLPTR); explicit ShortcutWidget(QWidget* parent = nullptr);
Qt::Key key() const; Qt::Key key() const;
Qt::KeyboardModifiers modifiers() const; Qt::KeyboardModifiers modifiers() const;
void setShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers); void setShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers);
protected: protected:
void keyPressEvent(QKeyEvent* event) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent* event) override;
void keyReleaseEvent(QKeyEvent* event) Q_DECL_OVERRIDE; void keyReleaseEvent(QKeyEvent* event) override;
private: private:
void keyEvent(QKeyEvent* event); void keyEvent(QKeyEvent* event);

10
src/autotype/WindowSelectComboBox.h
View File

@ -20,19 +20,17 @@
#include <QComboBox> #include <QComboBox>
#include "core/Global.h"
class WindowSelectComboBox : public QComboBox class WindowSelectComboBox : public QComboBox
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit WindowSelectComboBox(QWidget* parent = Q_NULLPTR); explicit WindowSelectComboBox(QWidget* parent = nullptr);
void refreshWindowList(); void refreshWindowList();
void showPopup() Q_DECL_OVERRIDE; void showPopup() override;
QSize sizeHint() const Q_DECL_OVERRIDE; QSize sizeHint() const override;
QSize minimumSizeHint() const Q_DECL_OVERRIDE; QSize minimumSizeHint() const override;
}; };
#endif // KEEPASSX_WINDOWSELECTCOMBOBOX_H #endif // KEEPASSX_WINDOWSELECTCOMBOBOX_H

14
src/autotype/test/AutoTypeTest.cpp
View File

@ -17,6 +17,11 @@
#include "AutoTypeTest.h" #include "AutoTypeTest.h"
bool AutoTypePlatformTest::isAvailable()
{
return true;
}
QString AutoTypePlatformTest::keyToString(Qt::Key key) QString AutoTypePlatformTest::keyToString(Qt::Key key)
{ {
return QString("[Key0x%1]").arg(key, 0, 16); return QString("[Key0x%1]").arg(key, 0, 16);
@ -103,6 +108,13 @@ int AutoTypePlatformTest::initialTimeout()
return 0; return 0;
} }
bool AutoTypePlatformTest::raiseWindow(WId window)
{
Q_UNUSED(window);
return false;
}
AutoTypeExecturorTest::AutoTypeExecturorTest(AutoTypePlatformTest* platform) AutoTypeExecturorTest::AutoTypeExecturorTest(AutoTypePlatformTest* platform)
: m_platform(platform) : m_platform(platform)
{ {
@ -117,5 +129,3 @@ void AutoTypeExecturorTest::execKey(AutoTypeKey* action)
{ {
m_platform->addActionKey(action); m_platform->addActionKey(action);
} }
Q_EXPORT_PLUGIN2(keepassx-autotype-test, AutoTypePlatformTest)

34
src/autotype/test/AutoTypeTest.h
View File

@ -23,32 +23,34 @@
#include "autotype/AutoTypePlatformPlugin.h" #include "autotype/AutoTypePlatformPlugin.h"
#include "autotype/AutoTypeAction.h" #include "autotype/AutoTypeAction.h"
#include "autotype/test/AutoTypeTestInterface.h" #include "autotype/test/AutoTypeTestInterface.h"
#include "core/Global.h"
class AutoTypePlatformTest : public QObject, class AutoTypePlatformTest : public QObject,
public AutoTypePlatformInterface, public AutoTypePlatformInterface,
public AutoTypeTestInterface public AutoTypeTestInterface
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.keepassx.AutoTypePlatformInterface")
Q_INTERFACES(AutoTypePlatformInterface AutoTypeTestInterface) Q_INTERFACES(AutoTypePlatformInterface AutoTypeTestInterface)
public: public:
QString keyToString(Qt::Key key); QString keyToString(Qt::Key key) override;
QStringList windowTitles(); bool isAvailable() override;
WId activeWindow(); QStringList windowTitles() override;
QString activeWindowTitle(); WId activeWindow() override;
bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers); QString activeWindowTitle() override;
void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers); bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
int platformEventFilter(void* event); void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
int initialTimeout(); int platformEventFilter(void* event) override;
AutoTypeExecutor* createExecutor(); int initialTimeout() override;
bool raiseWindow(WId window) override;
AutoTypeExecutor* createExecutor() override;
void setActiveWindowTitle(const QString& title); void setActiveWindowTitle(const QString& title) override;
QString actionChars(); QString actionChars() override;
int actionCount(); int actionCount() override;
void clearActions(); void clearActions() override;
void addActionChar(AutoTypeChar* action); void addActionChar(AutoTypeChar* action);
void addActionKey(AutoTypeKey* action); void addActionKey(AutoTypeKey* action);
@ -67,8 +69,8 @@ class AutoTypeExecturorTest : public AutoTypeExecutor
public: public:
explicit AutoTypeExecturorTest(AutoTypePlatformTest* platform); explicit AutoTypeExecturorTest(AutoTypePlatformTest* platform);
void execChar(AutoTypeChar* action); void execChar(AutoTypeChar* action) override;
void execKey(AutoTypeKey* action); void execKey(AutoTypeKey* action) override;
private: private:
AutoTypePlatformTest* const m_platform; AutoTypePlatformTest* const m_platform;

8
src/autotype/test/CMakeLists.txt
View File

@ -2,11 +2,5 @@ set(autotype_test_SOURCES
AutoTypeTest.cpp AutoTypeTest.cpp
) )
set(autotype_test_MOC
AutoTypeTest.h
)
qt4_wrap_cpp(autotype_test_SOURCES ${autotype_test_MOC})
add_library(keepassx-autotype-test MODULE ${autotype_test_SOURCES}) add_library(keepassx-autotype-test MODULE ${autotype_test_SOURCES})
target_link_libraries(keepassx-autotype-test testautotype ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) target_link_libraries(keepassx-autotype-test testautotype Qt5::Core Qt5::Widgets)

17
src/autotype/x11/CMakeLists.txt
View File

@ -1,17 +0,0 @@
include_directories(SYSTEM ${X11_X11_INCLUDE_PATH})
set(autotype_X11_SOURCES
AutoTypeX11.cpp
)
set(autotype_X11_MOC
AutoTypeX11.h
)
qt4_wrap_cpp(autotype_X11_SOURCES ${autotype_X11_MOC})
add_library(keepassx-autotype-x11 MODULE ${autotype_X11_SOURCES})
target_link_libraries(keepassx-autotype-x11 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${X11_X11_LIB} ${X11_XTest_LIB})
install(TARGETS keepassx-autotype-x11
BUNDLE DESTINATION . COMPONENT Runtime
LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR} COMPONENT Runtime)

215
src/autotype/x11/AutoTypeX11.cpp → src/autotype/xcb/AutoTypeXCB.cpp
View File

@ -16,25 +16,28 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "AutoTypeX11.h" #include "AutoTypeXCB.h"
#include "KeySymMap.h" #include "KeySymMap.h"
#include "core/Tools.h"
#include <time.h> #include <time.h>
#include <xcb/xcb.h>
bool AutoTypePlatformX11::m_catchXErrors = false; bool AutoTypePlatformX11::m_catchXErrors = false;
bool AutoTypePlatformX11::m_xErrorOccured = false; bool AutoTypePlatformX11::m_xErrorOccured = false;
int (*AutoTypePlatformX11::m_oldXErrorHandler)(Display*, XErrorEvent*) = Q_NULLPTR; int (*AutoTypePlatformX11::m_oldXErrorHandler)(Display*, XErrorEvent*) = nullptr;
AutoTypePlatformX11::AutoTypePlatformX11() AutoTypePlatformX11::AutoTypePlatformX11()
{ {
m_dpy = QX11Info::display(); m_dpy = QX11Info::display();
m_rootWindow = QX11Info::appRootWindow(); m_rootWindow = QX11Info::appRootWindow();
m_atomWmState = XInternAtom(m_dpy, "WM_STATE", true); m_atomWmState = XInternAtom(m_dpy, "WM_STATE", True);
m_atomWmName = XInternAtom(m_dpy, "WM_NAME", true); m_atomWmName = XInternAtom(m_dpy, "WM_NAME", True);
m_atomNetWmName = XInternAtom(m_dpy, "_NET_WM_NAME", true); m_atomNetWmName = XInternAtom(m_dpy, "_NET_WM_NAME", True);
m_atomString = XInternAtom(m_dpy, "STRING", true); m_atomString = XInternAtom(m_dpy, "STRING", True);
m_atomUtf8String = XInternAtom(m_dpy, "UTF8_STRING", true); m_atomUtf8String = XInternAtom(m_dpy, "UTF8_STRING", True);
m_atomNetActiveWindow = XInternAtom(m_dpy, "_NET_ACTIVE_WINDOW", True);
m_classBlacklist << "desktop_window" << "gnome-panel"; // Gnome m_classBlacklist << "desktop_window" << "gnome-panel"; // Gnome
m_classBlacklist << "kdesktop" << "kicker"; // KDE 3 m_classBlacklist << "kdesktop" << "kicker"; // KDE 3
@ -45,8 +48,8 @@ AutoTypePlatformX11::AutoTypePlatformX11()
m_currentGlobalKey = static_cast<Qt::Key>(0); m_currentGlobalKey = static_cast<Qt::Key>(0);
m_currentGlobalModifiers = 0; m_currentGlobalModifiers = 0;
m_keysymTable = Q_NULLPTR; m_keysymTable = nullptr;
m_xkb = Q_NULLPTR; m_xkb = nullptr;
m_remapKeycode = 0; m_remapKeycode = 0;
m_currentRemapKeysym = NoSymbol; m_currentRemapKeysym = NoSymbol;
m_modifierMask = ControlMask | ShiftMask | Mod1Mask | Mod4Mask; m_modifierMask = ControlMask | ShiftMask | Mod1Mask | Mod4Mask;
@ -56,6 +59,31 @@ AutoTypePlatformX11::AutoTypePlatformX11()
updateKeymap(); updateKeymap();
} }
bool AutoTypePlatformX11::isAvailable()
{
int ignore;
if (!XQueryExtension(m_dpy, "XInputExtension", &ignore, &ignore, &ignore)) {
return false;
}
if (!XQueryExtension(m_dpy, "XTEST", &ignore, &ignore, &ignore)) {
return false;
}
if (!m_xkb) {
XkbDescPtr kbd = getKeyboard();
if (!kbd) {
return false;
}
XkbFreeKeyboard(kbd, XkbAllComponentsMask, True);
}
return true;
}
void AutoTypePlatformX11::unload() void AutoTypePlatformX11::unload()
{ {
// Restore the KeyboardMapping to its original state. // Restore the KeyboardMapping to its original state.
@ -93,7 +121,7 @@ WId AutoTypePlatformX11::activeWindow()
Window root; Window root;
Window parent; Window parent;
Window* children = Q_NULLPTR; Window* children = nullptr;
unsigned int numChildren; unsigned int numChildren;
tree = XQueryTree(m_dpy, window, &root, &parent, &children, &numChildren); tree = XQueryTree(m_dpy, window, &root, &parent, &children, &numChildren);
window = parent; window = parent;
@ -116,12 +144,12 @@ bool AutoTypePlatformX11::registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifi
uint nativeModifiers = qtToNativeModifiers(modifiers); uint nativeModifiers = qtToNativeModifiers(modifiers);
startCatchXErrors(); startCatchXErrors();
XGrabKey(m_dpy, keycode, nativeModifiers, m_rootWindow, true, GrabModeAsync, GrabModeAsync); XGrabKey(m_dpy, keycode, nativeModifiers, m_rootWindow, True, GrabModeAsync, GrabModeAsync);
XGrabKey(m_dpy, keycode, nativeModifiers | Mod2Mask, m_rootWindow, true, GrabModeAsync, XGrabKey(m_dpy, keycode, nativeModifiers | Mod2Mask, m_rootWindow, True, GrabModeAsync,
GrabModeAsync); GrabModeAsync);
XGrabKey(m_dpy, keycode, nativeModifiers | LockMask, m_rootWindow, true, GrabModeAsync, XGrabKey(m_dpy, keycode, nativeModifiers | LockMask, m_rootWindow, True, GrabModeAsync,
GrabModeAsync); GrabModeAsync);
XGrabKey(m_dpy, keycode, nativeModifiers | Mod2Mask | LockMask, m_rootWindow, true, XGrabKey(m_dpy, keycode, nativeModifiers | Mod2Mask | LockMask, m_rootWindow, True,
GrabModeAsync, GrabModeAsync); GrabModeAsync, GrabModeAsync);
stopCatchXErrors(); stopCatchXErrors();
@ -160,7 +188,7 @@ uint AutoTypePlatformX11::qtToNativeModifiers(Qt::KeyboardModifiers modifiers)
void AutoTypePlatformX11::unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) void AutoTypePlatformX11::unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers)
{ {
KeyCode keycode = XKeysymToKeycode(m_dpy, keyToKeySym(key)); KeyCode keycode = XKeysymToKeycode(m_dpy, charToKeySym(key));
uint nativeModifiers = qtToNativeModifiers(modifiers); uint nativeModifiers = qtToNativeModifiers(modifiers);
XUngrabKey(m_dpy, keycode, nativeModifiers, m_rootWindow); XUngrabKey(m_dpy, keycode, nativeModifiers, m_rootWindow);
@ -176,22 +204,42 @@ void AutoTypePlatformX11::unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModi
int AutoTypePlatformX11::platformEventFilter(void* event) int AutoTypePlatformX11::platformEventFilter(void* event)
{ {
XEvent* xevent = static_cast<XEvent*>(event); xcb_generic_event_t* genericEvent = static_cast<xcb_generic_event_t*>(event);
quint8 type = genericEvent->response_type & 0x7f;
if ((xevent->type == KeyPress || xevent->type == KeyRelease) if (type == XCB_KEY_PRESS || type == XCB_KEY_RELEASE) {
&& m_currentGlobalKey xcb_key_press_event_t* keyPressEvent = static_cast<xcb_key_press_event_t*>(event);
&& xevent->xkey.keycode == m_currentGlobalKeycode if (keyPressEvent->detail == m_currentGlobalKeycode
&& (xevent->xkey.state & m_modifierMask) == m_currentGlobalNativeModifiers && (keyPressEvent->state & m_modifierMask) == m_currentGlobalNativeModifiers
&& !QApplication::focusWidget() && (!QApplication::activeWindow() || QApplication::activeWindow()->isMinimized())
&& m_loaded) { && m_loaded) {
if (xevent->type == KeyPress) { if (type == XCB_KEY_PRESS) {
Q_EMIT globalShortcutTriggered(); Q_EMIT globalShortcutTriggered();
}
return 1;
} }
return 1;
} }
if (xevent->type == MappingNotify && m_loaded) { else if (type == XCB_MAPPING_NOTIFY) {
XRefreshKeyboardMapping(reinterpret_cast<XMappingEvent*>(xevent)); xcb_mapping_notify_event_t* mappingNotifyEvent = static_cast<xcb_mapping_notify_event_t*>(event);
updateKeymap(); if (mappingNotifyEvent->request == XCB_MAPPING_KEYBOARD
|| mappingNotifyEvent->request == XCB_MAPPING_MODIFIER)
{
XMappingEvent xMappingEvent;
memset(&xMappingEvent, 0, sizeof(xMappingEvent));
xMappingEvent.type = MappingNotify;
xMappingEvent.display = m_dpy;
if (mappingNotifyEvent->request == XCB_MAPPING_KEYBOARD) {
xMappingEvent.request = MappingKeyboard;
}
else {
xMappingEvent.request = MappingModifier;
}
xMappingEvent.first_keycode = mappingNotifyEvent->first_keycode;
xMappingEvent.count = mappingNotifyEvent->count;
XRefreshKeyboardMapping(&xMappingEvent);
updateKeymap();
}
} }
return -1; return -1;
@ -210,11 +258,11 @@ QString AutoTypePlatformX11::windowTitle(Window window, bool useBlacklist)
int format; int format;
unsigned long nitems; unsigned long nitems;
unsigned long after; unsigned long after;
unsigned char* data = Q_NULLPTR; unsigned char* data = nullptr;
// the window manager spec says we should read _NET_WM_NAME first, then fall back to WM_NAME // the window manager spec says we should read _NET_WM_NAME first, then fall back to WM_NAME
int retVal = XGetWindowProperty(m_dpy, window, m_atomNetWmName, 0, 1000, false, m_atomUtf8String, int retVal = XGetWindowProperty(m_dpy, window, m_atomNetWmName, 0, 1000, False, m_atomUtf8String,
&type, &format, &nitems, &after, &data); &type, &format, &nitems, &after, &data);
if ((retVal == 0) && data) { if ((retVal == 0) && data) {
@ -224,7 +272,7 @@ QString AutoTypePlatformX11::windowTitle(Window window, bool useBlacklist)
XTextProperty textProp; XTextProperty textProp;
retVal = XGetTextProperty(m_dpy, window, &textProp, m_atomWmName); retVal = XGetTextProperty(m_dpy, window, &textProp, m_atomWmName);
if ((retVal != 0) && textProp.value) { if ((retVal != 0) && textProp.value) {
char** textList = Q_NULLPTR; char** textList = nullptr;
int count; int count;
if (textProp.encoding == m_atomUtf8String) { if (textProp.encoding == m_atomUtf8String) {
@ -276,8 +324,8 @@ QString AutoTypePlatformX11::windowClassName(Window window)
QString className; QString className;
XClassHint wmClass; XClassHint wmClass;
wmClass.res_name = Q_NULLPTR; wmClass.res_name = nullptr;
wmClass.res_class = Q_NULLPTR; wmClass.res_class = nullptr;
if (XGetClassHint(m_dpy, window, &wmClass) && wmClass.res_name) { if (XGetClassHint(m_dpy, window, &wmClass) && wmClass.res_name) {
className = QString::fromLocal8Bit(wmClass.res_name); className = QString::fromLocal8Bit(wmClass.res_name);
@ -316,7 +364,7 @@ QStringList AutoTypePlatformX11::windowTitlesRecursive(Window window)
Window root; Window root;
Window parent; Window parent;
Window* children = Q_NULLPTR; Window* children = nullptr;
unsigned int numChildren; unsigned int numChildren;
if (XQueryTree(m_dpy, window, &root, &parent, &children, &numChildren) && children) { if (XQueryTree(m_dpy, window, &root, &parent, &children, &numChildren) && children) {
for (uint i = 0; i < numChildren; i++) { for (uint i = 0; i < numChildren; i++) {
@ -336,8 +384,8 @@ bool AutoTypePlatformX11::isTopLevelWindow(Window window)
int format; int format;
unsigned long nitems; unsigned long nitems;
unsigned long after; unsigned long after;
unsigned char* data = Q_NULLPTR; unsigned char* data = nullptr;
int retVal = XGetWindowProperty(m_dpy, window, m_atomWmState, 0, 0, false, AnyPropertyType, &type, &format, int retVal = XGetWindowProperty(m_dpy, window, m_atomWmState, 0, 0, False, AnyPropertyType, &type, &format,
&nitems, &after, &data); &nitems, &after, &data);
if (data) { if (data) {
XFree(data); XFree(data);
@ -357,9 +405,9 @@ KeySym AutoTypePlatformX11::charToKeySym(const QChar& ch)
} }
/* mapping table generated from keysymdef.h */ /* mapping table generated from keysymdef.h */
const uint* match = qBinaryFind(m_unicodeToKeysymKeys, const uint* match = Tools::binaryFind(m_unicodeToKeysymKeys,
m_unicodeToKeysymKeys + m_unicodeToKeysymLen, m_unicodeToKeysymKeys + m_unicodeToKeysymLen,
unicode); unicode);
int index = match - m_unicodeToKeysymKeys; int index = match - m_unicodeToKeysymKeys;
if (index != m_unicodeToKeysymLen) { if (index != m_unicodeToKeysymLen) {
return m_unicodeToKeysymValues[index]; return m_unicodeToKeysymValues[index];
@ -436,21 +484,10 @@ void AutoTypePlatformX11::updateKeymap()
int mod_index, mod_key; int mod_index, mod_key;
XModifierKeymap *modifiers; XModifierKeymap *modifiers;
if (m_xkb != NULL) XkbFreeKeyboard(m_xkb, XkbAllComponentsMask, True); if (m_xkb) {
XkbFreeKeyboard(m_xkb, XkbAllComponentsMask, True);
XDeviceInfo* devices;
int num_devices;
XID keyboard_id = XkbUseCoreKbd;
devices = XListInputDevices(m_dpy, &num_devices);
for (int i = 0; i < num_devices; i++) {
if (QString(devices[i].name) == "Virtual core XTEST keyboard") {
keyboard_id = devices[i].id;
break;
}
} }
m_xkb = getKeyboard();
m_xkb = XkbGetKeyboard(m_dpy, XkbCompatMapMask | XkbGeometryMask, keyboard_id);
XDisplayKeycodes(m_dpy, &m_minKeycode, &m_maxKeycode); XDisplayKeycodes(m_dpy, &m_minKeycode, &m_maxKeycode);
if (m_keysymTable != NULL) XFree(m_keysymTable); if (m_keysymTable != NULL) XFree(m_keysymTable);
@ -491,7 +528,7 @@ void AutoTypePlatformX11::updateKeymap()
timespec ts; timespec ts;
ts.tv_sec = 0; ts.tv_sec = 0;
ts.tv_nsec = 30 * 1000 * 1000; ts.tv_nsec = 30 * 1000 * 1000;
nanosleep(&ts, Q_NULLPTR); nanosleep(&ts, nullptr);
} }
bool AutoTypePlatformX11::isRemapKeycodeValid() bool AutoTypePlatformX11::isRemapKeycodeValid()
@ -519,7 +556,7 @@ void AutoTypePlatformX11::stopCatchXErrors()
{ {
Q_ASSERT(m_catchXErrors); Q_ASSERT(m_catchXErrors);
XSync(m_dpy, false); XSync(m_dpy, False);
XSetErrorHandler(m_oldXErrorHandler); XSetErrorHandler(m_oldXErrorHandler);
m_catchXErrors = false; m_catchXErrors = false;
} }
@ -536,6 +573,27 @@ int AutoTypePlatformX11::x11ErrorHandler(Display* display, XErrorEvent* error)
return 1; return 1;
} }
XkbDescPtr AutoTypePlatformX11::getKeyboard()
{
int num_devices;
XID keyboard_id = XkbUseCoreKbd;
XDeviceInfo* devices = XListInputDevices(m_dpy, &num_devices);
if (!devices) {
return nullptr;
}
for (int i = 0; i < num_devices; i++) {
if (QString(devices[i].name) == "Virtual core XTEST keyboard") {
keyboard_id = devices[i].id;
break;
}
}
XFreeDeviceList(devices);
return XkbGetKeyboard(m_dpy, XkbCompatMapMask | XkbGeometryMask, keyboard_id);
}
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
// The following code is taken from xvkbd 3.0 and has been slightly modified. // The following code is taken from xvkbd 3.0 and has been slightly modified.
// -------------------------------------------------------------------------- // --------------------------------------------------------------------------
@ -568,11 +626,18 @@ int AutoTypePlatformX11::AddKeysym(KeySym keysym)
*/ */
void AutoTypePlatformX11::SendEvent(XKeyEvent* event, int event_type) void AutoTypePlatformX11::SendEvent(XKeyEvent* event, int event_type)
{ {
XSync(event->display, FALSE); XSync(event->display, False);
int (*oldHandler) (Display*, XErrorEvent*) = XSetErrorHandler(MyErrorHandler); int (*oldHandler) (Display*, XErrorEvent*) = XSetErrorHandler(MyErrorHandler);
event->type = event_type; event->type = event_type;
XTestFakeKeyEvent(event->display, event->keycode, event->type == KeyPress, 0); Bool press;
if (event->type == KeyPress) {
press = True;
}
else {
press = False;
}
XTestFakeKeyEvent(event->display, event->keycode, press, 0);
XFlush(event->display); XFlush(event->display);
XSetErrorHandler(oldHandler); XSetErrorHandler(oldHandler);
@ -670,7 +735,7 @@ void AutoTypePlatformX11::SendKeyPressedEvent(KeySym keysym)
event.y = 1; event.y = 1;
event.x_root = 1; event.x_root = 1;
event.y_root = 1; event.y_root = 1;
event.same_screen = TRUE; event.same_screen = True;
Window root, child; Window root, child;
int root_x, root_y, x, y; int root_x, root_y, x, y;
@ -770,4 +835,36 @@ int AutoTypePlatformX11::initialTimeout()
return 500; return 500;
} }
Q_EXPORT_PLUGIN2(keepassx-autotype-x11, AutoTypePlatformX11) bool AutoTypePlatformX11::raiseWindow(WId window)
{
if (m_atomNetActiveWindow == None) {
return false;
}
XRaiseWindow(m_dpy, window);
XEvent event;
event.xclient.type = ClientMessage;
event.xclient.serial = 0;
event.xclient.send_event = True;
event.xclient.window = window;
event.xclient.message_type = m_atomNetActiveWindow;
event.xclient.format = 32;
event.xclient.data.l[0] = 1; // FromApplication
event.xclient.data.l[1] = QX11Info::appUserTime();
QWidget* activeWindow = QApplication::activeWindow();
if (activeWindow) {
event.xclient.data.l[2] = activeWindow->internalWinId();
}
else {
event.xclient.data.l[2] = 0;
}
event.xclient.data.l[3] = 0;
event.xclient.data.l[4] = 0;
XSendEvent(m_dpy, m_rootWindow, False,
SubstructureRedirectMask | SubstructureNotifyMask,
&event);
XFlush(m_dpy);
return true;
}

34
src/autotype/x11/AutoTypeX11.h → src/autotype/xcb/AutoTypeXCB.h
View File

@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef KEEPASSX_AUTOTYPEX11_H #ifndef KEEPASSX_AUTOTYPEXCB_H
#define KEEPASSX_AUTOTYPEX11_H #define KEEPASSX_AUTOTYPEXCB_H
#include <QApplication> #include <QApplication>
#include <QSet> #include <QSet>
@ -31,26 +31,28 @@
#include "autotype/AutoTypePlatformPlugin.h" #include "autotype/AutoTypePlatformPlugin.h"
#include "autotype/AutoTypeAction.h" #include "autotype/AutoTypeAction.h"
#include "core/Global.h"
#define N_MOD_INDICES (Mod5MapIndex + 1) #define N_MOD_INDICES (Mod5MapIndex + 1)
class AutoTypePlatformX11 : public QObject, public AutoTypePlatformInterface class AutoTypePlatformX11 : public QObject, public AutoTypePlatformInterface
{ {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "org.keepassx.AutoTypePlatformX11")
Q_INTERFACES(AutoTypePlatformInterface) Q_INTERFACES(AutoTypePlatformInterface)
public: public:
AutoTypePlatformX11(); AutoTypePlatformX11();
void unload() Q_DECL_OVERRIDE; bool isAvailable() override;
QStringList windowTitles(); void unload() override;
WId activeWindow(); QStringList windowTitles() override;
QString activeWindowTitle(); WId activeWindow() override;
bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers); QString activeWindowTitle() override;
void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers); bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
int platformEventFilter(void* event); void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) override;
int initialTimeout(); int platformEventFilter(void* event) override;
AutoTypeExecutor* createExecutor(); int initialTimeout() override;
bool raiseWindow(WId window) override;
AutoTypeExecutor* createExecutor() override;
KeySym charToKeySym(const QChar& ch); KeySym charToKeySym(const QChar& ch);
KeySym keyToKeySym(Qt::Key key); KeySym keyToKeySym(Qt::Key key);
@ -71,6 +73,7 @@ private:
void stopCatchXErrors(); void stopCatchXErrors();
static int x11ErrorHandler(Display* display, XErrorEvent* error); static int x11ErrorHandler(Display* display, XErrorEvent* error);
XkbDescPtr getKeyboard();
void updateKeymap(); void updateKeymap();
bool isRemapKeycodeValid(); bool isRemapKeycodeValid();
int AddKeysym(KeySym keysym); int AddKeysym(KeySym keysym);
@ -89,6 +92,7 @@ private:
Atom m_atomNetWmName; Atom m_atomNetWmName;
Atom m_atomString; Atom m_atomString;
Atom m_atomUtf8String; Atom m_atomUtf8String;
Atom m_atomNetActiveWindow;
QSet<QString> m_classBlacklist; QSet<QString> m_classBlacklist;
Qt::Key m_currentGlobalKey; Qt::Key m_currentGlobalKey;
Qt::KeyboardModifiers m_currentGlobalModifiers; Qt::KeyboardModifiers m_currentGlobalModifiers;
@ -120,11 +124,11 @@ class AutoTypeExecturorX11 : public AutoTypeExecutor
public: public:
explicit AutoTypeExecturorX11(AutoTypePlatformX11* platform); explicit AutoTypeExecturorX11(AutoTypePlatformX11* platform);
void execChar(AutoTypeChar* action); void execChar(AutoTypeChar* action) override;
void execKey(AutoTypeKey* action); void execKey(AutoTypeKey* action) override;
private: private:
AutoTypePlatformX11* const m_platform; AutoTypePlatformX11* const m_platform;
}; };
#endif // KEEPASSX_AUTOTYPEX11_H #endif // KEEPASSX_AUTOTYPEXCB_H

11
src/autotype/xcb/CMakeLists.txt Normal file
View File

@ -0,0 +1,11 @@
include_directories(SYSTEM ${X11_X11_INCLUDE_PATH})
set(autotype_XCB_SOURCES
AutoTypeXCB.cpp
)
add_library(keepassx-autotype-xcb MODULE ${autotype_XCB_SOURCES})
target_link_libraries(keepassx-autotype-xcb Qt5::Core Qt5::Widgets Qt5::X11Extras ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_XTest_LIB})
install(TARGETS keepassx-autotype-xcb
BUNDLE DESTINATION . COMPONENT Runtime
LIBRARY DESTINATION ${PLUGIN_INSTALL_DIR} COMPONENT Runtime)

0
src/autotype/x11/KeySymMap.h → src/autotype/xcb/KeySymMap.h
View File

0
src/autotype/x11/keysymmap.py → src/autotype/xcb/keysymmap.py
View File

2
src/config-keepassx.h.cmake
View File

@ -16,6 +16,4 @@
#cmakedefine HAVE_RLIMIT_CORE 1 #cmakedefine HAVE_RLIMIT_CORE 1
#cmakedefine HAVE_PT_DENY_ATTACH 1 #cmakedefine HAVE_PT_DENY_ATTACH 1
#cmakedefine GCRYPT_HAS_SALSA20
#endif // KEEPASSX_CONFIG_KEEPASSX_H #endif // KEEPASSX_CONFIG_KEEPASSX_H

4
src/core/AutoTypeAssociations.h
View File

@ -20,8 +20,6 @@
#include <QObject> #include <QObject>
#include "core/Global.h"
class AutoTypeAssociations : public QObject class AutoTypeAssociations : public QObject
{ {
Q_OBJECT Q_OBJECT
@ -36,7 +34,7 @@ public:
bool operator!=(const AutoTypeAssociations::Association& other) const; bool operator!=(const AutoTypeAssociations::Association& other) const;
}; };
explicit AutoTypeAssociations(QObject* parent = Q_NULLPTR); explicit AutoTypeAssociations(QObject* parent = nullptr);
void copyDataFrom(const AutoTypeAssociations* other); void copyDataFrom(const AutoTypeAssociations* other);
void add(const AutoTypeAssociations::Association& association); void add(const AutoTypeAssociations::Association& association);
void remove(int index); void remove(int index);

8
src/core/Config.cpp
View File

@ -18,12 +18,12 @@
#include "Config.h" #include "Config.h"
#include <QCoreApplication> #include <QCoreApplication>
#include <QDesktopServices>
#include <QDir> #include <QDir>
#include <QSettings> #include <QSettings>
#include <QStandardPaths>
#include <QTemporaryFile> #include <QTemporaryFile>
Config* Config::m_instance(Q_NULLPTR); Config* Config::m_instance(nullptr);
QVariant Config::get(const QString& key) QVariant Config::get(const QString& key)
{ {
@ -53,7 +53,7 @@ Config::Config(QObject* parent)
QString homePath = QDir::homePath(); QString homePath = QDir::homePath();
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) #if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
// we can't use QDesktopServices on X11 as it uses XDG_DATA_HOME instead of XDG_CONFIG_HOME // we can't use QStandardPaths on X11 as it uses XDG_DATA_HOME instead of XDG_CONFIG_HOME
QByteArray env = qgetenv("XDG_CONFIG_HOME"); QByteArray env = qgetenv("XDG_CONFIG_HOME");
if (env.isEmpty()) { if (env.isEmpty()) {
userPath = homePath; userPath = homePath;
@ -70,7 +70,7 @@ Config::Config(QObject* parent)
userPath += "/keepassx/"; userPath += "/keepassx/";
#else #else
userPath = QDir::fromNativeSeparators(QDesktopServices::storageLocation(QDesktopServices::DataLocation)); userPath = QDir::fromNativeSeparators(QStandardPaths::writableLocation(QStandardPaths::DataLocation));
// storageLocation() appends the application name ("/keepassx") to the end // storageLocation() appends the application name ("/keepassx") to the end
userPath += "/"; userPath += "/";
#endif #endif

2
src/core/Config.h
View File

@ -21,8 +21,6 @@
#include <QScopedPointer> #include <QScopedPointer>
#include <QVariant> #include <QVariant>
#include "core/Global.h"
class QSettings; class QSettings;
class Config : public QObject class Config : public QObject

9
src/core/Database.cpp
View File

@ -23,7 +23,6 @@
#include "core/Group.h" #include "core/Group.h"
#include "core/Metadata.h" #include "core/Metadata.h"
#include "core/Tools.h"
#include "crypto/Random.h" #include "crypto/Random.h"
#include "format/KeePass2.h" #include "format/KeePass2.h"
@ -105,7 +104,7 @@ Entry* Database::recFindEntry(const Uuid& uuid, Group* group)
} }
} }
return Q_NULLPTR; return nullptr;
} }
Group* Database::resolveGroup(const Uuid& uuid) Group* Database::resolveGroup(const Uuid& uuid)
@ -126,7 +125,7 @@ Group* Database::recFindGroup(const Uuid& uuid, Group* group)
} }
} }
return Q_NULLPTR; return nullptr;
} }
QList<DeletedObject> Database::deletedObjects() QList<DeletedObject> Database::deletedObjects()
@ -143,7 +142,7 @@ void Database::addDeletedObject(const DeletedObject& delObj)
void Database::addDeletedObject(const Uuid& uuid) void Database::addDeletedObject(const Uuid& uuid)
{ {
DeletedObject delObj; DeletedObject delObj;
delObj.deletionTime = Tools::currentDateTimeUtc(); delObj.deletionTime = QDateTime::currentDateTimeUtc();
delObj.uuid = uuid; delObj.uuid = uuid;
addDeletedObject(delObj); addDeletedObject(delObj);
@ -223,7 +222,7 @@ bool Database::setKey(const CompositeKey& key, const QByteArray& transformSeed,
m_data.transformedMasterKey = transformedMasterKey; m_data.transformedMasterKey = transformedMasterKey;
m_data.hasKey = true; m_data.hasKey = true;
if (updateChangedTime) { if (updateChangedTime) {
m_metadata->setMasterKeyChanged(Tools::currentDateTimeUtc()); m_metadata->setMasterKeyChanged(QDateTime::currentDateTimeUtc());
} }
Q_EMIT modifiedImmediate(); Q_EMIT modifiedImmediate();

1
src/core/Database.h
View File

@ -20,6 +20,7 @@
#include <QDateTime> #include <QDateTime>
#include <QHash> #include <QHash>
#include <QObject>
#include "core/Uuid.h" #include "core/Uuid.h"
#include "keys/CompositeKey.h" #include "keys/CompositeKey.h"

2
src/core/DatabaseIcons.cpp
View File

@ -19,7 +19,7 @@
#include "core/FilePath.h" #include "core/FilePath.h"
DatabaseIcons* DatabaseIcons::m_instance(Q_NULLPTR); DatabaseIcons* DatabaseIcons::m_instance(nullptr);
const int DatabaseIcons::IconCount(69); const int DatabaseIcons::IconCount(69);
const int DatabaseIcons::ExpiredIconIndex(45); const int DatabaseIcons::ExpiredIconIndex(45);
const char* const DatabaseIcons::m_indexToName[] = { const char* const DatabaseIcons::m_indexToName[] = {

2
src/core/DatabaseIcons.h
View File

@ -23,8 +23,6 @@
#include <QPixmapCache> #include <QPixmapCache>
#include <QVector> #include <QVector>
#include "core/Global.h"
class DatabaseIcons class DatabaseIcons
{ {
public: public:

43
src/core/Entry.cpp
View File

@ -21,7 +21,6 @@
#include "core/DatabaseIcons.h" #include "core/DatabaseIcons.h"
#include "core/Group.h" #include "core/Group.h"
#include "core/Metadata.h" #include "core/Metadata.h"
#include "core/Tools.h"
const int Entry::DefaultIconNumber = 0; const int Entry::DefaultIconNumber = 0;
@ -29,7 +28,7 @@ Entry::Entry()
: m_attributes(new EntryAttributes(this)) : m_attributes(new EntryAttributes(this))
, m_attachments(new EntryAttachments(this)) , m_attachments(new EntryAttachments(this))
, m_autoTypeAssociations(new AutoTypeAssociations(this)) , m_autoTypeAssociations(new AutoTypeAssociations(this))
, m_tmpHistoryItem(Q_NULLPTR) , m_tmpHistoryItem(nullptr)
, m_modifiedSinceBegin(false) , m_modifiedSinceBegin(false)
, m_updateTimeinfo(true) , m_updateTimeinfo(true)
{ {
@ -74,8 +73,8 @@ template <class T> inline bool Entry::set(T& property, const T& value)
void Entry::updateTimeinfo() void Entry::updateTimeinfo()
{ {
if (m_updateTimeinfo) { if (m_updateTimeinfo) {
m_data.timeInfo.setLastModificationTime(Tools::currentDateTimeUtc()); m_data.timeInfo.setLastModificationTime(QDateTime::currentDateTimeUtc());
m_data.timeInfo.setLastAccessTime(Tools::currentDateTimeUtc()); m_data.timeInfo.setLastAccessTime(QDateTime::currentDateTimeUtc());
} }
} }
@ -114,13 +113,25 @@ QPixmap Entry::iconPixmap() const
else { else {
Q_ASSERT(database()); Q_ASSERT(database());
QPixmap pixmap; if (database()) {
if (database() && !QPixmapCache::find(m_pixmapCacheKey, &pixmap)) { return database()->metadata()->customIconPixmap(m_data.customIcon);
pixmap = QPixmap::fromImage(database()->metadata()->customIcon(m_data.customIcon));
m_pixmapCacheKey = QPixmapCache::insert(pixmap);
} }
else {
return QPixmap();
}
}
}
return pixmap; QPixmap Entry::iconScaledPixmap() const
{
if (m_data.customIcon.isNull()) {
// built-in icons are 16x16 so don't need to be scaled
return databaseIcons()->iconPixmap(m_data.iconNumber);
}
else {
Q_ASSERT(database());
return database()->metadata()->customIconScaledPixmap(m_data.customIcon);
} }
} }
@ -211,7 +222,7 @@ QString Entry::notes() const
bool Entry::isExpired() const bool Entry::isExpired() const
{ {
return m_data.timeInfo.expires() && m_data.timeInfo.expiryTime() < Tools::currentDateTimeUtc(); return m_data.timeInfo.expires() && m_data.timeInfo.expiryTime() < QDateTime::currentDateTimeUtc();
} }
EntryAttributes* Entry::attributes() EntryAttributes* Entry::attributes()
@ -248,8 +259,6 @@ void Entry::setIcon(int iconNumber)
m_data.iconNumber = iconNumber; m_data.iconNumber = iconNumber;
m_data.customIcon = Uuid(); m_data.customIcon = Uuid();
m_pixmapCacheKey = QPixmapCache::Key();
Q_EMIT modified(); Q_EMIT modified();
emitDataChanged(); emitDataChanged();
} }
@ -263,8 +272,6 @@ void Entry::setIcon(const Uuid& uuid)
m_data.customIcon = uuid; m_data.customIcon = uuid;
m_data.iconNumber = 0; m_data.iconNumber = 0;
m_pixmapCacheKey = QPixmapCache::Key();
Q_EMIT modified(); Q_EMIT modified();
emitDataChanged(); emitDataChanged();
} }
@ -466,7 +473,7 @@ Entry* Entry::clone(CloneFlags flags) const
entry->setUpdateTimeinfo(true); entry->setUpdateTimeinfo(true);
if (flags & CloneResetTimeInfo) { if (flags & CloneResetTimeInfo) {
QDateTime now = Tools::currentDateTimeUtc(); QDateTime now = QDateTime::currentDateTimeUtc();
entry->m_data.timeInfo.setCreationTime(now); entry->m_data.timeInfo.setCreationTime(now);
entry->m_data.timeInfo.setLastModificationTime(now); entry->m_data.timeInfo.setLastModificationTime(now);
entry->m_data.timeInfo.setLastAccessTime(now); entry->m_data.timeInfo.setLastAccessTime(now);
@ -514,7 +521,7 @@ void Entry::endUpdate()
delete m_tmpHistoryItem; delete m_tmpHistoryItem;
} }
m_tmpHistoryItem = Q_NULLPTR; m_tmpHistoryItem = nullptr;
} }
void Entry::updateModifiedSinceBegin() void Entry::updateModifiedSinceBegin()
@ -560,7 +567,7 @@ void Entry::setGroup(Group* group)
QObject::setParent(group); QObject::setParent(group);
if (m_updateTimeinfo) { if (m_updateTimeinfo) {
m_data.timeInfo.setLocationChanged(Tools::currentDateTimeUtc()); m_data.timeInfo.setLocationChanged(QDateTime::currentDateTimeUtc());
} }
} }
@ -575,7 +582,7 @@ const Database* Entry::database() const
return m_group->database(); return m_group->database();
} }
else { else {
return Q_NULLPTR; return nullptr;
} }
} }

4
src/core/Entry.h
View File

@ -22,7 +22,6 @@
#include <QImage> #include <QImage>
#include <QMap> #include <QMap>
#include <QPixmap> #include <QPixmap>
#include <QPixmapCache>
#include <QPointer> #include <QPointer>
#include <QSet> #include <QSet>
#include <QUrl> #include <QUrl>
@ -30,7 +29,6 @@
#include "core/AutoTypeAssociations.h" #include "core/AutoTypeAssociations.h"
#include "core/EntryAttachments.h" #include "core/EntryAttachments.h"
#include "core/EntryAttributes.h" #include "core/EntryAttributes.h"
#include "core/Global.h"
#include "core/TimeInfo.h" #include "core/TimeInfo.h"
#include "core/Uuid.h" #include "core/Uuid.h"
@ -61,6 +59,7 @@ public:
Uuid uuid() const; Uuid uuid() const;
QImage icon() const; QImage icon() const;
QPixmap iconPixmap() const; QPixmap iconPixmap() const;
QPixmap iconScaledPixmap() const;
int iconNumber() const; int iconNumber() const;
Uuid iconUuid() const; Uuid iconUuid() const;
QColor foregroundColor() const; QColor foregroundColor() const;
@ -169,7 +168,6 @@ private:
Entry* m_tmpHistoryItem; Entry* m_tmpHistoryItem;
bool m_modifiedSinceBegin; bool m_modifiedSinceBegin;
QPointer<Group> m_group; QPointer<Group> m_group;
mutable QPixmapCache::Key m_pixmapCacheKey;
bool m_updateTimeinfo; bool m_updateTimeinfo;
}; };

4
src/core/EntryAttachments.h
View File

@ -21,14 +21,12 @@
#include <QMap> #include <QMap>
#include <QObject> #include <QObject>
#include "core/Global.h"
class EntryAttachments : public QObject class EntryAttachments : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit EntryAttachments(QObject* parent = Q_NULLPTR); explicit EntryAttachments(QObject* parent = nullptr);
QList<QString> keys() const; QList<QString> keys() const;
bool hasKey(const QString& key) const; bool hasKey(const QString& key) const;
QList<QByteArray> values() const; QList<QByteArray> values() const;

4
src/core/EntryAttributes.h
View File

@ -23,14 +23,12 @@
#include <QSet> #include <QSet>
#include <QStringList> #include <QStringList>
#include "core/Global.h"
class EntryAttributes : public QObject class EntryAttributes : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit EntryAttributes(QObject* parent = Q_NULLPTR); explicit EntryAttributes(QObject* parent = nullptr);
QList<QString> keys() const; QList<QString> keys() const;
bool hasKey(const QString& key) const; bool hasKey(const QString& key) const;
QList<QString> customKeys(); QList<QString> customKeys();

9
src/core/EntrySearcher.cpp
View File

@ -19,7 +19,8 @@
#include "core/Group.h" #include "core/Group.h"
QList<Entry*> EntrySearcher::search(const QString &searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity) QList<Entry*> EntrySearcher::search(const QString& searchTerm, const Group* group,
Qt::CaseSensitivity caseSensitivity)
{ {
if (!group->resolveSearchingEnabled()) { if (!group->resolveSearchingEnabled()) {
return QList<Entry*>(); return QList<Entry*>();
@ -28,7 +29,8 @@ QList<Entry*> EntrySearcher::search(const QString &searchTerm, const Group* grou
return searchEntries(searchTerm, group, caseSensitivity); return searchEntries(searchTerm, group, caseSensitivity);
} }
QList<Entry*> EntrySearcher::searchEntries(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity) QList<Entry*> EntrySearcher::searchEntries(const QString& searchTerm, const Group* group,
Qt::CaseSensitivity caseSensitivity)
{ {
QList<Entry*> searchResult; QList<Entry*> searchResult;
@ -44,7 +46,8 @@ QList<Entry*> EntrySearcher::searchEntries(const QString& searchTerm, const Grou
return searchResult; return searchResult;
} }
QList<Entry*> EntrySearcher::matchEntry(const QString& searchTerm, Entry* entry, Qt::CaseSensitivity caseSensitivity) QList<Entry*> EntrySearcher::matchEntry(const QString& searchTerm, Entry* entry,
Qt::CaseSensitivity caseSensitivity)
{ {
QStringList wordList = searchTerm.split(QRegExp("\\s"), QString::SkipEmptyParts); QStringList wordList = searchTerm.split(QRegExp("\\s"), QString::SkipEmptyParts);
Q_FOREACH (const QString& word, wordList) { Q_FOREACH (const QString& word, wordList) {

3
src/core/EntrySearcher.h
View File

@ -28,10 +28,11 @@ class EntrySearcher
{ {
public: public:
QList<Entry*> search(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity); QList<Entry*> search(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity);
private: private:
QList<Entry*> searchEntries(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity); QList<Entry*> searchEntries(const QString& searchTerm, const Group* group, Qt::CaseSensitivity caseSensitivity);
QList<Entry*> matchEntry(const QString& searchTerm, Entry* entry, Qt::CaseSensitivity caseSensitivity); QList<Entry*> matchEntry(const QString& searchTerm, Entry* entry, Qt::CaseSensitivity caseSensitivity);
bool wordMatch(const QString &word, Entry *entry, Qt::CaseSensitivity caseSensitivity); bool wordMatch(const QString& word, Entry* entry, Qt::CaseSensitivity caseSensitivity);
}; };
#endif // KEEPASSX_ENTRYSEARCHER_H #endif // KEEPASSX_ENTRYSEARCHER_H

7
src/core/FilePath.cpp
View File

@ -23,7 +23,7 @@
#include "config-keepassx.h" #include "config-keepassx.h"
FilePath* FilePath::m_instance(Q_NULLPTR); FilePath* FilePath::m_instance(nullptr);
QString FilePath::dataPath(const QString& name) QString FilePath::dataPath(const QString& name)
{ {
@ -113,7 +113,7 @@ QIcon FilePath::icon(const QString& category, const QString& name, bool fromThem
icon.addFile(filename, QSize(size, size)); icon.addFile(filename, QSize(size, size));
} }
} }
filename = QString("%1/icons/application/scalable/%3.svgz").arg(m_dataPath, combinedName); filename = QString("%1/icons/application/scalable/%2.svgz").arg(m_dataPath, combinedName);
if (QFile::exists(filename)) { if (QFile::exists(filename)) {
icon.addFile(filename); icon.addFile(filename);
} }
@ -158,7 +158,7 @@ QIcon FilePath::onOffIcon(const QString& category, const QString& name)
icon.addFile(filename, QSize(size, size), QIcon::Normal, state); icon.addFile(filename, QSize(size, size), QIcon::Normal, state);
} }
} }
filename = QString("%1/icons/application/scalable/%3-%4.svgz").arg(m_dataPath, combinedName, stateName); filename = QString("%1/icons/application/scalable/%2-%3.svgz").arg(m_dataPath, combinedName, stateName);
if (QFile::exists(filename)) { if (QFile::exists(filename)) {
icon.addFile(filename, QSize(), QIcon::Normal, state); icon.addFile(filename, QSize(), QIcon::Normal, state);
} }
@ -173,6 +173,7 @@ FilePath::FilePath()
{ {
const QString appDirPath = QCoreApplication::applicationDirPath(); const QString appDirPath = QCoreApplication::applicationDirPath();
bool isDataDirAbsolute = QDir::isAbsolutePath(KEEPASSX_DATA_DIR); bool isDataDirAbsolute = QDir::isAbsolutePath(KEEPASSX_DATA_DIR);
Q_UNUSED(isDataDirAbsolute);
if (false) { if (false) {
} }

2
src/core/FilePath.h
View File

@ -22,8 +22,6 @@
#include <QIcon> #include <QIcon>
#include <QString> #include <QString>
#include "core/Global.h"
class FilePath class FilePath
{ {
public: public:

96
src/core/Global.h
View File

@ -20,104 +20,8 @@
#ifndef KEEPASSX_GLOBAL_H #ifndef KEEPASSX_GLOBAL_H
#define KEEPASSX_GLOBAL_H #define KEEPASSX_GLOBAL_H
// mostly copied from qcompilerdetection.h which is part of Qt 5
#include <QtGlobal> #include <QtGlobal>
#ifdef Q_CC_CLANG
# if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
# if __has_feature(cxx_strong_enums)
# define COMPILER_CLASS_ENUM
# endif
# if __has_feature(cxx_constexpr)
# define COMPILER_CONSTEXPR
# endif
# if __has_feature(cxx_decltype) /* && __has_feature(cxx_decltype_incomplete_return_types) */
# define COMPILER_DECLTYPE
# endif
# if __has_feature(cxx_override_control)
# define COMPILER_EXPLICIT_OVERRIDES
# endif
# if __has_feature(cxx_nullptr)
# define COMPILER_NULLPTR
# endif
# if __has_feature(cxx_static_assert)
# define COMPILER_STATIC_ASSERT
# endif
# endif
#endif // Q_CC_CLANG
#if defined(Q_CC_GNU) && !defined(Q_CC_INTEL) && !defined(Q_CC_CLANG)
# if defined(__GXX_EXPERIMENTAL_CXX0X__) || __cplusplus >= 201103L
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 403
# define COMPILER_DECLTYPE
# define COMPILER_STATIC_ASSERT
# endif
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 404
# define COMPILER_CLASS_ENUM
# endif
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 406
# define COMPILER_CONSTEXPR
# define COMPILER_NULLPTR
# endif
# if (__GNUC__ * 100 + __GNUC_MINOR__) >= 407
# define COMPILER_EXPLICIT_OVERRIDES
# endif
# endif
#endif
/*
* C++11 keywords and expressions
*/
#if !defined(Q_NULLPTR)
# ifdef COMPILER_NULLPTR
# define Q_NULLPTR nullptr
# else
# define Q_NULLPTR 0
# endif
#endif
#if !defined(Q_DECL_CONSTEXPR)
# ifdef COMPILER_CONSTEXPR
# define Q_DECL_CONSTEXPR constexpr
# else
# define Q_DECL_CONSTEXPR
# endif
#endif
#if !defined(Q_DECL_OVERRIDE) && !defined(Q_DECL_FINAL) && !defined(Q_DECL_FINAL_CLASS)
# ifdef COMPILER_EXPLICIT_OVERRIDES
# define Q_DECL_OVERRIDE override
# define Q_DECL_FINAL final
# ifdef COMPILER_DECLTYPE
# define Q_DECL_FINAL_CLASS final
# else
# define Q_DECL_FINAL_CLASS
# endif
# else
# define Q_DECL_OVERRIDE
# define Q_DECL_FINAL
# define Q_DECL_FINAL_CLASS
# endif
#endif
#if !defined(Q_STATIC_ASSERT) && !defined(Q_STATIC_ASSERT_X)
#ifdef COMPILER_STATIC_ASSERT
#define Q_STATIC_ASSERT(Condition) static_assert(static_cast<bool>(Condition), #Condition)
#define Q_STATIC_ASSERT_X(Condition, Message) static_assert(static_cast<bool>(Condition), Message)
#else
// Intentionally undefined
template <bool Test> class QStaticAssertFailure;
template <> class QStaticAssertFailure<true> {};
#define Q_STATIC_ASSERT_PRIVATE_JOIN(A, B) Q_STATIC_ASSERT_PRIVATE_JOIN_IMPL(A, B)
#define Q_STATIC_ASSERT_PRIVATE_JOIN_IMPL(A, B) A ## B
#define Q_STATIC_ASSERT(Condition) \
enum {Q_STATIC_ASSERT_PRIVATE_JOIN(q_static_assert_result, __LINE__) = sizeof(QStaticAssertFailure<!!(Condition)>)}
#define Q_STATIC_ASSERT_X(Condition, Message) Q_STATIC_ASSERT(Condition)
#endif // COMPILER_STATIC_ASSERT
#endif // !defined(Q_STATIC_ASSERT) && !defined(Q_STATIC_ASSERT_X)
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
# if defined(KEEPASSX_BUILDING_CORE) # if defined(KEEPASSX_BUILDING_CORE)
# define KEEPASSX_EXPORT Q_DECL_EXPORT # define KEEPASSX_EXPORT Q_DECL_EXPORT

46
src/core/Group.cpp
View File

@ -20,7 +20,6 @@
#include "core/Config.h" #include "core/Config.h"
#include "core/DatabaseIcons.h" #include "core/DatabaseIcons.h"
#include "core/Metadata.h" #include "core/Metadata.h"
#include "core/Tools.h"
const int Group::DefaultIconNumber = 48; const int Group::DefaultIconNumber = 48;
const int Group::RecycleBinIconNumber = 43; const int Group::RecycleBinIconNumber = 43;
@ -50,7 +49,7 @@ Group::~Group()
if (m_db && m_parent) { if (m_db && m_parent) {
DeletedObject delGroup; DeletedObject delGroup;
delGroup.deletionTime = Tools::currentDateTimeUtc(); delGroup.deletionTime = QDateTime::currentDateTimeUtc();
delGroup.uuid = m_uuid; delGroup.uuid = m_uuid;
m_db->addDeletedObject(delGroup); m_db->addDeletedObject(delGroup);
} }
@ -84,8 +83,8 @@ template <class P, class V> inline bool Group::set(P& property, const V& value)
void Group::updateTimeinfo() void Group::updateTimeinfo()
{ {
if (m_updateTimeinfo) { if (m_updateTimeinfo) {
m_data.timeInfo.setLastModificationTime(Tools::currentDateTimeUtc()); m_data.timeInfo.setLastModificationTime(QDateTime::currentDateTimeUtc());
m_data.timeInfo.setLastAccessTime(Tools::currentDateTimeUtc()); m_data.timeInfo.setLastAccessTime(QDateTime::currentDateTimeUtc());
} }
} }
@ -134,13 +133,30 @@ QPixmap Group::iconPixmap() const
else { else {
Q_ASSERT(m_db); Q_ASSERT(m_db);
QPixmap pixmap; if (m_db) {
if (m_db && !QPixmapCache::find(m_pixmapCacheKey, &pixmap)) { return m_db->metadata()->customIconPixmap(m_data.customIcon);
pixmap = QPixmap::fromImage(m_db->metadata()->customIcon(m_data.customIcon));
m_pixmapCacheKey = QPixmapCache::insert(pixmap);
} }
else {
return QPixmap();
}
}
}
return pixmap; QPixmap Group::iconScaledPixmap() const
{
if (m_data.customIcon.isNull()) {
// built-in icons are 16x16 so don't need to be scaled
return databaseIcons()->iconPixmap(m_data.iconNumber);
}
else {
Q_ASSERT(m_db);
if (m_db) {
return m_db->metadata()->customIconScaledPixmap(m_data.customIcon);
}
else {
return QPixmap();
}
} }
} }
@ -186,7 +202,7 @@ Entry* Group::lastTopVisibleEntry() const
bool Group::isExpired() const bool Group::isExpired() const
{ {
return m_data.timeInfo.expires() && m_data.timeInfo.expiryTime() < Tools::currentDateTimeUtc(); return m_data.timeInfo.expires() && m_data.timeInfo.expiryTime() < QDateTime::currentDateTimeUtc();
} }
void Group::setUuid(const Uuid& uuid) void Group::setUuid(const Uuid& uuid)
@ -214,8 +230,6 @@ void Group::setIcon(int iconNumber)
m_data.iconNumber = iconNumber; m_data.iconNumber = iconNumber;
m_data.customIcon = Uuid(); m_data.customIcon = Uuid();
m_pixmapCacheKey = QPixmapCache::Key();
updateTimeinfo(); updateTimeinfo();
Q_EMIT modified(); Q_EMIT modified();
Q_EMIT dataChanged(this); Q_EMIT dataChanged(this);
@ -230,8 +244,6 @@ void Group::setIcon(const Uuid& uuid)
m_data.customIcon = uuid; m_data.customIcon = uuid;
m_data.iconNumber = 0; m_data.iconNumber = 0;
m_pixmapCacheKey = QPixmapCache::Key();
updateTimeinfo(); updateTimeinfo();
Q_EMIT modified(); Q_EMIT modified();
Q_EMIT dataChanged(this); Q_EMIT dataChanged(this);
@ -352,7 +364,7 @@ void Group::setParent(Group* parent, int index)
} }
if (m_updateTimeinfo) { if (m_updateTimeinfo) {
m_data.timeInfo.setLocationChanged(Tools::currentDateTimeUtc()); m_data.timeInfo.setLocationChanged(QDateTime::currentDateTimeUtc());
} }
Q_EMIT modified(); Q_EMIT modified();
@ -372,7 +384,7 @@ void Group::setParent(Database* db)
cleanupParent(); cleanupParent();
m_parent = Q_NULLPTR; m_parent = nullptr;
recSetDatabase(db); recSetDatabase(db);
QObject::setParent(db); QObject::setParent(db);
@ -497,7 +509,7 @@ Group* Group::clone(Entry::CloneFlags entryFlags) const
clonedGroup->setUpdateTimeinfo(true); clonedGroup->setUpdateTimeinfo(true);
QDateTime now = Tools::currentDateTimeUtc(); QDateTime now = QDateTime::currentDateTimeUtc();
clonedGroup->m_data.timeInfo.setCreationTime(now); clonedGroup->m_data.timeInfo.setCreationTime(now);
clonedGroup->m_data.timeInfo.setLastModificationTime(now); clonedGroup->m_data.timeInfo.setLastModificationTime(now);
clonedGroup->m_data.timeInfo.setLastAccessTime(now); clonedGroup->m_data.timeInfo.setLastAccessTime(now);

2
src/core/Group.h
View File

@ -58,6 +58,7 @@ public:
QString notes() const; QString notes() const;
QImage icon() const; QImage icon() const;
QPixmap iconPixmap() const; QPixmap iconPixmap() const;
QPixmap iconScaledPixmap() const;
int iconNumber() const; int iconNumber() const;
Uuid iconUuid() const; Uuid iconUuid() const;
TimeInfo timeInfo() const; TimeInfo timeInfo() const;
@ -155,7 +156,6 @@ private:
QList<Entry*> m_entries; QList<Entry*> m_entries;
QPointer<Group> m_parent; QPointer<Group> m_parent;
mutable QPixmapCache::Key m_pixmapCacheKey;
bool m_updateTimeinfo; bool m_updateTimeinfo;

7
src/core/InactivityTimer.cpp
View File

@ -67,7 +67,14 @@ bool InactivityTimer::eventFilter(QObject* watched, QEvent* event)
void InactivityTimer::timeout() void InactivityTimer::timeout()
{ {
// make sure we don't emit the signal a second time while it's still processed
if (!m_emitMutx.tryLock()) {
return;
}
if (m_active && !m_timer->isActive()) { if (m_active && !m_timer->isActive()) {
Q_EMIT inactivityDetected(); Q_EMIT inactivityDetected();
} }
m_emitMutx.unlock();
} }

6
src/core/InactivityTimer.h
View File

@ -18,10 +18,9 @@
#ifndef KEEPASSX_INACTIVITYTIMER_H #ifndef KEEPASSX_INACTIVITYTIMER_H
#define KEEPASSX_INACTIVITYTIMER_H #define KEEPASSX_INACTIVITYTIMER_H
#include <QMutex>
#include <QObject> #include <QObject>
#include "core/Global.h"
class QTimer; class QTimer;
class InactivityTimer : public QObject class InactivityTimer : public QObject
@ -29,7 +28,7 @@ class InactivityTimer : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit InactivityTimer(QObject* parent = Q_NULLPTR); explicit InactivityTimer(QObject* parent = nullptr);
void setInactivityTimeout(int inactivityTimeout); void setInactivityTimeout(int inactivityTimeout);
void activate(); void activate();
void deactivate(); void deactivate();
@ -46,6 +45,7 @@ private Q_SLOTS:
private: private:
QTimer* m_timer; QTimer* m_timer;
bool m_active; bool m_active;
QMutex m_emitMutx;
}; };
#endif // KEEPASSX_INACTIVITYTIMER_H #endif // KEEPASSX_INACTIVITYTIMER_H

59
src/core/Metadata.cpp
View File

@ -42,7 +42,7 @@ Metadata::Metadata(QObject* parent)
m_data.protectNotes = false; m_data.protectNotes = false;
// m_data.autoEnableVisualHiding = false; // m_data.autoEnableVisualHiding = false;
QDateTime now = Tools::currentDateTimeUtc(); QDateTime now = QDateTime::currentDateTimeUtc();
m_data.nameChanged = now; m_data.nameChanged = now;
m_data.descriptionChanged = now; m_data.descriptionChanged = now;
m_data.defaultUserNameChanged = now; m_data.defaultUserNameChanged = now;
@ -67,7 +67,7 @@ template <class P, class V> bool Metadata::set(P& property, const V& value, QDat
if (property != value) { if (property != value) {
property = value; property = value;
if (m_updateDatetime) { if (m_updateDatetime) {
dateTime = Tools::currentDateTimeUtc(); dateTime = QDateTime::currentDateTimeUtc();
} }
Q_EMIT modified(); Q_EMIT modified();
return true; return true;
@ -167,6 +167,43 @@ QImage Metadata::customIcon(const Uuid& uuid) const
return m_customIcons.value(uuid); return m_customIcons.value(uuid);
} }
QPixmap Metadata::customIconPixmap(const Uuid& uuid) const
{
QPixmap pixmap;
if (!m_customIcons.contains(uuid)) {
return pixmap;
}
QPixmapCache::Key& cacheKey = m_customIconCacheKeys[uuid];
if (!QPixmapCache::find(cacheKey, &pixmap)) {
pixmap = QPixmap::fromImage(m_customIcons.value(uuid));
cacheKey = QPixmapCache::insert(pixmap);
}
return pixmap;
}
QPixmap Metadata::customIconScaledPixmap(const Uuid& uuid) const
{
QPixmap pixmap;
if (!m_customIcons.contains(uuid)) {
return pixmap;
}
QPixmapCache::Key& cacheKey = m_customIconScaledCacheKeys[uuid];
if (!QPixmapCache::find(cacheKey, &pixmap)) {
QImage image = m_customIcons.value(uuid).scaled(16, 16, Qt::KeepAspectRatio, Qt::SmoothTransformation);
pixmap = QPixmap::fromImage(image);
cacheKey = QPixmapCache::insert(pixmap);
}
return pixmap;
}
bool Metadata::containsCustomIcon(const Uuid& uuid) const bool Metadata::containsCustomIcon(const Uuid& uuid) const
{ {
return m_customIcons.contains(uuid); return m_customIcons.contains(uuid);
@ -177,6 +214,17 @@ QHash<Uuid, QImage> Metadata::customIcons() const
return m_customIcons; return m_customIcons;
} }
QHash<Uuid, QPixmap> Metadata::customIconsScaledPixmaps() const
{
QHash<Uuid, QPixmap> result;
Q_FOREACH (const Uuid& uuid, m_customIconsOrder) {
result.insert(uuid, customIconScaledPixmap(uuid));
}
return result;
}
QList<Uuid> Metadata::customIconsOrder() const QList<Uuid> Metadata::customIconsOrder() const
{ {
return m_customIconsOrder; return m_customIconsOrder;
@ -338,6 +386,9 @@ void Metadata::addCustomIcon(const Uuid& uuid, const QImage& icon)
Q_ASSERT(!m_customIcons.contains(uuid)); Q_ASSERT(!m_customIcons.contains(uuid));
m_customIcons.insert(uuid, icon); m_customIcons.insert(uuid, icon);
// reset cache in case there is also an icon with that uuid
m_customIconCacheKeys[uuid] = QPixmapCache::Key();
m_customIconScaledCacheKeys[uuid] = QPixmapCache::Key();
m_customIconsOrder.append(uuid); m_customIconsOrder.append(uuid);
Q_ASSERT(m_customIcons.count() == m_customIconsOrder.count()); Q_ASSERT(m_customIcons.count() == m_customIconsOrder.count());
Q_EMIT modified(); Q_EMIT modified();
@ -365,6 +416,10 @@ void Metadata::removeCustomIcon(const Uuid& uuid)
Q_ASSERT(m_customIcons.contains(uuid)); Q_ASSERT(m_customIcons.contains(uuid));
m_customIcons.remove(uuid); m_customIcons.remove(uuid);
QPixmapCache::remove(m_customIconCacheKeys.value(uuid));
m_customIconCacheKeys.remove(uuid);
QPixmapCache::remove(m_customIconScaledCacheKeys.value(uuid));
m_customIconScaledCacheKeys.remove(uuid);
m_customIconsOrder.removeAll(uuid); m_customIconsOrder.removeAll(uuid);
Q_ASSERT(m_customIcons.count() == m_customIconsOrder.count()); Q_ASSERT(m_customIcons.count() == m_customIconsOrder.count());
Q_EMIT modified(); Q_EMIT modified();

10
src/core/Metadata.h
View File

@ -22,9 +22,10 @@
#include <QDateTime> #include <QDateTime>
#include <QHash> #include <QHash>
#include <QImage> #include <QImage>
#include <QPixmap>
#include <QPixmapCache>
#include <QPointer> #include <QPointer>
#include "core/Global.h"
#include "core/Uuid.h" #include "core/Uuid.h"
class Database; class Database;
@ -35,7 +36,7 @@ class Metadata : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit Metadata(QObject* parent = Q_NULLPTR); explicit Metadata(QObject* parent = nullptr);
struct MetadataData struct MetadataData
{ {
@ -78,10 +79,13 @@ public:
bool protectNotes() const; bool protectNotes() const;
// bool autoEnableVisualHiding() const; // bool autoEnableVisualHiding() const;
QImage customIcon(const Uuid& uuid) const; QImage customIcon(const Uuid& uuid) const;
QPixmap customIconPixmap(const Uuid& uuid) const;
QPixmap customIconScaledPixmap(const Uuid& uuid) const;
bool containsCustomIcon(const Uuid& uuid) const; bool containsCustomIcon(const Uuid& uuid) const;
QHash<Uuid, QImage> customIcons() const; QHash<Uuid, QImage> customIcons() const;
QList<Uuid> customIconsOrder() const; QList<Uuid> customIconsOrder() const;
bool recycleBinEnabled() const; bool recycleBinEnabled() const;
QHash<Uuid, QPixmap> customIconsScaledPixmaps() const;
Group* recycleBin(); Group* recycleBin();
const Group* recycleBin() const; const Group* recycleBin() const;
QDateTime recycleBinChanged() const; QDateTime recycleBinChanged() const;
@ -153,6 +157,8 @@ private:
MetadataData m_data; MetadataData m_data;
QHash<Uuid, QImage> m_customIcons; QHash<Uuid, QImage> m_customIcons;
mutable QHash<Uuid, QPixmapCache::Key> m_customIconCacheKeys;
mutable QHash<Uuid, QPixmapCache::Key> m_customIconScaledCacheKeys;
QList<Uuid> m_customIconsOrder; QList<Uuid> m_customIconsOrder;
QPointer<Group> m_recycleBin; QPointer<Group> m_recycleBin;

2
src/core/PasswordGenerator.h
View File

@ -22,8 +22,6 @@
#include <QString> #include <QString>
#include <QVector> #include <QVector>
#include "core/Global.h"
typedef QVector<QChar> PasswordGroup; typedef QVector<QChar> PasswordGroup;
class PasswordGenerator class PasswordGenerator

2
src/core/SignalMultiplexer.cpp
View File

@ -24,7 +24,7 @@ SignalMultiplexer::SignalMultiplexer()
SignalMultiplexer::~SignalMultiplexer() SignalMultiplexer::~SignalMultiplexer()
{ {
// disconnect all connections // disconnect all connections
setCurrentObject(Q_NULLPTR); setCurrentObject(nullptr);
} }
QObject* SignalMultiplexer::currentObject() const QObject* SignalMultiplexer::currentObject() const

2
src/core/SignalMultiplexer.h
View File

@ -21,8 +21,6 @@
#include <QObject> #include <QObject>
#include <QPointer> #include <QPointer>
#include "core/Global.h"
class SignalMultiplexer class SignalMultiplexer
{ {
public: public:

2
src/core/TimeInfo.cpp
View File

@ -23,7 +23,7 @@ TimeInfo::TimeInfo()
: m_expires(false) : m_expires(false)
, m_usageCount(0) , m_usageCount(0)
{ {
QDateTime now = Tools::currentDateTimeUtc(); QDateTime now = QDateTime::currentDateTimeUtc();
m_lastModificationTime = now; m_lastModificationTime = now;
m_creationTime = now; m_creationTime = now;
m_lastAccessTime = now; m_lastAccessTime = now;

55
src/core/Tools.cpp
View File

@ -23,14 +23,10 @@
#include <QLocale> #include <QLocale>
#include <QStringList> #include <QStringList>
#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
#include <QElapsedTimer> #include <QElapsedTimer>
#else
#include <QTime>
#endif
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
#include <windows.h> // for Sleep() #include <windows.h> // for Sleep(), SetDllDirectoryA() and SetSearchPathMode()
#endif #endif
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
@ -122,15 +118,6 @@ bool readAllFromDevice(QIODevice* device, QByteArray& data)
} }
} }
QDateTime currentDateTimeUtc()
{
#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
return QDateTime::currentDateTimeUtc();
#else
return QDateTime::currentDateTime().toUTC();
#endif
}
QString imageReaderFilter() QString imageReaderFilter()
{ {
QList<QByteArray> formats = QImageReader::supportedImageFormats(); QList<QByteArray> formats = QImageReader::supportedImageFormats();
@ -160,6 +147,16 @@ bool isHex(const QByteArray& ba)
return true; return true;
} }
bool isBase64(const QByteArray& ba)
{
QRegExp regexp("^(?:[a-z0-9+/]{4})*(?:[a-z0-9+/]{3}=|[a-z0-9+/]{2}==)?$",
Qt::CaseInsensitive, QRegExp::RegExp2);
QString base64 = QString::fromLatin1(ba.constData(), ba.size());
return regexp.exactMatch(base64);
}
void sleep(int ms) void sleep(int ms)
{ {
Q_ASSERT(ms >= 0); Q_ASSERT(ms >= 0);
@ -174,7 +171,7 @@ void sleep(int ms)
timespec ts; timespec ts;
ts.tv_sec = ms / 1000; ts.tv_sec = ms / 1000;
ts.tv_nsec = (ms % 1000) * 1000 * 1000; ts.tv_nsec = (ms % 1000) * 1000 * 1000;
nanosleep(&ts, Q_NULLPTR); nanosleep(&ts, nullptr);
#endif #endif
} }
@ -186,11 +183,7 @@ void wait(int ms)
return; return;
} }
#if QT_VERSION >= QT_VERSION_CHECK(4, 7, 0)
QElapsedTimer timer; QElapsedTimer timer;
#else
QTime timer;
#endif
timer.start(); timer.start();
if (ms <= 50) { if (ms <= 50) {
@ -205,23 +198,10 @@ void wait(int ms)
QCoreApplication::processEvents(QEventLoop::AllEvents, timeLeft); QCoreApplication::processEvents(QEventLoop::AllEvents, timeLeft);
sleep(10); sleep(10);
} }
} while (timer.elapsed() < ms); } while (!timer.hasExpired(ms));
} }
} }
QString platform()
{
#if defined(Q_WS_X11)
return "x11";
#elif defined(Q_WS_MAC)
return "mac";
#elif defined(Q_WS_WIN)
return "win";
#else
return QString();
#endif
}
void disableCoreDumps() void disableCoreDumps()
{ {
// default to true // default to true
@ -249,4 +229,13 @@ void disableCoreDumps()
} }
} }
void setupSearchPaths()
{
#ifdef Q_OS_WIN
// Make sure Windows doesn't load DLLs from the current working directory
SetDllDirectoryA("");
SetSearchPathMode(BASE_SEARCH_PATH_ENABLE_SAFE_SEARCHMODE);
#endif
}
} // namespace Tools } // namespace Tools

21
src/core/Tools.h
View File

@ -18,11 +18,13 @@
#ifndef KEEPASSX_TOOLS_H #ifndef KEEPASSX_TOOLS_H
#define KEEPASSX_TOOLS_H #define KEEPASSX_TOOLS_H
#include "core/Global.h"
#include <QDateTime> #include <QDateTime>
#include <QObject> #include <QObject>
#include <QString> #include <QString>
#include "core/Global.h" #include <algorithm>
class QIODevice; class QIODevice;
@ -32,13 +34,26 @@ QString humanReadableFileSize(qint64 bytes);
bool hasChild(const QObject* parent, const QObject* child); bool hasChild(const QObject* parent, const QObject* child);
bool readFromDevice(QIODevice* device, QByteArray& data, int size = 16384); bool readFromDevice(QIODevice* device, QByteArray& data, int size = 16384);
bool readAllFromDevice(QIODevice* device, QByteArray& data); bool readAllFromDevice(QIODevice* device, QByteArray& data);
QDateTime currentDateTimeUtc();
QString imageReaderFilter(); QString imageReaderFilter();
bool isHex(const QByteArray& ba); bool isHex(const QByteArray& ba);
bool isBase64(const QByteArray& ba);
void sleep(int ms); void sleep(int ms);
void wait(int ms); void wait(int ms);
QString platform();
void disableCoreDumps(); void disableCoreDumps();
void setupSearchPaths();
template <typename RandomAccessIterator, typename T>
RandomAccessIterator binaryFind(RandomAccessIterator begin, RandomAccessIterator end, const T& value)
{
RandomAccessIterator it = std::lower_bound(begin, end, value);
if ((it == end) || (value < *it)) {
return end;
}
else {
return it;
}
}
} // namespace Tools } // namespace Tools

11
src/core/Translator.cpp
View File

@ -67,8 +67,15 @@ QList<QPair<QString, QString> > Translator::availableLanguages()
langcode = "en"; langcode = "en";
} }
languages.append(QPair<QString, QString>(langcode, QLocale locale(langcode);
QLocale::languageToString(QLocale(langcode).language()))); QString languageStr = QLocale::languageToString(locale.language());
QString countryStr;
if (langcode.contains("_")) {
countryStr = QString(" (%1)").arg(QLocale::countryToString(locale.country()));
}
QPair<QString, QString> language(langcode, languageStr + countryStr);
languages.append(language);
} }
} }
} }

305
src/core/qcommandlineoption.cpp
View File

@ -1,305 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 Laszlo Papp <lpapp@kde.org>
** Copyright (C) 2013 David Faure <faure@kde.org>
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "qcommandlineoption.h"
#include <QSet>
class QCommandLineOptionPrivate : public QSharedData
{
public:
inline QCommandLineOptionPrivate()
{ }
void setNames(const QStringList &nameList);
//! The list of names used for this option.
QStringList names;
//! The documentation name for the value, if one is expected
//! Example: "-o <file>" means valueName == "file"
QString valueName;
//! The description used for this option.
QString description;
//! The list of default values used for this option.
QStringList defaultValues;
};
/*!
\since 5.2
\class QCommandLineOption
\brief The QCommandLineOption class defines a possible command-line option.
\inmodule QtCore
\ingroup shared
\ingroup tools
This class is used to describe an option on the command line. It allows
different ways of defining the same option with multiple aliases possible.
It is also used to describe how the option is used - it may be a flag (e.g. \c{-v})
or take an argument (e.g. \c{-o file}).
Examples:
\snippet code/src_corelib_tools_qcommandlineoption.cpp 0
\sa QCommandLineParser
*/
/*!
Constructs a command line option object with the given arguments.
The name of the option is set to \a name.
The name can be either short or long. If the name is one character in
length, it is considered a short name. Option names must not be empty,
must not start with a dash or a slash character, must not contain a \c{=}
and cannot be repeated.
The description is set to \a description. It is customary to add a "."
at the end of the description.
In addition, the \a valueName can be set if the option expects a value.
The default value for the option is set to \a defaultValue.
\sa setDescription(), setValueName(), setDefaultValues()
*/
QCommandLineOption::QCommandLineOption(const QString &name, const QString &description,
const QString &valueName,
const QString &defaultValue)
: d(new QCommandLineOptionPrivate)
{
d->setNames(QStringList(name));
setValueName(valueName);
setDescription(description);
setDefaultValue(defaultValue);
}
/*!
Constructs a command line option object with the given arguments.
This overload allows to set multiple names for the option, for instance
\c{o} and \c{output}.
The names of the option are set to \a names.
The names can be either short or long. Any name in the list that is one
character in length is a short name. Option names must not be empty,
must not start with a dash or a slash character, must not contain a \c{=}
and cannot be repeated.
The description is set to \a description. It is customary to add a "."
at the end of the description.
In addition, the \a valueName can be set if the option expects a value.
The default value for the option is set to \a defaultValue.
\sa setDescription(), setValueName(), setDefaultValues()
*/
QCommandLineOption::QCommandLineOption(const QStringList &names, const QString &description,
const QString &valueName,
const QString &defaultValue)
: d(new QCommandLineOptionPrivate)
{
d->setNames(names);
setValueName(valueName);
setDescription(description);
setDefaultValue(defaultValue);
}
/*!
Constructs a QCommandLineOption object that is a copy of the QCommandLineOption
object \a other.
\sa operator=()
*/
QCommandLineOption::QCommandLineOption(const QCommandLineOption &other)
: d(other.d)
{
}
/*!
Destroys the command line option object.
*/
QCommandLineOption::~QCommandLineOption()
{
}
/*!
Makes a copy of the \a other object and assigns it to this QCommandLineOption
object.
*/
QCommandLineOption &QCommandLineOption::operator=(const QCommandLineOption &other)
{
d = other.d;
return *this;
}
/*!
Returns the names set for this option.
*/
QStringList QCommandLineOption::names() const
{
return d->names;
}
void QCommandLineOptionPrivate::setNames(const QStringList &nameList)
{
QStringList newNames;
if (nameList.isEmpty())
qWarning("QCommandLineOption: Options must have at least one name");
Q_FOREACH (const QString &name, nameList) {
if (name.isEmpty()) {
qWarning("QCommandLineOption: Option names cannot be empty");
} else {
const QChar c = name.at(0);
if (c == QLatin1Char('-'))
qWarning("QCommandLineOption: Option names cannot start with a '-'");
else if (c == QLatin1Char('/'))
qWarning("QCommandLineOption: Option names cannot start with a '/'");
else if (name.contains(QLatin1Char('=')))
qWarning("QCommandLineOption: Option names cannot contain a '='");
else
newNames.append(name);
}
}
// commit
names = newNames;
}
/*!
Sets the name of the expected value, for the documentation, to \a valueName.
Options without a value assigned have a boolean-like behavior:
either the user specifies --option or they don't.
Options with a value assigned need to set a name for the expected value,
for the documentation of the option in the help output. An option with names \c{o} and \c{output},
and a value name of \c{file} will appear as \c{-o, --output <file>}.
Call QCommandLineParser::argument() if you expect the option to be present
only once, and QCommandLineParser::arguments() if you expect that option
to be present multiple times.
\sa valueName()
*/
void QCommandLineOption::setValueName(const QString &valueName)
{
d->valueName = valueName;
}
/*!
Returns the name of the expected value.
If empty, the option doesn't take a value.
\sa setValueName()
*/
QString QCommandLineOption::valueName() const
{
return d->valueName;
}
/*!
Sets the description used for this option to \a description.
It is customary to add a "." at the end of the description.
The description is used by QCommandLineParser::showHelp().
\sa description()
*/
void QCommandLineOption::setDescription(const QString &description)
{
d->description = description;
}
/*!
Returns the description set for this option.
\sa setDescription()
*/
QString QCommandLineOption::description() const
{
return d->description;
}
/*!
Sets the default value used for this option to \a defaultValue.
The default value is used if the user of the application does not specify
the option on the command line.
If \a defaultValue is empty, the option has no default values.
\sa defaultValues() setDefaultValues()
*/
void QCommandLineOption::setDefaultValue(const QString &defaultValue)
{
QStringList newDefaultValues;
if (!defaultValue.isEmpty()) {
newDefaultValues << defaultValue;
}
// commit:
d->defaultValues = newDefaultValues;
}
/*!
Sets the list of default values used for this option to \a defaultValues.
The default values are used if the user of the application does not specify
the option on the command line.
\sa defaultValues() setDefaultValue()
*/
void QCommandLineOption::setDefaultValues(const QStringList &defaultValues)
{
d->defaultValues = defaultValues;
}
/*!
Returns the default values set for this option.
\sa setDefaultValues()
*/
QStringList QCommandLineOption::defaultValues() const
{
return d->defaultValues;
}

81
src/core/qcommandlineoption.h
View File

@ -1,81 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 Laszlo Papp <lpapp@kde.org>
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QCOMMANDLINEOPTION_H
#define QCOMMANDLINEOPTION_H
#include <QStringList>
#include <QSharedData>
class QCommandLineOptionPrivate;
class QCommandLineOption
{
public:
explicit QCommandLineOption(const QString &name, const QString &description = QString(),
const QString &valueName = QString(),
const QString &defaultValue = QString());
explicit QCommandLineOption(const QStringList &names, const QString &description = QString(),
const QString &valueName = QString(),
const QString &defaultValue = QString());
QCommandLineOption(const QCommandLineOption &other);
~QCommandLineOption();
QCommandLineOption &operator=(const QCommandLineOption &other);
QStringList names() const;
void setValueName(const QString &name);
QString valueName() const;
void setDescription(const QString &description);
QString description() const;
void setDefaultValue(const QString &defaultValue);
void setDefaultValues(const QStringList &defaultValues);
QStringList defaultValues() const;
private:
QSharedDataPointer<QCommandLineOptionPrivate> d;
};
#endif // QCOMMANDLINEOPTION_H

944
src/core/qcommandlineparser.cpp
View File

@ -1,944 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 Laszlo Papp <lpapp@kde.org>
** Copyright (C) 2013 David Faure <faure@kde.org>
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "qcommandlineparser.h"
#include <QCoreApplication>
#include <QHash>
#include <QVector>
#include <stdio.h>
#include <stdlib.h>
typedef QHash<QString, int> NameHash_t;
class QCommandLineParserPrivate
{
public:
inline QCommandLineParserPrivate()
: singleDashWordOptionMode(QCommandLineParser::ParseAsCompactedShortOptions),
builtinVersionOption(false),
builtinHelpOption(false),
needsParsing(true)
{ }
bool parse(const QStringList &args);
void checkParsed(const char *method);
QStringList aliases(const QString &name) const;
QString helpText() const;
bool registerFoundOption(const QString &optionName);
bool parseOptionValue(const QString &optionName, const QString &argument,
QStringList::const_iterator *argumentIterator,
QStringList::const_iterator argsEnd);
//! Error text set when parse() returns false
QString errorText;
//! The command line options used for parsing
QList<QCommandLineOption> commandLineOptionList;
//! Hash mapping option names to their offsets in commandLineOptionList and optionArgumentList.
NameHash_t nameHash;
//! Option values found (only for options with a value)
QHash<int, QStringList> optionValuesHash;
//! Names of options found on the command line.
QStringList optionNames;
//! Arguments which did not belong to any option.
QStringList positionalArgumentList;
//! Names of options which were unknown.
QStringList unknownOptionNames;
//! Application description
QString description;
//! Documentation for positional arguments
struct PositionalArgumentDefinition
{
QString name;
QString description;
QString syntax;
};
QVector<PositionalArgumentDefinition> positionalArgumentDefinitions;
//! The parsing mode for "-abc"
QCommandLineParser::SingleDashWordOptionMode singleDashWordOptionMode;
//! Whether addVersionOption was called
bool builtinVersionOption;
//! Whether addHelpOption was called
bool builtinHelpOption;
//! True if parse() needs to be called
bool needsParsing;
};
QStringList QCommandLineParserPrivate::aliases(const QString &optionName) const
{
const NameHash_t::const_iterator it = nameHash.find(optionName);
if (it == nameHash.end()) {
qWarning("QCommandLineParser: option not defined: \"%s\"", qPrintable(optionName));
return QStringList();
}
return commandLineOptionList.at(*it).names();
}
/*!
\since 5.2
\class QCommandLineParser
\inmodule QtCore
\ingroup tools
\brief The QCommandLineParser class provides a means for handling the
command line options.
QCoreApplication provides the command-line arguments as a simple list of strings.
QCommandLineParser provides the ability to define a set of options, parse the
command-line arguments, and store which options have actually been used, as
well as option values.
Any argument that isn't an option (i.e. doesn't start with a \c{-}) is stored
as a "positional argument".
The parser handles short names, long names, more than one name for the same
option, and option values.
Options on the command line are recognized as starting with a single or
double \c{-} character(s).
The option \c{-} (single dash alone) is a special case, often meaning standard
input, and not treated as an option. The parser will treat everything after the
option \c{--} (double dash) as positional arguments.
Short options are single letters. The option \c{v} would be specified by
passing \c{-v} on the command line. In the default parsing mode, short options
can be written in a compact form, for instance \c{-abc} is equivalent to \c{-a -b -c}.
The parsing mode for can be set to ParseAsLongOptions, in which case \c{-abc}
will be parsed as the long option \c{abc}.
Long options are more than one letter long and cannot be compacted together.
The long option \c{verbose} would be passed as \c{--verbose} or \c{-verbose}.
Passing values to options can be done using the assignment operator: \c{-v=value}
\c{--verbose=value}, or a space: \c{-v value} \c{--verbose value}, i.e. the next
argument is used as value (even if it starts with a \c{-}).
The parser does not support optional values - if an option is set to
require a value, one must be present. If such an option is placed last
and has no value, the option will be treated as if it had not been
specified.
The parser does not automatically support negating or disabling long options
by using the format \c{--disable-option} or \c{--no-option}. However, it is
possible to handle this case explicitly by making an option with \c{no-option}
as one of its names, and handling the option explicitly.
Example:
\snippet code/src_corelib_tools_qcommandlineparser_main.cpp 0
Known limitation: the parsing of Qt options inside QCoreApplication and subclasses
happens before QCommandLineParser exists, so it can't take it into account. This
means any option value that looks like a builtin Qt option, will be treated by
QCoreApplication as a builtin Qt option. Example: \c{--profile -reverse} will
lead to QGuiApplication seeing the -reverse option set, and removing it from
QCoreApplication::arguments() before QCommandLineParser defines the \c{profile}
option and parses the command line.
\sa QCommandLineOption, QCoreApplication
*/
/*!
Constructs a command line parser object.
*/
QCommandLineParser::QCommandLineParser()
: d(new QCommandLineParserPrivate)
{
}
/*!
Destroys the command line parser object.
*/
QCommandLineParser::~QCommandLineParser()
{
delete d;
}
/*!
\enum QCommandLineParser::SingleDashWordOptionMode
This enum describes the way the parser interprets command-line
options that use a single dash followed by multiple letters, as as \c{-abc}.
\value ParseAsCompactedShortOptions \c{-abc} is interpreted as \c{-a -b -c},
i.e. as three short options that have been compacted on the command-line,
if none of the options take a value. If \c{a} takes a value, then it
is interpreted as \c{-a bc}, i.e. the short option \c{a} followed by the value \c{bc}.
This is typically used in tools that behave like compilers, in order
to handle options such as \c{-DDEFINE=VALUE} or \c{-I/include/path}.
This is the default parsing mode. New applications are recommended to
use this mode.
\value ParseAsLongOptions \c{-abc} is interpreted as \c{--abc},
i.e. as the long option named \c{abc}. This is how Qt's own tools
(uic, rcc...) have always been parsing arguments. This mode should be
used for preserving compatibility in applications that were parsing
arguments in such a way.
\sa setSingleDashWordOptionMode()
*/
/*!
Sets the parsing mode to \a singleDashWordOptionMode.
This must be called before process() or parse().
*/
void QCommandLineParser::setSingleDashWordOptionMode(QCommandLineParser::SingleDashWordOptionMode singleDashWordOptionMode)
{
d->singleDashWordOptionMode = singleDashWordOptionMode;
}
/*!
Adds the option \a option to look for while parsing.
Returns \c true if adding the option was successful; otherwise returns \c false.
Adding the option fails if there is no name attached to the option, or
the option has a name that clashes with an option name added before.
*/
bool QCommandLineParser::addOption(const QCommandLineOption &option)
{
QStringList optionNames = option.names();
if (!optionNames.isEmpty()) {
Q_FOREACH (const QString &name, optionNames) {
if (d->nameHash.contains(name))
return false;
}
d->commandLineOptionList.append(option);
const int offset = d->commandLineOptionList.size() - 1;
Q_FOREACH (const QString &name, optionNames)
d->nameHash.insert(name, offset);
return true;
}
return false;
}
/*!
Adds the \c{-v} / \c{--version} option, which displays the version string of the application.
This option is handled automatically by QCommandLineParser.
You can set the actual version string by using QCoreApplication::setApplicationVersion().
Returns the option instance, which can be used to call isSet().
*/
QCommandLineOption QCommandLineParser::addVersionOption()
{
QCommandLineOption opt(QStringList() << "v" << "version", tr("Displays version information."));
addOption(opt);
d->builtinVersionOption = true;
return opt;
}
/*!
Adds the help option (\c{-h}, \c{--help} and \c{-?} on Windows)
This option is handled automatically by QCommandLineParser.
Remember to use setApplicationDescription to set the application description,
which will be displayed when this option is used.
Example:
\snippet code/src_corelib_tools_qcommandlineparser_main.cpp 0
Returns the option instance, which can be used to call isSet().
*/
QCommandLineOption QCommandLineParser::addHelpOption()
{
QCommandLineOption opt(QStringList()
#ifdef Q_OS_WIN
<< "?"
#endif
<< "h"
<< "help", tr("Displays this help."));
addOption(opt);
d->builtinHelpOption = true;
return opt;
}
/*!
Sets the application \a description shown by helpText().
*/
void QCommandLineParser::setApplicationDescription(const QString &description)
{
d->description = description;
}
/*!
Returns the application description set in setApplicationDescription().
*/
QString QCommandLineParser::applicationDescription() const
{
return d->description;
}
/*!
Defines an additional argument to the application, for the benefit of the help text.
The argument \a name and \a description will appear under the \c{Arguments:} section
of the help. If \a syntax is specified, it will be appended to the Usage line, otherwise
the \a name will be appended.
Example:
\snippet code/src_corelib_tools_qcommandlineparser.cpp 2
\sa addHelpOption(), helpText()
*/
void QCommandLineParser::addPositionalArgument(const QString &name, const QString &description, const QString &syntax)
{
QCommandLineParserPrivate::PositionalArgumentDefinition arg;
arg.name = name;
arg.description = description;
arg.syntax = syntax.isEmpty() ? name : syntax;
d->positionalArgumentDefinitions.append(arg);
}
/*!
Clears the definitions of additional arguments from the help text.
This is only needed for the special case of tools which support multiple commands
with different options. Once the actual command has been identified, the options
for this command can be defined, and the help text for the command can be adjusted
accordingly.
Example:
\snippet code/src_corelib_tools_qcommandlineparser.cpp 3
*/
void QCommandLineParser::clearPositionalArguments()
{
d->positionalArgumentDefinitions.clear();
}
/*!
Parses the command line \a arguments.
Most programs don't need to call this, a simple call to process() is enough.
parse() is more low-level, and only does the parsing. The application will have to
take care of the error handling, using errorText() if parse() returns \c false.
This can be useful for instance to show a graphical error message in graphical programs.
Calling parse() instead of process() can also be useful in order to ignore unknown
options temporarily, because more option definitions will be provided later on
(depending on one of the arguments), before calling process().
Don't forget that \a arguments must start with the name of the executable (ignored, though).
Returns \c false in case of a parse error (unknown option or missing value); returns \c true otherwise.
\sa process()
*/
bool QCommandLineParser::parse(const QStringList &arguments)
{
return d->parse(arguments);
}
/*!
Returns a translated error text for the user.
This should only be called when parse() returns \c false.
*/
QString QCommandLineParser::errorText() const
{
if (!d->errorText.isEmpty())
return d->errorText;
if (d->unknownOptionNames.count() == 1)
return tr("Unknown option '%1'.").arg(d->unknownOptionNames.first());
if (d->unknownOptionNames.count() > 1)
return tr("Unknown options: %1.").arg(d->unknownOptionNames.join(", "));
return QString();
}
/*!
Processes the command line \a arguments.
In addition to parsing the options (like parse()), this function also handles the builtin
options and handles errors.
The builtin options are \c{--version} if addVersionOption was called and \c{--help} if addHelpOption was called.
When invoking one of these options, or when an error happens (for instance an unknown option was
passed), the current process will then stop, using the exit() function.
\sa QCoreApplication::arguments(), parse()
*/
void QCommandLineParser::process(const QStringList &arguments)
{
if (!d->parse(arguments)) {
fprintf(stderr, "%s\n", qPrintable(errorText()));
::exit(EXIT_FAILURE);
}
if (d->builtinVersionOption && isSet("version")) {
printf("%s %s\n", qPrintable(QCoreApplication::applicationName()), qPrintable(QCoreApplication::applicationVersion()));
::exit(EXIT_SUCCESS);
}
if (d->builtinHelpOption && isSet("help"))
showHelp(EXIT_SUCCESS);
}
/*!
\overload
The command line is obtained from the QCoreApplication instance \a app.
*/
void QCommandLineParser::process(const QCoreApplication &app)
{
// QCoreApplication::arguments() is static, but the app instance must exist so we require it as parameter
Q_UNUSED(app);
process(QCoreApplication::arguments());
}
void QCommandLineParserPrivate::checkParsed(const char *method)
{
if (needsParsing)
qWarning("QCommandLineParser: call process() or parse() before %s", method);
}
/*!
\internal
Looks up the option \a optionName (found on the command line) and register it as found.
Returns \c true on success.
*/
bool QCommandLineParserPrivate::registerFoundOption(const QString &optionName)
{
if (nameHash.contains(optionName)) {
optionNames.append(optionName);
return true;
} else {
unknownOptionNames.append(optionName);
return false;
}
}
/*!
\internal
\brief Parse the value for a given option, if it was defined to expect one.
The value is taken from the next argument, or after the equal sign in \a argument.
\param optionName the short option name
\param argument the argument from the command line currently parsed. Only used for -k=value parsing.
\param argumentIterator iterator to the currently parsed argument. Incremented if the next argument contains the value.
\param argsEnd args.end(), to check if ++argumentIterator goes out of bounds
Returns \c true on success.
*/
bool QCommandLineParserPrivate::parseOptionValue(const QString &optionName, const QString &argument,
QStringList::const_iterator *argumentIterator, QStringList::const_iterator argsEnd)
{
const QLatin1Char assignChar('=');
const NameHash_t::const_iterator nameHashIt = nameHash.constFind(optionName);
if (nameHashIt != nameHash.constEnd()) {
const int assignPos = argument.indexOf(assignChar);
const NameHash_t::mapped_type optionOffset = *nameHashIt;
const bool withValue = !commandLineOptionList.at(optionOffset).valueName().isEmpty();
if (withValue) {
if (assignPos == -1) {
++(*argumentIterator);
if (*argumentIterator == argsEnd) {
errorText = QCommandLineParser::tr("Missing value after '%1'.").arg(argument);
return false;
}
optionValuesHash[optionOffset].append(*(*argumentIterator));
} else {
optionValuesHash[optionOffset].append(argument.mid(assignPos + 1));
}
} else {
if (assignPos != -1) {
errorText = QCommandLineParser::tr("Unexpected value after '%1'.").arg(argument.left(assignPos));
return false;
}
}
}
return true;
}
/*!
\internal
Parse the list of arguments \a args, and fills in
optionNames, optionValuesHash, unknownOptionNames, positionalArguments, and errorText.
Any results from a previous parse operation are removed.
The parser will not look for further options once it encounters the option
\c{--}; this does not include when \c{--} follows an option that requires a value.
*/
bool QCommandLineParserPrivate::parse(const QStringList &args)
{
needsParsing = false;
bool error = false;
const QString doubleDashString("--");
const QLatin1Char dashChar('-');
const QLatin1Char assignChar('=');
bool doubleDashFound = false;
errorText.clear();
positionalArgumentList.clear();
optionNames.clear();
unknownOptionNames.clear();
optionValuesHash.clear();
if (args.isEmpty()) {
qWarning("QCommandLineParser: argument list cannot be empty, it should contain at least the executable name");
return false;
}
QStringList::const_iterator argumentIterator = args.begin();
++argumentIterator; // skip executable name
for (; argumentIterator != args.end() ; ++argumentIterator) {
QString argument = *argumentIterator;
if (doubleDashFound) {
positionalArgumentList.append(argument);
} else if (argument.startsWith(doubleDashString)) {
if (argument.length() > 2) {
QString optionName = argument.mid(2).section(assignChar, 0, 0);
if (registerFoundOption(optionName)) {
if (!parseOptionValue(optionName, argument, &argumentIterator, args.end()))
error = true;
} else {
error = true;
}
} else {
doubleDashFound = true;
}
} else if (argument.startsWith(dashChar)) {
if (argument.size() == 1) { // single dash ("stdin")
positionalArgumentList.append(argument);
continue;
}
switch (singleDashWordOptionMode) {
case QCommandLineParser::ParseAsCompactedShortOptions:
{
QString optionName;
bool valueFound = false;
for (int pos = 1 ; pos < argument.size(); ++pos) {
optionName = argument.mid(pos, 1);
if (!registerFoundOption(optionName)) {
error = true;
} else {
const NameHash_t::const_iterator nameHashIt = nameHash.constFind(optionName);
Q_ASSERT(nameHashIt != nameHash.constEnd()); // checked by registerFoundOption
const NameHash_t::mapped_type optionOffset = *nameHashIt;
const bool withValue = !commandLineOptionList.at(optionOffset).valueName().isEmpty();
if (withValue) {
if (pos + 1 < argument.size()) {
if (argument.at(pos + 1) == assignChar)
++pos;
optionValuesHash[optionOffset].append(argument.mid(pos + 1));
valueFound = true;
}
break;
}
if (pos + 1 < argument.size() && argument.at(pos + 1) == assignChar)
break;
}
}
if (!valueFound && !parseOptionValue(optionName, argument, &argumentIterator, args.end()))
error = true;
break;
}
case QCommandLineParser::ParseAsLongOptions:
{
const QString optionName = argument.mid(1).section(assignChar, 0, 0);
if (registerFoundOption(optionName)) {
if (!parseOptionValue(optionName, argument, &argumentIterator, args.end()))
error = true;
} else {
error = true;
}
break;
}
}
} else {
positionalArgumentList.append(argument);
}
if (argumentIterator == args.end())
break;
}
return !error;
}
/*!
Checks whether the option \a name was passed to the application.
Returns \c true if the option \a name was set, false otherwise.
The name provided can be any long or short name of any option that was
added with \c addOption(). All the options names are treated as being
equivalent. If the name is not recognized or that option was not present,
false is returned.
Example:
\snippet code/src_corelib_tools_qcommandlineparser.cpp 0
*/
bool QCommandLineParser::isSet(const QString &name) const
{
d->checkParsed("isSet");
if (d->optionNames.contains(name))
return true;
const QStringList aliases = d->aliases(name);
Q_FOREACH (const QString &optionName, d->optionNames) {
if (aliases.contains(optionName))
return true;
}
return false;
}
/*!
Returns the option value found for the given option name \a optionName, or
an empty string if not found.
The name provided can be any long or short name of any option that was
added with \c addOption(). All the option names are treated as being
equivalent. If the name is not recognized or that option was not present, an
empty string is returned.
For options found by the parser, the last value found for
that option is returned. If the option wasn't specified on the command line,
the default value is returned.
An empty string is returned if the option does not take a value.
\sa values(), QCommandLineOption::setDefaultValue(), QCommandLineOption::setDefaultValues()
*/
QString QCommandLineParser::value(const QString &optionName) const
{
d->checkParsed("value");
const QStringList valueList = values(optionName);
if (!valueList.isEmpty())
return valueList.last();
return QString();
}
/*!
Returns a list of option values found for the given option name \a
optionName, or an empty list if not found.
The name provided can be any long or short name of any option that was
added with \c addOption(). All the options names are treated as being
equivalent. If the name is not recognized or that option was not present, an
empty list is returned.
For options found by the parser, the list will contain an entry for
each time the option was encountered by the parser. If the option wasn't
specified on the command line, the default values are returned.
An empty list is returned if the option does not take a value.
\sa value(), QCommandLineOption::setDefaultValue(), QCommandLineOption::setDefaultValues()
*/
QStringList QCommandLineParser::values(const QString &optionName) const
{
d->checkParsed("values");
const NameHash_t::const_iterator it = d->nameHash.constFind(optionName);
if (it != d->nameHash.constEnd()) {
const int optionOffset = *it;
QStringList values = d->optionValuesHash.value(optionOffset);
if (values.isEmpty())
values = d->commandLineOptionList.at(optionOffset).defaultValues();
return values;
}
qWarning("QCommandLineParser: option not defined: \"%s\"", qPrintable(optionName));
return QStringList();
}
/*!
\overload
Checks whether the \a option was passed to the application.
Returns \c true if the \a option was set, false otherwise.
This is the recommended way to check for options with no values.
Example:
\snippet code/src_corelib_tools_qcommandlineparser.cpp 1
*/
bool QCommandLineParser::isSet(const QCommandLineOption &option) const
{
// option.names() might be empty if the constructor failed
return !option.names().isEmpty() && isSet(option.names().first());
}
/*!
\overload
Returns the option value found for the given \a option, or
an empty string if not found.
For options found by the parser, the last value found for
that option is returned. If the option wasn't specified on the command line,
the default value is returned.
An empty string is returned if the option does not take a value.
\sa values(), QCommandLineOption::setDefaultValue(), QCommandLineOption::setDefaultValues()
*/
QString QCommandLineParser::value(const QCommandLineOption &option) const
{
return value(option.names().first());
}
/*!
\overload
Returns a list of option values found for the given \a option,
or an empty list if not found.
For options found by the parser, the list will contain an entry for
each time the option was encountered by the parser. If the option wasn't
specified on the command line, the default values are returned.
An empty list is returned if the option does not take a value.
\sa value(), QCommandLineOption::setDefaultValue(), QCommandLineOption::setDefaultValues()
*/
QStringList QCommandLineParser::values(const QCommandLineOption &option) const
{
return values(option.names().first());
}
/*!
Returns a list of positional arguments.
These are all of the arguments that were not recognized as part of an
option.
*/
QStringList QCommandLineParser::positionalArguments() const
{
d->checkParsed("positionalArguments");
return d->positionalArgumentList;
}
/*!
Returns a list of option names that were found.
This returns a list of all the recognized option names found by the
parser, in the order in which they were found. For any long options
that were in the form {--option=value}, the value part will have been
dropped.
The names in this list do not include the preceding dash characters.
Names may appear more than once in this list if they were encountered
more than once by the parser.
Any entry in the list can be used with \c value() or with
\c values() to get any relevant option values.
*/
QStringList QCommandLineParser::optionNames() const
{
d->checkParsed("optionNames");
return d->optionNames;
}
/*!
Returns a list of unknown option names.
This list will include both long an short name options that were not
recognized. For any long options that were in the form {--option=value},
the value part will have been dropped and only the long name is added.
The names in this list do not include the preceding dash characters.
Names may appear more than once in this list if they were encountered
more than once by the parser.
\sa optionNames()
*/
QStringList QCommandLineParser::unknownOptionNames() const
{
d->checkParsed("unknownOptionNames");
return d->unknownOptionNames;
}
/*!
Displays the help information, and exits the application.
This is automatically triggered by the --help option, but can also
be used to display the help when the user is not invoking the
application correctly.
The exit code is set to \a exitCode. It should be set to 0 if the
user requested to see the help, and to any other value in case of
an error.
\sa helpText()
*/
void QCommandLineParser::showHelp(int exitCode)
{
fprintf(stdout, "%s", qPrintable(d->helpText()));
::exit(exitCode);
}
/*!
Returns a string containing the complete help information.
\sa showHelp()
*/
QString QCommandLineParser::helpText() const
{
return d->helpText();
}
static QString wrapText(const QString &names, int longestOptionNameString, const QString &description)
{
const QLatin1Char nl('\n');
QString text = QString(" ") + names.leftJustified(longestOptionNameString) + QLatin1Char(' ');
const int indent = text.length();
int lineStart = 0;
int lastBreakable = -1;
const int max = 79 - indent;
int x = 0;
const int len = description.length();
for (int i = 0; i < len; ++i) {
++x;
const QChar c = description.at(i);
if (c.isSpace())
lastBreakable = i;
int breakAt = -1;
int nextLineStart = -1;
if (x > max && lastBreakable != -1) {
// time to break and we know where
breakAt = lastBreakable;
nextLineStart = lastBreakable + 1;
} else if ((x > max - 1 && lastBreakable == -1) || i == len - 1) {
// time to break but found nowhere [-> break here], or end of last line
breakAt = i + 1;
nextLineStart = breakAt;
} else if (c == nl) {
// forced break
breakAt = i;
nextLineStart = i + 1;
}
if (breakAt != -1) {
const int numChars = breakAt - lineStart;
//qDebug() << "breakAt=" << description.at(breakAt) << "breakAtSpace=" << breakAtSpace << lineStart << "to" << breakAt << description.mid(lineStart, numChars);
if (lineStart > 0)
text += QString(indent, QLatin1Char(' '));
text += description.mid(lineStart, numChars) + nl;
x = 0;
lastBreakable = -1;
lineStart = nextLineStart;
if (lineStart < len && description.at(lineStart).isSpace())
++lineStart; // don't start a line with a space
i = lineStart;
}
}
return text;
}
QString QCommandLineParserPrivate::helpText() const
{
const QLatin1Char nl('\n');
QString text;
const QString exeName = QCoreApplication::instance()->arguments().first();
QString usage = exeName;
if (!commandLineOptionList.isEmpty()) {
usage += QLatin1Char(' ');
usage += QCommandLineParser::tr("[options]");
}
Q_FOREACH (const PositionalArgumentDefinition &arg, positionalArgumentDefinitions) {
usage += QLatin1Char(' ');
usage += arg.syntax;
}
text += QCommandLineParser::tr("Usage: %1").arg(usage) + nl;
if (!description.isEmpty())
text += description + nl;
text += nl;
if (!commandLineOptionList.isEmpty())
text += QCommandLineParser::tr("Options:") + nl;
QStringList optionNameList;
int longestOptionNameString = 0;
Q_FOREACH (const QCommandLineOption &option, commandLineOptionList) {
QStringList optionNames;
Q_FOREACH (const QString &optionName, option.names()) {
if (optionName.length() == 1)
optionNames.append(QLatin1Char('-') + optionName);
else
optionNames.append(QString("--") + optionName);
}
QString optionNamesString = optionNames.join(", ");
if (!option.valueName().isEmpty())
optionNamesString += QString(" <") + option.valueName() + QLatin1Char('>');
optionNameList.append(optionNamesString);
longestOptionNameString = qMax(longestOptionNameString, optionNamesString.length());
}
++longestOptionNameString;
for (int i = 0; i < commandLineOptionList.count(); ++i) {
const QCommandLineOption &option = commandLineOptionList.at(i);
text += wrapText(optionNameList.at(i), longestOptionNameString, option.description());
}
if (!positionalArgumentDefinitions.isEmpty()) {
if (!commandLineOptionList.isEmpty())
text += nl;
text += QCommandLineParser::tr("Arguments:") + nl;
Q_FOREACH (const PositionalArgumentDefinition &arg, positionalArgumentDefinitions) {
text += wrapText(arg.name, longestOptionNameString, arg.description);
}
}
return text;
}

102
src/core/qcommandlineparser.h
View File

@ -1,102 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 Laszlo Papp <lpapp@kde.org>
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 2.1 requirements
** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3.0 as published by the Free Software
** Foundation and appearing in the file LICENSE.GPL included in the
** packaging of this file. Please review the following information to
** ensure the GNU General Public License version 3.0 requirements will be
** met: http://www.gnu.org/copyleft/gpl.html.
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QCOMMANDLINEPARSER_H
#define QCOMMANDLINEPARSER_H
#include <QStringList>
#include <QCoreApplication>
#include "qcommandlineoption.h"
class QCommandLineParserPrivate;
class QCoreApplication;
class QCommandLineParser
{
Q_DECLARE_TR_FUNCTIONS(QCommandLineParser)
public:
QCommandLineParser();
~QCommandLineParser();
enum SingleDashWordOptionMode {
ParseAsCompactedShortOptions,
ParseAsLongOptions
};
void setSingleDashWordOptionMode(SingleDashWordOptionMode parsingMode);
bool addOption(const QCommandLineOption &commandLineOption);
QCommandLineOption addVersionOption();
QCommandLineOption addHelpOption();
void setApplicationDescription(const QString &description);
QString applicationDescription() const;
void addPositionalArgument(const QString &name, const QString &description, const QString &syntax = QString());
void clearPositionalArguments();
void process(const QStringList &arguments);
void process(const QCoreApplication &app);
bool parse(const QStringList &arguments);
QString errorText() const;
bool isSet(const QString &name) const;
QString value(const QString &name) const;
QStringList values(const QString &name) const;
bool isSet(const QCommandLineOption &option) const;
QString value(const QCommandLineOption &option) const;
QStringList values(const QCommandLineOption &option) const;
QStringList positionalArguments() const;
QStringList optionNames() const;
QStringList unknownOptionNames() const;
void showHelp(int exitCode = 0);
QString helpText() const;
private:
Q_DISABLE_COPY(QCommandLineParser)
QCommandLineParserPrivate * const d;
};
#endif // QCOMMANDLINEPARSER_H

337
src/core/qlockfile.cpp
View File

@ -1,337 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 David Faure <faure+bluesystems@kde.org>
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "qlockfile.h"
#include "qlockfile_p.h"
#include <QElapsedTimer>
#include <QDateTime>
QT_BEGIN_NAMESPACE
/*!
\class QLockFile
\inmodule QtCore
\brief The QLockFile class provides locking between processes using a file.
\since 5.1
A lock file can be used to prevent multiple processes from accessing concurrently
the same resource. For instance, a configuration file on disk, or a socket, a port,
a region of shared memory...
Serialization is only guaranteed if all processes that access the shared resource
use QLockFile, with the same file path.
QLockFile supports two use cases:
to protect a resource for a short-term operation (e.g. verifying if a configuration
file has changed before saving new settings), and for long-lived protection of a
resource (e.g. a document opened by a user in an editor) for an indefinite amount of time.
When protecting for a short-term operation, it is acceptable to call lock() and wait
until any running operation finishes.
When protecting a resource over a long time, however, the application should always
call setStaleLockTime(0) and then tryLock() with a short timeout, in order to
warn the user that the resource is locked.
If the process holding the lock crashes, the lock file stays on disk and can prevent
any other process from accessing the shared resource, ever. For this reason, QLockFile
tries to detect such a "stale" lock file, based on the process ID written into the file,
and (in case that process ID got reused meanwhile), on the last modification time of
the lock file (30s by default, for the use case of a short-lived operation).
If the lock file is found to be stale, it will be deleted.
For the use case of protecting a resource over a long time, you should therefore call
setStaleLockTime(0), and when tryLock() returns LockFailedError, inform the user
that the document is locked, possibly using getLockInfo() for more details.
*/
/*!
\enum QLockFile::LockError
This enum describes the result of the last call to lock() or tryLock().
\value NoError The lock was acquired successfully.
\value LockFailedError The lock could not be acquired because another process holds it.
\value PermissionError The lock file could not be created, for lack of permissions
in the parent directory.
\value UnknownError Another error happened, for instance a full partition
prevented writing out the lock file.
*/
/*!
Constructs a new lock file object.
The object is created in an unlocked state.
When calling lock() or tryLock(), a lock file named \a fileName will be created,
if it doesn't already exist.
\sa lock(), unlock()
*/
QLockFile::QLockFile(const QString &fileName)
: d_ptr(new QLockFilePrivate(fileName))
{
}
/*!
Destroys the lock file object.
If the lock was acquired, this will release the lock, by deleting the lock file.
*/
QLockFile::~QLockFile()
{
unlock();
}
/*!
Sets \a staleLockTime to be the time in milliseconds after which
a lock file is considered stale.
The default value is 30000, i.e. 30 seconds.
If your application typically keeps the file locked for more than 30 seconds
(for instance while saving megabytes of data for 2 minutes), you should set
a bigger value using setStaleLockTime().
The value of \a staleLockTime is used by lock() and tryLock() in order
to determine when an existing lock file is considered stale, i.e. left over
by a crashed process. This is useful for the case where the PID got reused
meanwhile, so the only way to detect a stale lock file is by the fact that
it has been around for a long time.
\sa staleLockTime()
*/
void QLockFile::setStaleLockTime(int staleLockTime)
{
Q_D(QLockFile);
d->staleLockTime = staleLockTime;
}
/*!
Returns the time in milliseconds after which
a lock file is considered stale.
\sa setStaleLockTime()
*/
int QLockFile::staleLockTime() const
{
Q_D(const QLockFile);
return d->staleLockTime;
}
/*!
Returns \c true if the lock was acquired by this QLockFile instance,
otherwise returns \c false.
\sa lock(), unlock(), tryLock()
*/
bool QLockFile::isLocked() const
{
Q_D(const QLockFile);
return d->isLocked;
}
/*!
Creates the lock file.
If another process (or another thread) has created the lock file already,
this function will block until that process (or thread) releases it.
Calling this function multiple times on the same lock from the same
thread without unlocking first is not allowed. This function will
\e dead-lock when the file is locked recursively.
Returns \c true if the lock was acquired, false if it could not be acquired
due to an unrecoverable error, such as no permissions in the parent directory.
\sa unlock(), tryLock()
*/
bool QLockFile::lock()
{
return tryLock(-1);
}
/*!
Attempts to create the lock file. This function returns \c true if the
lock was obtained; otherwise it returns \c false. If another process (or
another thread) has created the lock file already, this function will
wait for at most \a timeout milliseconds for the lock file to become
available.
Note: Passing a negative number as the \a timeout is equivalent to
calling lock(), i.e. this function will wait forever until the lock
file can be locked if \a timeout is negative.
If the lock was obtained, it must be released with unlock()
before another process (or thread) can successfully lock it.
Calling this function multiple times on the same lock from the same
thread without unlocking first is not allowed, this function will
\e always return false when attempting to lock the file recursively.
\sa lock(), unlock()
*/
bool QLockFile::tryLock(int timeout)
{
Q_D(QLockFile);
QElapsedTimer timer;
if (timeout > 0)
timer.start();
int sleepTime = 100;
Q_FOREVER {
d->lockError = d->tryLock_sys();
switch (d->lockError) {
case NoError:
d->isLocked = true;
return true;
case PermissionError:
case UnknownError:
return false;
case LockFailedError:
if (!d->isLocked && d->isApparentlyStale()) {
// Stale lock from another thread/process
// Ensure two processes don't remove it at the same time
QLockFile rmlock(d->fileName + QLatin1String(".rmlock"));
if (rmlock.tryLock()) {
if (d->isApparentlyStale() && d->removeStaleLock())
continue;
}
}
break;
}
if (timeout == 0 || (timeout > 0 && timer.hasExpired(timeout)))
return false;
QLockFileThread::msleep(sleepTime);
if (sleepTime < 5 * 1000)
sleepTime *= 2;
}
// not reached
return false;
}
/*!
\fn void QLockFile::unlock()
Releases the lock, by deleting the lock file.
Calling unlock() without locking the file first, does nothing.
\sa lock(), tryLock()
*/
/*!
Retrieves information about the current owner of the lock file.
If tryLock() returns \c false, and error() returns LockFailedError,
this function can be called to find out more information about the existing
lock file:
\list
\li the PID of the application (returned in \a pid)
\li the \a hostname it's running on (useful in case of networked filesystems),
\li the name of the application which created it (returned in \a appname),
\endlist
Note that tryLock() automatically deleted the file if there is no
running application with this PID, so LockFailedError can only happen if there is
an application with this PID (it could be unrelated though).
This can be used to inform users about the existing lock file and give them
the choice to delete it. After removing the file using removeStaleLockFile(),
the application can call tryLock() again.
This function returns \c true if the information could be successfully retrieved, false
if the lock file doesn't exist or doesn't contain the expected data.
This can happen if the lock file was deleted between the time where tryLock() failed
and the call to this function. Simply call tryLock() again if this happens.
*/
bool QLockFile::getLockInfo(qint64 *pid, QString *hostname, QString *appname) const
{
Q_D(const QLockFile);
return d->getLockInfo(pid, hostname, appname);
}
bool QLockFilePrivate::getLockInfo(qint64 *pid, QString *hostname, QString *appname) const
{
QFile reader(fileName);
if (!reader.open(QIODevice::ReadOnly))
return false;
QByteArray pidLine = reader.readLine();
pidLine.chop(1);
QByteArray appNameLine = reader.readLine();
appNameLine.chop(1);
QByteArray hostNameLine = reader.readLine();
hostNameLine.chop(1);
if (pidLine.isEmpty())
return false;
qint64 thePid = pidLine.toLongLong();
if (pid)
*pid = thePid;
if (appname)
*appname = QString::fromUtf8(appNameLine);
if (hostname)
*hostname = QString::fromUtf8(hostNameLine);
return thePid > 0;
}
/*!
Attempts to forcefully remove an existing lock file.
Calling this is not recommended when protecting a short-lived operation: QLockFile
already takes care of removing lock files after they are older than staleLockTime().
This method should only be called when protecting a resource for a long time, i.e.
with staleLockTime(0), and after tryLock() returned LockFailedError, and the user
agreed on removing the lock file.
Returns \c true on success, false if the lock file couldn't be removed. This happens
on Windows, when the application owning the lock is still running.
*/
bool QLockFile::removeStaleLockFile()
{
Q_D(QLockFile);
if (d->isLocked) {
qWarning("removeStaleLockFile can only be called when not holding the lock");
return false;
}
return d->removeStaleLock();
}
/*!
Returns the lock file error status.
If tryLock() returns \c false, this function can be called to find out
the reason why the locking failed.
*/
QLockFile::LockError QLockFile::error() const
{
Q_D(const QLockFile);
return d->lockError;
}
QT_END_NAMESPACE

79
src/core/qlockfile.h
View File

@ -1,79 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 David Faure <faure+bluesystems@kde.org>
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QLOCKFILE_H
#define QLOCKFILE_H
#include <QString>
#include <QScopedPointer>
QT_BEGIN_NAMESPACE
class QLockFilePrivate;
class QLockFile
{
public:
QLockFile(const QString &fileName);
~QLockFile();
bool lock();
bool tryLock(int timeout = 0);
void unlock();
void setStaleLockTime(int);
int staleLockTime() const;
bool isLocked() const;
bool getLockInfo(qint64 *pid, QString *hostname, QString *appname) const;
bool removeStaleLockFile();
enum LockError {
NoError = 0,
LockFailedError = 1,
PermissionError = 2,
UnknownError = 3
};
LockError error() const;
protected:
QScopedPointer<QLockFilePrivate> d_ptr;
private:
Q_DECLARE_PRIVATE(QLockFile)
Q_DISABLE_COPY(QLockFile)
};
QT_END_NAMESPACE
#endif // QLOCKFILE_H

104
src/core/qlockfile_p.h
View File

@ -1,104 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 David Faure <faure+bluesystems@kde.org>
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QLOCKFILE_P_H
#define QLOCKFILE_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#include "qlockfile.h"
#include <QFile>
#include <QThread>
#ifdef Q_OS_WIN
#include <qt_windows.h>
#endif
QT_BEGIN_NAMESPACE
class QLockFileThread : public QThread
{
public:
static void msleep(unsigned long msecs) { QThread::msleep(msecs); }
};
class QLockFilePrivate
{
public:
QLockFilePrivate(const QString &fn)
: fileName(fn),
#ifdef Q_OS_WIN
fileHandle(INVALID_HANDLE_VALUE),
#else
fileHandle(-1),
#endif
staleLockTime(30 * 1000), // 30 seconds
lockError(QLockFile::NoError),
isLocked(false)
{
}
QLockFile::LockError tryLock_sys();
bool removeStaleLock();
bool getLockInfo(qint64 *pid, QString *hostname, QString *appname) const;
// Returns \c true if the lock belongs to dead PID, or is old.
// The attempt to delete it will tell us if it was really stale or not, though.
bool isApparentlyStale() const;
#ifdef Q_OS_UNIX
static int checkFcntlWorksAfterFlock();
#endif
QString fileName;
#ifdef Q_OS_WIN
Qt::HANDLE fileHandle;
#else
int fileHandle;
#endif
int staleLockTime; // "int milliseconds" is big enough for 24 days
QLockFile::LockError lockError;
bool isLocked;
};
QT_END_NAMESPACE
#endif /* QLOCKFILE_P_H */

199
src/core/qlockfile_unix.cpp
View File

@ -1,199 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 David Faure <faure+bluesystems@kde.org>
** Contact: http://www.qt-project.org/legal
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and Digia. For licensing terms and
** conditions see http://qt.digia.com/licensing. For further information
** use the contact form at http://qt.digia.com/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Digia gives you certain additional
** rights. These rights are described in the Digia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "qlockfile_p.h"
#include <QTemporaryFile>
#include <QCoreApplication>
#include <QFileInfo>
#include <QDebug>
#include <QDateTime>
#include <sys/file.h> // flock
#include <sys/types.h> // kill
#include <signal.h> // kill
#include <unistd.h>
#include <errno.h>
QT_BEGIN_NAMESPACE
#define EINTR_LOOP(var, cmd) \
do { \
var = cmd; \
} while (var == -1 && errno == EINTR)
// don't call QT_OPEN or ::open
// call qt_safe_open
static inline int qt_safe_open(const char *pathname, int flags, mode_t mode = 0777)
{
#ifdef O_CLOEXEC
flags |= O_CLOEXEC;
#endif
int fd;
EINTR_LOOP(fd, ::open(pathname, flags, mode));
// unknown flags are ignored, so we have no way of verifying if
// O_CLOEXEC was accepted
if (fd != -1)
::fcntl(fd, F_SETFD, FD_CLOEXEC);
return fd;
}
static inline qint64 qt_safe_write(int fd, const void *data, qint64 len)
{
qint64 ret = 0;
EINTR_LOOP(ret, ::write(fd, data, len));
return ret;
}
static QString localHostName() // from QHostInfo::localHostName()
{
char hostName[512];
if (gethostname(hostName, sizeof(hostName)) == -1)
return QString();
hostName[sizeof(hostName) - 1] = '\0';
return QString::fromLocal8Bit(hostName);
}
// ### merge into qt_safe_write?
static qint64 qt_write_loop(int fd, const char *data, qint64 len)
{
qint64 pos = 0;
while (pos < len) {
const qint64 ret = qt_safe_write(fd, data + pos, len - pos);
if (ret == -1) // e.g. partition full
return pos;
pos += ret;
}
return pos;
}
static bool setNativeLocks(int fd)
{
#if defined(LOCK_EX) && defined(LOCK_NB)
if (flock(fd, LOCK_EX | LOCK_NB) == -1) // other threads, and other processes on a local fs
return false;
#endif
struct flock flockData;
flockData.l_type = F_WRLCK;
flockData.l_whence = SEEK_SET;
flockData.l_start = 0;
flockData.l_len = 0; // 0 = entire file
flockData.l_pid = getpid();
if (fcntl(fd, F_SETLK, &flockData) == -1) // for networked filesystems
return false;
return true;
}
QLockFile::LockError QLockFilePrivate::tryLock_sys()
{
// Assemble data, to write in a single call to write
// (otherwise we'd have to check every write call)
// Use operator% from the fast builder to avoid multiple memory allocations.
QByteArray fileData = QByteArray::number(QCoreApplication::applicationPid()) + '\n'
+ qAppName().toUtf8() + '\n'
+ localHostName().toUtf8() + '\n';
const QByteArray lockFileName = QFile::encodeName(fileName);
const int fd = qt_safe_open(lockFileName.constData(), O_WRONLY | O_CREAT | O_EXCL, 0644);
if (fd < 0) {
switch (errno) {
case EEXIST:
return QLockFile::LockFailedError;
case EACCES:
case EROFS:
return QLockFile::PermissionError;
default:
return QLockFile::UnknownError;
}
}
// Ensure nobody else can delete the file while we have it
if (!setNativeLocks(fd))
qWarning() << "setNativeLocks failed:" << strerror(errno);
if (qt_write_loop(fd, fileData.constData(), fileData.size()) < fileData.size()) {
close(fd);
if (!QFile::remove(fileName))
qWarning("QLockFile: Could not remove our own lock file %s.", qPrintable(fileName));
return QLockFile::UnknownError; // partition full
}
// We hold the lock, continue.
fileHandle = fd;
return QLockFile::NoError;
}
bool QLockFilePrivate::removeStaleLock()
{
const QByteArray lockFileName = QFile::encodeName(fileName);
const int fd = qt_safe_open(lockFileName.constData(), O_WRONLY, 0644);
if (fd < 0) // gone already?
return false;
bool success = setNativeLocks(fd) && (::unlink(lockFileName) == 0);
close(fd);
return success;
}
bool QLockFilePrivate::isApparentlyStale() const
{
qint64 pid;
QString hostname, appname;
if (!getLockInfo(&pid, &hostname, &appname))
return false;
if (hostname.isEmpty() || hostname == localHostName()) {
if (::kill(pid, 0) == -1 && errno == ESRCH)
return true; // PID doesn't exist anymore
}
const qint64 age = QFileInfo(fileName).lastModified().msecsTo(QDateTime::currentDateTime());
return staleLockTime > 0 && age > staleLockTime;
}
void QLockFile::unlock()
{
Q_D(QLockFile);
if (!d->isLocked)
return;
close(d->fileHandle);
d->fileHandle = -1;
if (!QFile::remove(d->fileName)) {
qWarning() << "Could not remove our own lock file" << d->fileName << "maybe permissions changed meanwhile?";
// This is bad because other users of this lock file will now have to wait for the stale-lock-timeout...
}
QFile::remove(d->fileName);
d->lockError = QLockFile::NoError;
d->isLocked = false;
}
QT_END_NAMESPACE

178
src/core/qlockfile_win.cpp
View File

@ -1,178 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2013 David Faure <faure+bluesystems@kde.org>
** Contact: http://www.qt.io/licensing/
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef _UNICODE
#define _UNICODE
#endif
#ifndef UNICODE
#define UNICODE
#endif
#include "qlockfile_p.h"
#include <qt_windows.h>
#include <QCoreApplication>
#include <QDir>
#include <QFileInfo>
#include <QDateTime>
#include <QDebug>
QT_BEGIN_NAMESPACE
static inline QByteArray localHostName()
{
return qgetenv("COMPUTERNAME");
}
static inline bool fileExists(const wchar_t *fileName)
{
WIN32_FILE_ATTRIBUTE_DATA data;
return GetFileAttributesEx(fileName, GetFileExInfoStandard, &data);
}
QLockFile::LockError QLockFilePrivate::tryLock_sys()
{
const ushort* nativePath = QDir::toNativeSeparators(fileName).utf16();
// When writing, allow others to read.
// When reading, QFile will allow others to read and write, all good.
// Adding FILE_SHARE_DELETE would allow forceful deletion of stale files,
// but Windows doesn't allow recreating it while this handle is open anyway,
// so this would only create confusion (can't lock, but no lock file to read from).
const DWORD dwShareMode = FILE_SHARE_READ;
#ifndef Q_OS_WINRT
SECURITY_ATTRIBUTES securityAtts = { sizeof(SECURITY_ATTRIBUTES), NULL, FALSE };
HANDLE fh = CreateFile((const wchar_t*)nativePath,
GENERIC_WRITE,
dwShareMode,
&securityAtts,
CREATE_NEW, // error if already exists
FILE_ATTRIBUTE_NORMAL,
NULL);
#else // !Q_OS_WINRT
HANDLE fh = CreateFile2((const wchar_t*)nativePath,
GENERIC_WRITE,
dwShareMode,
CREATE_NEW, // error if already exists
NULL);
#endif // Q_OS_WINRT
if (fh == INVALID_HANDLE_VALUE) {
const DWORD lastError = GetLastError();
switch (lastError) {
case ERROR_SHARING_VIOLATION:
case ERROR_ALREADY_EXISTS:
case ERROR_FILE_EXISTS:
return QLockFile::LockFailedError;
case ERROR_ACCESS_DENIED:
// readonly file, or file still in use by another process.
// Assume the latter if the file exists, since we don't create it readonly.
return fileExists((const wchar_t*)nativePath)
? QLockFile::LockFailedError
: QLockFile::PermissionError;
default:
qWarning() << "Got unexpected locking error" << lastError;
return QLockFile::UnknownError;
}
}
// We hold the lock, continue.
fileHandle = fh;
// Assemble data, to write in a single call to write
// (otherwise we'd have to check every write call)
QByteArray fileData;
fileData += QByteArray::number(QCoreApplication::applicationPid());
fileData += '\n';
fileData += QCoreApplication::applicationName().toUtf8();
fileData += '\n';
fileData += localHostName();
fileData += '\n';
DWORD bytesWritten = 0;
QLockFile::LockError error = QLockFile::NoError;
if (!WriteFile(fh, fileData.constData(), fileData.size(), &bytesWritten, NULL) || !FlushFileBuffers(fh))
error = QLockFile::UnknownError; // partition full
return error;
}
bool QLockFilePrivate::removeStaleLock()
{
// QFile::remove fails on Windows if the other process is still using the file, so it's not stale.
return QFile::remove(fileName);
}
bool QLockFilePrivate::isApparentlyStale() const
{
qint64 pid;
QString hostname, appname;
if (!getLockInfo(&pid, &hostname, &appname))
return false;
// On WinRT there seems to be no way of obtaining information about other
// processes due to sandboxing
#ifndef Q_OS_WINRT
if (hostname == QString::fromLocal8Bit(localHostName())) {
HANDLE procHandle = ::OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, pid);
if (!procHandle)
return true;
// We got a handle but check if process is still alive
DWORD dwR = ::WaitForSingleObject(procHandle, 0);
::CloseHandle(procHandle);
if (dwR == WAIT_TIMEOUT)
return true;
}
#endif // !Q_OS_WINRT
const qint64 age = QFileInfo(fileName).lastModified().msecsTo(QDateTime::currentDateTime());
return staleLockTime > 0 && age > staleLockTime;
}
void QLockFile::unlock()
{
Q_D(QLockFile);
if (!d->isLocked)
return;
CloseHandle(d->fileHandle);
int attempts = 0;
static const int maxAttempts = 500; // 500ms
while (!QFile::remove(d->fileName) && ++attempts < maxAttempts) {
// Someone is reading the lock file right now (on Windows this prevents deleting it).
QLockFileThread::msleep(1);
}
if (attempts == maxAttempts) {
qWarning() << "Could not remove our own lock file" << d->fileName << ". Either other users of the lock file are reading it constantly for 500 ms, or we (no longer) have permissions to delete the file";
// This is bad because other users of this lock file will now have to wait for the stale-lock-timeout...
}
d->lockError = QLockFile::NoError;
d->isLocked = false;
}
QT_END_NAMESPACE

435
src/core/qsavefile.cpp
View File

@ -1,435 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#include "qsavefile.h"
#include "qsavefile_p.h"
#include <QAbstractFileEngine>
#include <QFileInfo>
#include <QTemporaryFile>
QSaveFilePrivate::QSaveFilePrivate()
: tempFile(0), error(QFile::NoError)
{
}
QSaveFilePrivate::~QSaveFilePrivate()
{
}
/*!
\class QSaveFile
\brief The QSaveFile class provides an interface for safely writing to files.
\ingroup io
\reentrant
QSaveFile is an I/O device for writing text and binary files, without losing
existing data if the writing operation fails.
While writing, the contents will be written to a temporary file, and if
no error happened, commit() will move it to the final file. This ensures that
no data at the final file is lost in case an error happens while writing,
and no partially-written file is ever present at the final location. Always
use QSaveFile when saving entire documents to disk.
QSaveFile automatically detects errors while writing, such as the full partition
situation, where write() cannot write all the bytes. It will remember that
an error happened, and will discard the temporary file in commit().
Much like with QFile, the file is opened with open(). Data is usually read
and written using QDataStream or QTextStream, but you can also call the
QIODevice-inherited functions read(), readLine(), readAll(), write().
Unlike QFile, calling close() is not allowed. commit() replaces it. If commit()
was not called and the QSaveFile instance is destroyed, the temporary file is
discarded.
\sa QTextStream, QDataStream, QFileInfo, QDir, QFile, QTemporaryFile
*/
/*!
\internal
*/
QSaveFile::QSaveFile()
: QIODevice(), d_ptr(new QSaveFilePrivate)
{
}
/*!
Constructs a new file object with the given \a parent.
*/
QSaveFile::QSaveFile(QObject *parent)
: QIODevice(parent), d_ptr(new QSaveFilePrivate)
{
}
/*!
Constructs a new file object to represent the file with the given \a name.
*/
QSaveFile::QSaveFile(const QString &name)
: QIODevice(0), d_ptr(new QSaveFilePrivate)
{
Q_D(QSaveFile);
d->fileName = name;
}
/*!
Constructs a new file object with the given \a parent to represent the
file with the specified \a name.
*/
QSaveFile::QSaveFile(const QString &name, QObject *parent)
: QIODevice(parent), d_ptr(new QSaveFilePrivate)
{
Q_D(QSaveFile);
d->fileName = name;
}
/*!
Destroys the file object, discarding the saved contents unless commit() was called.
*/
QSaveFile::~QSaveFile()
{
Q_D(QSaveFile);
if (d->tempFile) {
d->tempFile->setAutoRemove(true);
delete d->tempFile;
}
QIODevice::close();
delete d;
}
/*!
Returns false since temporary files support random access.
\sa QIODevice::isSequential()
*/
bool QSaveFile::isSequential() const
{
return false;
}
/*!
Returns the file error status.
The I/O device status returns an error code. For example, if open()
returns false, or a read/write operation returns -1, this function can
be called to find out the reason why the operation failed.
Unlike QFile which clears the error on the next operation, QSaveFile remembers
the error until the file is closed, in order to discard the file contents in close().
\sa unsetError()
*/
QFile::FileError QSaveFile::error() const
{
return d_func()->error;
}
/*!
Sets the file's error to QFile::NoError.
This will make QSaveFile forget that an error happened during saving, so you
probably don't want to call this, unless you're really sure that you want to
save the file anyway.
\sa error()
*/
void QSaveFile::unsetError()
{
d_func()->error = QFile::NoError;
setErrorString(QString());
}
/*!
Returns the name set by setFileName() or to the QSaveFile
constructor.
\sa setFileName()
*/
QString QSaveFile::fileName() const
{
return d_func()->fileName;
}
/*!
Sets the \a name of the file. The name can have no path, a
relative path, or an absolute path.
\sa QFile::setFileName(), fileName()
*/
void QSaveFile::setFileName(const QString &name)
{
d_func()->fileName = name;
}
/*!
Opens the file using OpenMode \a mode, returning true if successful;
otherwise false.
Important: the \a mode must be QIODevice::WriteOnly.
It may also have additional flags, such as QIODevice::Text and QIODevice::Unbuffered.
QIODevice::ReadWrite and QIODevice::Append are not supported at the moment.
\sa QIODevice::OpenMode, setFileName()
*/
bool QSaveFile::open(OpenMode mode)
{
Q_D(QSaveFile);
if (isOpen()) {
qWarning("QSaveFile::open: File (%s) already open", qPrintable(fileName()));
return false;
}
unsetError();
if ((mode & (ReadOnly | WriteOnly)) == 0) {
qWarning("QSaveFile::open: Open mode not specified");
return false;
}
// In the future we could implement Append and ReadWrite by copying from the existing file to the temp file...
if ((mode & ReadOnly) || (mode & Append)) {
qWarning("QSaveFile::open: Unsupported open mode %d", int(mode));
return false;
}
// check if existing file is writable
QFileInfo existingFile(d->fileName);
if (existingFile.exists() && !existingFile.isWritable()) {
d->error = QFile::WriteError;
setErrorString(QSaveFile::tr("Existing file %1 is not writable").arg(d->fileName));
return false;
}
d->tempFile = new QTemporaryFile;
d->tempFile->setAutoRemove(false);
d->tempFile->setFileTemplate(d->fileName);
if (!d->tempFile->open()) {
d->error = d->tempFile->error();
setErrorString(d->tempFile->errorString());
delete d->tempFile;
d->tempFile = 0;
return false;
}
QIODevice::open(mode);
if (existingFile.exists())
d->tempFile->setPermissions(existingFile.permissions());
return true;
}
/*!
\reimp
Cannot be called.
Call commit() instead.
*/
void QSaveFile::close()
{
qFatal("QSaveFile::close called");
}
/*
Commits the changes to disk, if all previous writes were successful.
It is mandatory to call this at the end of the saving operation, otherwise the file will be
discarded.
If an error happened during writing, deletes the temporary file and returns false.
Otherwise, renames it to the final fileName and returns true on success.
Finally, closes the device.
\sa cancelWriting()
*/
bool QSaveFile::commit()
{
Q_D(QSaveFile);
if (!d->tempFile)
return false;
Q_ASSERT(isOpen());
QIODevice::close(); // flush and close
if (d->error != QFile::NoError) {
d->tempFile->remove();
unsetError();
delete d->tempFile;
d->tempFile = 0;
return false;
}
d->tempFile->close();
#ifdef Q_OS_WIN
// On Windows QAbstractFileEngine::rename() fails if the the target exists,
// so we have to rename the target.
// Ideally the winapi ReplaceFile() method should be used.
QString bakname = d->fileName + "~";
QFile::remove(bakname);
QFile::rename(d->fileName, bakname);
#endif
QAbstractFileEngine* fileEngine = d->tempFile->fileEngine();
Q_ASSERT(fileEngine);
if (!fileEngine->rename(d->fileName)) {
d->error = fileEngine->error();
setErrorString(fileEngine->errorString());
d->tempFile->remove();
delete d->tempFile;
d->tempFile = 0;
#ifdef Q_OS_WIN
QFile::rename(bakname, d->fileName);
#endif
return false;
}
delete d->tempFile;
d->tempFile = 0;
#ifdef Q_OS_WIN
QFile::remove(bakname);
#endif
return true;
}
/*!
Sets an error code so that commit() discards the temporary file.
Further write operations are possible after calling this method, but none
of it will have any effect, the written file will be discarded.
\sa commit()
*/
void QSaveFile::cancelWriting()
{
if (!isOpen())
return;
d_func()->error = QFile::WriteError;
setErrorString(QSaveFile::tr("Writing canceled by application"));
}
/*!
Returns the size of the file.
\sa QFile::size()
*/
qint64 QSaveFile::size() const
{
Q_D(const QSaveFile);
return d->tempFile ? d->tempFile->size() : qint64(-1);
}
/*!
\reimp
*/
qint64 QSaveFile::pos() const
{
Q_D(const QSaveFile);
return d->tempFile ? d->tempFile->pos() : qint64(-1);
}
/*!
\reimp
*/
bool QSaveFile::seek(qint64 offset)
{
Q_D(QSaveFile);
return d->tempFile ? d->tempFile->seek(offset) : false;
}
/*!
\reimp
*/
bool QSaveFile::atEnd() const
{
Q_D(const QSaveFile);
return d->tempFile ? d->tempFile->atEnd() : true;
}
/*!
Flushes any buffered data to the file. Returns true if successful;
otherwise returns false.
*/
bool QSaveFile::flush()
{
Q_D(QSaveFile);
if (d->tempFile) {
if (!d->tempFile->flush()) {
d->error = d->tempFile->error();
setErrorString(d->tempFile->errorString());
return false;
}
return true;
}
return false;
}
/*!
Returns the file handle of the temporary file.
\sa QFile::handle()
*/
int QSaveFile::handle() const
{
Q_D(const QSaveFile);
return d->tempFile ? d->tempFile->handle() : -1;
}
/*!
\reimp
*/
qint64 QSaveFile::readData(char *data, qint64 maxlen)
{
Q_D(QSaveFile);
return d->tempFile ? d->tempFile->read(data, maxlen) : -1;
}
/*!
\reimp
*/
qint64 QSaveFile::writeData(const char *data, qint64 len)
{
Q_D(QSaveFile);
if (!d->tempFile)
return -1;
const qint64 written = d->tempFile->write(data, len);
if (written != len) {
d->error = QFile::WriteError;
setErrorString(QSaveFile::tr("Partial write. Partition full?"));
}
return written;
}
/*!
\reimp
*/
qint64 QSaveFile::readLineData(char *data, qint64 maxlen)
{
Q_D(QSaveFile);
return d->tempFile ? d->tempFile->readLine(data, maxlen) : -1;
}

105
src/core/qsavefile.h
View File

@ -1,105 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QSAVEFILE_H
#define QSAVEFILE_H
#include <QFile>
#include <QString>
#ifdef open
#error qsavefile.h must be included before any header file that defines open
#endif
class QAbstractFileEngine;
class QSaveFilePrivate;
class QSaveFile : public QIODevice
{
Q_OBJECT
Q_DECLARE_PRIVATE(QSaveFile)
public:
QSaveFile();
explicit QSaveFile(const QString &name);
explicit QSaveFile(QObject *parent);
QSaveFile(const QString &name, QObject *parent);
~QSaveFile();
QFile::FileError error() const;
void unsetError();
QString fileName() const;
void setFileName(const QString &name);
bool isSequential() const;
virtual bool open(OpenMode flags);
bool commit();
void cancelWriting();
qint64 size() const;
qint64 pos() const;
bool seek(qint64 offset);
bool atEnd() const;
bool flush();
bool resize(qint64 sz);
int handle() const;
protected:
qint64 readData(char *data, qint64 maxlen);
qint64 writeData(const char *data, qint64 len);
qint64 readLineData(char *data, qint64 maxlen);
private:
virtual void close();
private:
Q_DISABLE_COPY(QSaveFile)
QSaveFilePrivate* const d_ptr;
};
#endif // QSAVEFILE_H

71
src/core/qsavefile_p.h
View File

@ -1,71 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
** This file is part of the QtCore module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
** This file may be used under the terms of the GNU Lesser General Public
** License version 2.1 as published by the Free Software Foundation and
** appearing in the file LICENSE.LGPL included in the packaging of this
** file. Please review the following information to ensure the GNU Lesser
** General Public License version 2.1 requirements will be met:
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** In addition, as a special exception, Nokia gives you certain additional
** rights. These rights are described in the Nokia Qt LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU General
** Public License version 3.0 as published by the Free Software Foundation
** and appearing in the file LICENSE.GPL included in the packaging of this
** file. Please review the following information to ensure the GNU General
** Public License version 3.0 requirements will be met:
** http://www.gnu.org/copyleft/gpl.html.
**
** Other Usage
** Alternatively, this file may be used in accordance with the terms and
** conditions contained in a signed written agreement between you and Nokia.
**
**
**
**
**
**
** $QT_END_LICENSE$
**
****************************************************************************/
#ifndef QSAVEFILE_P_H
#define QSAVEFILE_P_H
//
// W A R N I N G
// -------------
//
// This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to
// version without notice, or even be removed.
//
// We mean it.
//
#include <QTemporaryFile>
class QSaveFilePrivate
{
public:
QSaveFilePrivate();
~QSaveFilePrivate();
QString fileName;
QTemporaryFile *tempFile;
QFile::FileError error;
};
#endif // QSAVEFILE_P_H

55
src/crypto/Crypto.cpp
View File

@ -27,43 +27,7 @@
bool Crypto::m_initalized(false); bool Crypto::m_initalized(false);
QString Crypto::m_errorStr; QString Crypto::m_errorStr;
QString Crypto::m_backendVersion;
#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
static int gcry_qt_mutex_init(void** p_sys)
{
*p_sys = new QMutex();
return 0;
}
static int gcry_qt_mutex_destroy(void** p_sys)
{
delete reinterpret_cast<QMutex*>(*p_sys);
return 0;
}
static int gcry_qt_mutex_lock(void** p_sys)
{
reinterpret_cast<QMutex*>(*p_sys)->lock();
return 0;
}
static int gcry_qt_mutex_unlock(void** p_sys)
{
reinterpret_cast<QMutex*>(*p_sys)->unlock();
return 0;
}
static const struct gcry_thread_cbs gcry_threads_qt =
{
GCRY_THREAD_OPTION_USER,
0,
gcry_qt_mutex_init,
gcry_qt_mutex_destroy,
gcry_qt_mutex_lock,
gcry_qt_mutex_unlock,
0, 0, 0, 0, 0, 0, 0, 0
};
#endif
Crypto::Crypto() Crypto::Crypto()
{ {
@ -76,11 +40,7 @@ bool Crypto::init()
return true; return true;
} }
// libgcrypt >= 1.6 doesn't allow custom thread callbacks anymore. m_backendVersion = QString::fromLocal8Bit(gcry_check_version(0));
#if !defined(GCRYPT_VERSION_NUMBER) || (GCRYPT_VERSION_NUMBER < 0x010600)
gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_qt);
#endif
gcry_check_version(0);
gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0); gcry_control(GCRYCTL_INITIALIZATION_FINISHED, 0);
if (!checkAlgorithms()) { if (!checkAlgorithms()) {
@ -108,6 +68,11 @@ QString Crypto::errorString()
return m_errorStr; return m_errorStr;
} }
QString Crypto::backendVersion()
{
return QString("libgcrypt ").append(m_backendVersion);
}
bool Crypto::backendSelfTest() bool Crypto::backendSelfTest()
{ {
return (gcry_control(GCRYCTL_SELFTEST) == 0); return (gcry_control(GCRYCTL_SELFTEST) == 0);
@ -115,18 +80,18 @@ bool Crypto::backendSelfTest()
bool Crypto::checkAlgorithms() bool Crypto::checkAlgorithms()
{ {
if (gcry_cipher_algo_info(GCRY_CIPHER_AES256, GCRYCTL_TEST_ALGO, Q_NULLPTR, Q_NULLPTR) != 0) { if (gcry_cipher_algo_info(GCRY_CIPHER_AES256, GCRYCTL_TEST_ALGO, nullptr, nullptr) != 0) {
m_errorStr = "GCRY_CIPHER_AES256 not found."; m_errorStr = "GCRY_CIPHER_AES256 not found.";
qWarning("Crypto::checkAlgorithms: %s", qPrintable(m_errorStr)); qWarning("Crypto::checkAlgorithms: %s", qPrintable(m_errorStr));
return false; return false;
} }
if (gcry_cipher_algo_info(GCRY_CIPHER_TWOFISH, GCRYCTL_TEST_ALGO, Q_NULLPTR, Q_NULLPTR) != 0) { if (gcry_cipher_algo_info(GCRY_CIPHER_TWOFISH, GCRYCTL_TEST_ALGO, nullptr, nullptr) != 0) {
m_errorStr = "GCRY_CIPHER_TWOFISH not found."; m_errorStr = "GCRY_CIPHER_TWOFISH not found.";
qWarning("Crypto::checkAlgorithms: %s", qPrintable(m_errorStr)); qWarning("Crypto::checkAlgorithms: %s", qPrintable(m_errorStr));
return false; return false;
} }
#ifdef GCRYPT_HAS_SALSA20 #ifdef GCRYPT_HAS_SALSA20
if (gcry_cipher_algo_info(GCRY_CIPHER_SALSA20, GCRYCTL_TEST_ALGO, Q_NULLPTR, Q_NULLPTR) != 0) { if (gcry_cipher_algo_info(GCRY_CIPHER_SALSA20, GCRYCTL_TEST_ALGO, nullptr, nullptr) != 0) {
m_errorStr = "GCRY_CIPHER_SALSA20 not found."; m_errorStr = "GCRY_CIPHER_SALSA20 not found.";
qWarning("Crypto::checkAlgorithms: %s", qPrintable(m_errorStr)); qWarning("Crypto::checkAlgorithms: %s", qPrintable(m_errorStr));
return false; return false;

4
src/crypto/Crypto.h
View File

@ -20,8 +20,6 @@
#include <QString> #include <QString>
#include "core/Global.h"
class Crypto class Crypto
{ {
public: public:
@ -29,6 +27,7 @@ public:
static bool initalized(); static bool initalized();
static bool backendSelfTest(); static bool backendSelfTest();
static QString errorString(); static QString errorString();
static QString backendVersion();
private: private:
Crypto(); Crypto();
@ -43,6 +42,7 @@ private:
static bool m_initalized; static bool m_initalized;
static QString m_errorStr; static QString m_errorStr;
static QString m_backendVersion;
}; };
#endif // KEEPASSX_CRYPTO_H #endif // KEEPASSX_CRYPTO_H

5
src/crypto/Random.cpp
View File

@ -19,15 +19,16 @@
#include <gcrypt.h> #include <gcrypt.h>
#include "core/Global.h"
#include "crypto/Crypto.h" #include "crypto/Crypto.h"
class RandomBackendGcrypt : public RandomBackend class RandomBackendGcrypt : public RandomBackend
{ {
public: public:
void randomize(void* data, int len) Q_DECL_OVERRIDE; void randomize(void* data, int len) override;
}; };
Random* Random::m_instance(Q_NULLPTR); Random* Random::m_instance(nullptr);
void Random::randomize(QByteArray& ba) void Random::randomize(QByteArray& ba)
{ {

10
src/crypto/SymmetricCipher.cpp
View File

@ -19,7 +19,6 @@
#include "config-keepassx.h" #include "config-keepassx.h"
#include "crypto/SymmetricCipherGcrypt.h" #include "crypto/SymmetricCipherGcrypt.h"
#include "crypto/SymmetricCipherSalsa20.h"
SymmetricCipher::SymmetricCipher(SymmetricCipher::Algorithm algo, SymmetricCipher::Mode mode, SymmetricCipher::SymmetricCipher(SymmetricCipher::Algorithm algo, SymmetricCipher::Mode mode,
SymmetricCipher::Direction direction) SymmetricCipher::Direction direction)
@ -61,19 +60,12 @@ SymmetricCipherBackend* SymmetricCipher::createBackend(SymmetricCipher::Algorith
switch (algo) { switch (algo) {
case SymmetricCipher::Aes256: case SymmetricCipher::Aes256:
case SymmetricCipher::Twofish: case SymmetricCipher::Twofish:
#if defined(GCRYPT_HAS_SALSA20)
case SymmetricCipher::Salsa20: case SymmetricCipher::Salsa20:
#endif
return new SymmetricCipherGcrypt(algo, mode, direction); return new SymmetricCipherGcrypt(algo, mode, direction);
#if !defined(GCRYPT_HAS_SALSA20)
case SymmetricCipher::Salsa20:
return new SymmetricCipherSalsa20(algo, mode, direction);
#endif
default: default:
Q_ASSERT(false); Q_ASSERT(false);
return Q_NULLPTR; return nullptr;
} }
} }

1
src/crypto/SymmetricCipher.h
View File

@ -22,7 +22,6 @@
#include <QScopedPointer> #include <QScopedPointer>
#include <QString> #include <QString>
#include "core/Global.h"
#include "crypto/SymmetricCipherBackend.h" #include "crypto/SymmetricCipherBackend.h"
class SymmetricCipher class SymmetricCipher

Some files were not shown because too many files have changed in this diff Show More