Skip to content

Commit

Permalink
Add revision: v1.26.5
Browse files Browse the repository at this point in the history
  • Loading branch information
GovernikusAusweisApp2 committed Jul 25, 2023
1 parent d83e25b commit 4c9e0be
Show file tree
Hide file tree
Showing 339 changed files with 6,455 additions and 2,241 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ if(UNIX AND NOT IOS)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15 CACHE STRING "Required macOS version")
endif()

project(AusweisApp2 VERSION 1.26.4 LANGUAGES ${LANGUAGES})
project(AusweisApp2 VERSION 1.26.5 LANGUAGES ${LANGUAGES})

# Set TWEAK if not defined in PROJECT_VERSION above to
# have a valid tweak version without propagating it
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG ALPINE_VERSION=3.17
ARG ALPINE_VERSION=3.18

FROM alpine:$ALPINE_VERSION as builder
# Install development stuff
Expand Down
20 changes: 13 additions & 7 deletions cmake/Install.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -84,13 +84,16 @@ if(WIN32)
endif()

if (QT6)
# Workaround for QTBUG-94066
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Gui/Qt6QSvgPluginTargets.cmake")
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Gui/Qt6QGifPluginTargets.cmake")
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Gui/Qt6QJpegPluginTargets.cmake")
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Gui/Qt6QWindowsIntegrationPluginTargets.cmake")
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Widgets/Qt6QWindowsVistaStylePluginTargets.cmake")
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Network/Qt6QTlsBackendOpenSSLPluginTargets.cmake")
if(QT_VERSION VERSION_LESS "6.4")
# Workaround for QTBUG-94066
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Gui/Qt6QSvgPluginTargets.cmake")
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Gui/Qt6QGifPluginTargets.cmake")
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Gui/Qt6QJpegPluginTargets.cmake")
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Gui/Qt6QWindowsIntegrationPluginTargets.cmake")
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Widgets/Qt6QWindowsVistaStylePluginTargets.cmake")
include("${QT_INSTALL_ARCHDATA}/lib/cmake/Qt6Network/Qt6QTlsBackendOpenSSLPluginTargets.cmake")
endif()

FETCH_TARGET_LOCATION(openSslBackend "${Qt}::QTlsBackendOpenSSLPlugin")
install(FILES ${openSslBackend} DESTINATION tls COMPONENT Runtime)
list(APPEND LIBS ${openSslBackend})
Expand Down Expand Up @@ -247,6 +250,7 @@ elseif(ANDROID)
foreach(entry ldpi mdpi hdpi xhdpi xxhdpi xxxhdpi)
install(FILES ${RESOURCES_IMG_ANDROID_DIR}/${entry}/background_npa.png DESTINATION ${ANDROID_PACKAGE_SRC_DIR}/res/mipmap-${entry} COMPONENT Runtime RENAME npa_background.png)
install(FILES ${RESOURCES_IMG_ANDROID_DIR}/${entry}/foreground_${ANDROID_LAUNCHER_ICON} DESTINATION ${ANDROID_PACKAGE_SRC_DIR}/res/mipmap-${entry} COMPONENT Runtime RENAME npa_foreground.png)
install(FILES ${RESOURCES_IMG_ANDROID_DIR}/${entry}/monochrome_${ANDROID_LAUNCHER_ICON} DESTINATION ${ANDROID_PACKAGE_SRC_DIR}/res/mipmap-${entry} COMPONENT Runtime RENAME npa_monochrome.png)
install(FILES ${RESOURCES_IMG_ANDROID_DIR}/${entry}/${ANDROID_LAUNCHER_ICON} DESTINATION ${ANDROID_PACKAGE_SRC_DIR}/res/mipmap-${entry} COMPONENT Runtime RENAME npa.png)
install(FILES ${RESOURCES_IMG_ANDROID_DIR}/${entry}/${ANDROID_SPLASH_SCREEN_ICON_NAME} DESTINATION ${ANDROID_PACKAGE_SRC_DIR}/res/drawable-${entry} COMPONENT Runtime RENAME splash_npa.png)
endforeach()
Expand All @@ -269,6 +273,8 @@ elseif(ANDROID)
set(QML_ROOT_PATH [\"${RESOURCES_DIR}/qml\"])
set(ANDROID_ROOT_LOGGER "")
configure_file(${PACKAGING_DIR}/android/fileprovider.xml ${ANDROID_PACKAGE_SRC_DIR}/res/xml/fileprovider.xml COPYONLY)
configure_file(${PACKAGING_DIR}/android/full_backup_content.xml ${ANDROID_PACKAGE_SRC_DIR}/res/xml/full_backup_content.xml COPYONLY)
configure_file(${PACKAGING_DIR}/android/data_extraction_rules.xml ${ANDROID_PACKAGE_SRC_DIR}/res/xml/data_extraction_rules.xml COPYONLY)
endif()

set(ANDROID_SO_NAME libAusweisApp2_${CMAKE_ANDROID_ARCH_ABI}.so)
Expand Down
5 changes: 1 addition & 4 deletions cmake/Libraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,8 @@ if(NOT CONTAINER_SDK)
endif()

if(NOT INTEGRATED_SDK)
list(APPEND QT_COMPONENTS Svg WebSockets Qml Quick QuickControls2 QuickTemplates2)
list(APPEND QT_COMPONENTS Svg WebSockets Qml Quick QuickControls2 QuickTemplates2 QmlWorkerScript)

if(QT_VERSION VERSION_GREATER_EQUAL "5.14")
list(APPEND QT_COMPONENTS QmlWorkerScript)
endif()
if(NOT DESKTOP AND NOT QT6)
list(APPEND QT_COMPONENTS QuickShapes)
endif()
Expand Down
1 change: 0 additions & 1 deletion cmake/Messages.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ if(ANDROID)
message(STATUS "ANDROID_BUILD_TOOLS_REVISION: ${ANDROID_BUILD_TOOLS_REVISION}")

message(STATUS "ANDROID_NDK_REVISION: ${ANDROID_NDK_REVISION}")
message(STATUS "ANDROID_SDK_REVISION: ${ANDROID_SDK_REVISION}")
endif()


Expand Down
6 changes: 5 additions & 1 deletion cmake/Packaging.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,11 @@ elseif(ANDROID)
file(READ "${BUILD_GRADLE_APPEND}" BUILD_GRADLE)
file(APPEND "${CMAKE_INSTALL_PREFIX}/build.gradle" "${BUILD_GRADLE}")

if(USE_SMARTEID AND NOT INTEGRATED_SDK)
if(INTEGRATED_SDK)
set(BUILD_GRADLE_APPEND "${PACKAGING_DIR}/android/build.gradle.append.aar")
file(READ "${BUILD_GRADLE_APPEND}" BUILD_GRADLE)
file(APPEND "${CMAKE_INSTALL_PREFIX}/build.gradle" "${BUILD_GRADLE}")
elseif(USE_SMARTEID)
set(BUILD_GRADLE_APPEND "${PACKAGING_DIR}/android/build.gradle.append.smarteid")
file(READ "${BUILD_GRADLE_APPEND}" BUILD_GRADLE)
file(APPEND "${CMAKE_INSTALL_PREFIX}/build.gradle" "${BUILD_GRADLE}")
Expand Down
2 changes: 1 addition & 1 deletion cmake/Tools.Libraries.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# So this file will be called two times and the check needs to respect that
# with a "VALIDATOR function" or "if(NOT VARIABLE)".

if(NOT QMLFORMAT)
if(NOT TARGET format.qml)
set(QMLFORMAT_MIN_VERSION 6)
function(qmlformat_validator validator_result binary)
execute_process(COMMAND ${binary} --version OUTPUT_VARIABLE QMLFORMAT_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
Expand Down
60 changes: 60 additions & 0 deletions cmake/Tools.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,33 @@ if(INKSCAPE)
COMMAND ${INKSCAPE} adaptive_foreground_preview.svg -d 640 -y 0 -o xxxhdpi/foreground_npa_preview.png
WORKING_DIRECTORY ${RESOURCES_DIR}/images/android)

add_custom_target(npaicons.android.adaptive.monochrome
COMMAND ${INKSCAPE} adaptive_monochrome_release.svg -d 120 -y 0 -o ldpi/monochrome_npa.png
COMMAND ${INKSCAPE} adaptive_monochrome_release.svg -d 160 -y 0 -o mdpi/monochrome_npa.png
COMMAND ${INKSCAPE} adaptive_monochrome_release.svg -d 240 -y 0 -o hdpi/monochrome_npa.png
COMMAND ${INKSCAPE} adaptive_monochrome_release.svg -d 320 -y 0 -o xhdpi/monochrome_npa.png
COMMAND ${INKSCAPE} adaptive_monochrome_release.svg -d 480 -y 0 -o xxhdpi/monochrome_npa.png
COMMAND ${INKSCAPE} adaptive_monochrome_release.svg -d 640 -y 0 -o xxxhdpi/monochrome_npa.png
WORKING_DIRECTORY ${RESOURCES_DIR}/images/android)

add_custom_target(npaicons.android.adaptive.monochrome.beta
COMMAND ${INKSCAPE} adaptive_monochrome_beta.svg -d 120 -y 0 -o ldpi/monochrome_npa_beta.png
COMMAND ${INKSCAPE} adaptive_monochrome_beta.svg -d 160 -y 0 -o mdpi/monochrome_npa_beta.png
COMMAND ${INKSCAPE} adaptive_monochrome_beta.svg -d 240 -y 0 -o hdpi/monochrome_npa_beta.png
COMMAND ${INKSCAPE} adaptive_monochrome_beta.svg -d 320 -y 0 -o xhdpi/monochrome_npa_beta.png
COMMAND ${INKSCAPE} adaptive_monochrome_beta.svg -d 480 -y 0 -o xxhdpi/monochrome_npa_beta.png
COMMAND ${INKSCAPE} adaptive_monochrome_beta.svg -d 640 -y 0 -o xxxhdpi/monochrome_npa_beta.png
WORKING_DIRECTORY ${RESOURCES_DIR}/images/android)

add_custom_target(npaicons.android.adaptive.monochrome.preview
COMMAND ${INKSCAPE} adaptive_monochrome_preview.svg -d 120 -y 0 -o ldpi/monochrome_npa_preview.png
COMMAND ${INKSCAPE} adaptive_monochrome_preview.svg -d 160 -y 0 -o mdpi/monochrome_npa_preview.png
COMMAND ${INKSCAPE} adaptive_monochrome_preview.svg -d 240 -y 0 -o hdpi/monochrome_npa_preview.png
COMMAND ${INKSCAPE} adaptive_monochrome_preview.svg -d 320 -y 0 -o xhdpi/monochrome_npa_preview.png
COMMAND ${INKSCAPE} adaptive_monochrome_preview.svg -d 480 -y 0 -o xxhdpi/monochrome_npa_preview.png
COMMAND ${INKSCAPE} adaptive_monochrome_preview.svg -d 640 -y 0 -o xxxhdpi/monochrome_npa_preview.png
WORKING_DIRECTORY ${RESOURCES_DIR}/images/android)

add_custom_target(npaicons.android.launchimage
COMMAND ${INKSCAPE} npa_release.svg -w 120 -h 120 -y 0 -o android/ldpi/splash_npa.png
COMMAND ${INKSCAPE} npa_release.svg -w 180 -h 180 -y 0 -o android/mdpi/splash_npa.png
Expand Down Expand Up @@ -313,6 +340,9 @@ if(INKSCAPE)
npaicons.android.adaptive.foreground
npaicons.android.adaptive.foreground.beta
npaicons.android.adaptive.foreground.preview
npaicons.android.adaptive.monochrome
npaicons.android.adaptive.monochrome.beta
npaicons.android.adaptive.monochrome.preview
npaicons.android.launchimage
npaicons.android.launchimage.beta
npaicons.android.launchimage.preview
Expand Down Expand Up @@ -407,6 +437,33 @@ if(PNGQUANT)
COMMAND ${PNGQUANT_CMD} xxxhdpi/foreground_npa_preview.png -- xxxhdpi/foreground_npa_preview.png
WORKING_DIRECTORY ${RESOURCES_DIR}/images/android)

add_custom_target(pngquant.android.adaptive.monochrome
COMMAND ${PNGQUANT_CMD} ldpi/monochrome_npa.png -- ldpi/monochrome_npa.png
COMMAND ${PNGQUANT_CMD} mdpi/monochrome_npa.png -- mdpi/monochrome_npa.png
COMMAND ${PNGQUANT_CMD} hdpi/monochrome_npa.png -- hdpi/monochrome_npa.png
COMMAND ${PNGQUANT_CMD} xhdpi/monochrome_npa.png -- xhdpi/monochrome_npa.png
COMMAND ${PNGQUANT_CMD} xxhdpi/monochrome_npa.png -- xxhdpi/monochrome_npa.png
COMMAND ${PNGQUANT_CMD} xxxhdpi/monochrome_npa.png -- xxxhdpi/monochrome_npa.png
WORKING_DIRECTORY ${RESOURCES_DIR}/images/android)

add_custom_target(pngquant.android.adaptive.monochrome.beta
COMMAND ${PNGQUANT_CMD} ldpi/monochrome_npa_beta.png -- ldpi/monochrome_npa_beta.png
COMMAND ${PNGQUANT_CMD} mdpi/monochrome_npa_beta.png -- mdpi/monochrome_npa_beta.png
COMMAND ${PNGQUANT_CMD} hdpi/monochrome_npa_beta.png -- hdpi/monochrome_npa_beta.png
COMMAND ${PNGQUANT_CMD} xhdpi/monochrome_npa_beta.png -- xhdpi/monochrome_npa_beta.png
COMMAND ${PNGQUANT_CMD} xxhdpi/monochrome_npa_beta.png -- xxhdpi/monochrome_npa_beta.png
COMMAND ${PNGQUANT_CMD} xxxhdpi/monochrome_npa_beta.png -- xxxhdpi/monochrome_npa_beta.png
WORKING_DIRECTORY ${RESOURCES_DIR}/images/android)

add_custom_target(pngquant.android.adaptive.monochrome.preview
COMMAND ${PNGQUANT_CMD} ldpi/monochrome_npa_preview.png -- ldpi/monochrome_npa_preview.png
COMMAND ${PNGQUANT_CMD} mdpi/monochrome_npa_preview.png -- mdpi/monochrome_npa_preview.png
COMMAND ${PNGQUANT_CMD} hdpi/monochrome_npa_preview.png -- hdpi/monochrome_npa_preview.png
COMMAND ${PNGQUANT_CMD} xhdpi/monochrome_npa_preview.png -- xhdpi/monochrome_npa_preview.png
COMMAND ${PNGQUANT_CMD} xxhdpi/monochrome_npa_preview.png -- xxhdpi/monochrome_npa_preview.png
COMMAND ${PNGQUANT_CMD} xxxhdpi/monochrome_npa_preview.png -- xxxhdpi/monochrome_npa_preview.png
WORKING_DIRECTORY ${RESOURCES_DIR}/images/android)

add_custom_target(pngquant.android.launchimage
COMMAND ${PNGQUANT_CMD} ldpi/splash_npa.png -- ldpi/splash_npa.png
COMMAND ${PNGQUANT_CMD} mdpi/splash_npa.png -- mdpi/splash_npa.png
Expand Down Expand Up @@ -491,6 +548,9 @@ if(PNGQUANT)
pngquant.android.adaptive.foreground
pngquant.android.adaptive.foreground.beta
pngquant.android.adaptive.foreground.preview
pngquant.android.adaptive.monochrome
pngquant.android.adaptive.monochrome.beta
pngquant.android.adaptive.monochrome.preview
pngquant.android.launchimage
pngquant.android.launchimage.beta
pngquant.android.launchimage.preview
Expand Down
5 changes: 0 additions & 5 deletions cmake/android.toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ if(NOT ANDROID_BUILD_TOOLS_REVISION)
endif()

READ_REVISION(ANDROID_NDK_REVISION ".*Revision = ([0-9|\\.]+)" "${CMAKE_ANDROID_NDK}/source.properties")
READ_REVISION(ANDROID_SDK_REVISION ".*Revision=([0-9|\\.]+)" "${ANDROID_SDK}/cmdline-tools/latest/source.properties;${ANDROID_SDK}/tools/source.properties")

set(CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION clang)
set(CMAKE_SYSTEM_NAME Android)
Expand All @@ -73,10 +72,6 @@ if(CMAKE_ANDROID_ARCH_ABI STREQUAL "armeabi-v7a")
set(CMAKE_ANDROID_ARM_NEON ON)
endif()

# Emulate NDK CMake-Variable as Qt 5.14 needs this (Multi-ABI)
set(ANDROID_ABI ${CMAKE_ANDROID_ARCH_ABI})


set(CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH} CACHE STRING "android find search path root")
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
Expand Down
18 changes: 9 additions & 9 deletions docs/failurecodes/failurecodes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -157,21 +157,21 @@ Codes
the description of the service provider certificate. This condition is not met.
| **Possible Solutions:** :ref:`failure_code_inform_service_provider`.
- | **Pre_Verfication_No_Test_Environment**
- | **Pre_Verification_No_Test_Environment**
| Occurs when the development mode of AusweisApp2 is activated and a genuine ID card is used.
| **Possible Solutions:** Disable developer mode. The use of genuine ID cards is not permitted with
activated developer mode, as this is only intended to facilitate the commissioning of services
with test ID cards.
- | **Pre_Verfication_Invalid_Certificate_Chain**
- | **Pre_Verification_Invalid_Certificate_Chain**
| A certificate chain was sent from the server that is unknown to AusweisApp2.
| **Possible Solutions:** :ref:`failure_code_inform_service_provider`.
- | **Pre_Verfication_Invalid_Certificate_Signature**
- | **Pre_Verification_Invalid_Certificate_Signature**
| At least one signature in the certificate chain used by the server is incorrect.
| **Possible Solutions:** :ref:`failure_code_inform_service_provider`.
- | **Pre_Verfication_Certificate_Expired**
- | **Pre_Verification_Certificate_Expired**
| The certificate chain used by the server is currently not valid.
| **Possible Solutions:** Make sure your system time is set correctly. If the problem persists,
see :ref:`failure_code_inform_service_provider`.
Expand Down Expand Up @@ -262,14 +262,14 @@ Codes
- | **Generic_Send_Receive_Paos_Unhandled**
| A message was sent by the server in the PAOS communication during authentication, that
could be completely processed.
could not be completely processed.
| **Possible Solutions:** :ref:`failure_code_contact_support`.
- | **Generic_Send_Receive_Network_Error**
| A network error has occurred in the PAOS communication during authentication.
| **Possible Solutions:** :ref:`failure_code_fix_connections_problems`.
- | **Generic_Send_Receive_Ssl_Error**
- | **Generic_Send_Receive_Tls_Error**
| An authentication error occurred in the PAOS communication during the TLS handshake. The TLS
certificate is incorrect.
| **Possible Solutions:** :ref:`failure_code_inform_service_provider`.
Expand Down Expand Up @@ -318,7 +318,7 @@ Codes
did not behave as expected by the server.
| **Possible Solutions:** :ref:`failure_code_contact_support`.
- | **Check_Refresh_Address_Fatal_Ssl_Error_Before_Reply**
- | **Check_Refresh_Address_Fatal_Tls_Error_Before_Reply**
| An error occurred during the TLS handshake when checking the return address after a successful
authentication. The TLS certificate is incorrect.
| **Possible Solutions:** :ref:`failure_code_inform_service_provider`.
Expand All @@ -341,7 +341,7 @@ Codes
didn't work for checking the return address.
| **Possible Solutions:** :ref:`failure_code_fix_connections_problems`.
- | **Check_Refresh_Address_Fatal_Ssl_Error_After_Reply**
- | **Check_Refresh_Address_Fatal_Tls_Error_After_Reply**
| When checking the return address after successful authentication, the TLS handshake could not
be completed successfully.
| **Possible Solutions:** :ref:`failure_code_fix_connections_problems`.
Expand Down Expand Up @@ -413,7 +413,7 @@ Codes
self-authentication.
| **Possible Solutions:** :ref:`failure_code_inform_service_provider`.
- | **Generic_Provider_Communication_Ssl_Error**
- | **Generic_Provider_Communication_Tls_Error**
| An error occurred during the TLS handshake when communicating with a service provider. The TLS
certificate is incorrect. This only applies to services that are started from AusweisApp2,
such as self-authentication.
Expand Down
18 changes: 9 additions & 9 deletions docs/failurecodes/locales/de/LC_MESSAGES/failurecodes.po
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ msgstr ""
"TLS-Zertifikate in der Beschreibung des Diensteanbieterzertifikats "
"enthalten sind. Diese Bedingung ist nicht erfüllt."

msgid "**Pre_Verfication_No_Test_Environment**"
msgid "**Pre_Verification_No_Test_Environment**"
msgstr ""

msgid ""
Expand All @@ -380,7 +380,7 @@ msgstr ""
"dieser nur die Inbetriebnahme von Diensten mit Testausweisen erleichtern "
"soll."

msgid "**Pre_Verfication_Invalid_Certificate_Chain**"
msgid "**Pre_Verification_Invalid_Certificate_Chain**"
msgstr ""

msgid ""
Expand All @@ -390,7 +390,7 @@ msgstr ""
"Vom Server wurde eine Zertifikatskette gesendet, die der AusweisApp2 "
"nicht bekannt ist."

msgid "**Pre_Verfication_Invalid_Certificate_Signature**"
msgid "**Pre_Verification_Invalid_Certificate_Signature**"
msgstr ""

msgid ""
Expand All @@ -400,7 +400,7 @@ msgstr ""
"Mindestens eine Signatur in der vom Server genutzten Zertifikatskette ist"
" nicht korrekt."

msgid "**Pre_Verfication_Certificate_Expired**"
msgid "**Pre_Verification_Certificate_Expired**"
msgstr ""

msgid "The certificate chain used by the server is currently not valid."
Expand Down Expand Up @@ -639,7 +639,7 @@ msgstr ""

msgid ""
"A message was sent by the server in the PAOS communication during "
"authentication, that could be completely processed."
"authentication, that could not be completely processed."
msgstr ""
"Bei einer Authentisierung ist eine Nachricht vom Server in der PAOS-"
"Kommunikation gesendet worden, die nicht vollständig verarbeitet werden "
Expand All @@ -655,7 +655,7 @@ msgstr ""
"Bei einer Authentisierung ist ein Netzwerkfehler in der PAOS-"
"Kommunikation aufgetreten."

msgid "**Generic_Send_Receive_Ssl_Error**"
msgid "**Generic_Send_Receive_Tls_Error**"
msgstr ""

msgid ""
Expand Down Expand Up @@ -766,7 +766,7 @@ msgstr ""
"geliefert. Die AusweisApp2 oder die Karte hat sich nicht entsprechend der"
" Erwartung des Servers verhalten."

msgid "**Check_Refresh_Address_Fatal_Ssl_Error_Before_Reply**"
msgid "**Check_Refresh_Address_Fatal_Tls_Error_Before_Reply**"
msgstr ""

msgid ""
Expand Down Expand Up @@ -815,7 +815,7 @@ msgstr ""
" Proxyserver konfiguriert. Dieser hat für die Überprüfung der "
"Rücksprungadresse nicht funktioniert."

msgid "**Check_Refresh_Address_Fatal_Ssl_Error_After_Reply**"
msgid "**Check_Refresh_Address_Fatal_Tls_Error_After_Reply**"
msgstr ""

msgid ""
Expand Down Expand Up @@ -976,7 +976,7 @@ msgstr ""
"aus der AusweisApp2 heraus gestartet werden, wie zum Beispiel die "
"Selbstauskunft."

msgid "**Generic_Provider_Communication_Ssl_Error**"
msgid "**Generic_Provider_Communication_Tls_Error**"
msgstr ""

msgid ""
Expand Down
9 changes: 3 additions & 6 deletions docs/installation/README.de.rst
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@ dargestellt:
<false/>
<key>remindToClose</key>
<false/>
<key>showSetupAssistant</key>
<false/>
<key>uiStartupModule</key>
<string>DEFAULT</string>
<key>transportPinReminder</key>
<false/>
<key>customProxyType</key>
Expand All @@ -183,8 +183,6 @@ dargestellt:
<string>proxy.example.org</string>
<key>customProxyPort</key>
<integer>1337</integer>
<key>autoUpdateCheck</key>
<false/>
<key>keylessPassword</key>
<true/>
<key>shuffleScreenKeyboard</key>
Expand All @@ -209,12 +207,11 @@ macOS Windows
======================= =======================
autoCloseWindow AUTOHIDE
remindToClose REMINDTOCLOSE
showSetupAssistant ASSISTANT
uiStartupModule ASSISTANT
transportPinReminder TRANSPORTPINREMINDER
customProxyType CUSTOMPROXYTYPE
customProxyPort CUSTOMPROXYPORT
customProxyHost CUSTOMPROXYHOST
autoUpdateCheck UPDATECHECK
keylessPassword ONSCREENKEYBOARD
shuffleScreenKeyboard SHUFFLESCREENKEYBOARD
visualPrivacy SECURESCREENKEYBOARD
Expand Down

0 comments on commit 4c9e0be

Please sign in to comment.