diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 3312e6f96..f479e019b 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -214,7 +214,7 @@ elseif(WIN32)
set(PLATFORM x86)
set(OPENSSL_SUFFIX "")
endif()
- set(MSI_FILE "Digidoc4_Client-${VERSION}$ENV{VER_SUFFIX}.${PLATFORM}")
+ set(MSI_FILE "Digidoc4-${VERSION}$ENV{VER_SUFFIX}.${PLATFORM}")
list(APPEND CANDLE_CMD "$ENV{WIX}bin\\candle.exe" -nologo
-arch ${PLATFORM}
-dMSI_VERSION=${VERSION}
@@ -235,12 +235,10 @@ elseif(WIN32)
add_custom_target(msi DEPENDS ${PROJECT_NAME}
COMMAND "$ENV{WIX}bin\\heat.exe" dir ${LIBS_PATH}/schema -nologo -cg Schemas -gg -scom -sreg -sfrag -srd -dr SchemaFolder -var var.schemasLocation -out SchemasFragment.wxs
COMMAND ${CANDLE_CMD}
- COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.en-US.wxl -cultures:en-US -o "${MSI_FILE}.en-US.msi"
- COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.et-EE.wxl -cultures:et-EE -o "${MSI_FILE}.et-EE.msi"
+ COMMAND ${LIGHT_CMD} -o "${MSI_FILE}.msi"
#Build MSI with QT
COMMAND ${CANDLE_CMD} -dqt_path=${qtCore_install_prefix}
- COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.en-US.wxl -cultures:en-US -o "${MSI_FILE}.en-US.qt.msi"
- COMMAND ${LIGHT_CMD} -loc ${CMAKE_SOURCE_DIR}/${PROJECT_NAME}.et-EE.wxl -cultures:et-EE -o "${MSI_FILE}.et-EE.qt.msi"
+ COMMAND ${LIGHT_CMD} -o "${MSI_FILE}.qt.msi"
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
if(SIGNCERT)
diff --git a/client/mac/Info.plist.cmake b/client/mac/Info.plist.cmake
index dc9c0267c..a24261f41 100644
--- a/client/mac/Info.plist.cmake
+++ b/client/mac/Info.plist.cmake
@@ -13,7 +13,7 @@
CFBundleInfoDictionaryVersion
6.0
CFBundleName
- ${MACOSX_BUNDLE_BUNDLE_NAME}
+ DigiDoc4
CFBundlePackageType
APPL
CFBundleSupportedPlatforms
@@ -31,9 +31,7 @@
NSHighResolutionCapable
NSAppleEventsUsageDescription
- DigiDoc4 Client can use AppleScript to talk with apps, for example to insert attachments to emails.
- LSHasLocalizedDisplayName
-
+ DigiDoc4 can use AppleScript to talk with apps, for example to insert attachments to emails.
LSApplicationCategoryType
public.app-category.productivity
LSMinimumSystemVersion
@@ -169,7 +167,7 @@
NSMenuItem
default
- Sign with DigiDoc4 Client
+ Sign with DigiDoc4
NSMessage
signClient
@@ -189,7 +187,7 @@
NSMenuItem
default
- Encrypt with DigiDoc4 Client
+ Encrypt with DigiDoc4
NSMessage
openCrypto
diff --git a/client/mac/Resources/en.lproj/InfoPlist.strings b/client/mac/Resources/en.lproj/InfoPlist.strings
deleted file mode 100644
index 3811f7553..000000000
--- a/client/mac/Resources/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "DigiDoc4 Client";
-CFBundleDisplayName = "DigiDoc4 Client";
diff --git a/client/mac/Resources/et.lproj/InfoPlist.strings b/client/mac/Resources/et.lproj/InfoPlist.strings
deleted file mode 100644
index 9853a4ec5..000000000
--- a/client/mac/Resources/et.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "DigiDoc4 klient";
-CFBundleDisplayName = "DigiDoc4 klient";
diff --git a/client/mac/Resources/et.lproj/ServicesMenu.strings b/client/mac/Resources/et.lproj/ServicesMenu.strings
index af69975da..36ab2c31c 100644
--- a/client/mac/Resources/et.lproj/ServicesMenu.strings
+++ b/client/mac/Resources/et.lproj/ServicesMenu.strings
@@ -1,2 +1,2 @@
-"Sign with DigiDoc4 Client" = "Allkirjasta DigiDoc4 klient rakendusega";
-"Encrypt with DigiDoc4 Client" = "Krüpteeri DigiDoc4 klient rakendusega";
+"Sign with DigiDoc4" = "Allkirjasta DigiDoc4 rakendusega";
+"Encrypt with DigiDoc4" = "Krüpteeri DigiDoc4 rakendusega";
diff --git a/client/mac/Resources/ru.lproj/InfoPlist.strings b/client/mac/Resources/ru.lproj/InfoPlist.strings
deleted file mode 100644
index c334afd63..000000000
--- a/client/mac/Resources/ru.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Localized versions of Info.plist keys */
-
-CFBundleName = "DigiDoc4 Клиент";
-CFBundleDisplayName = "DigiDoc4 Клиент";
diff --git a/client/mac/Resources/ru.lproj/ServicesMenu.strings b/client/mac/Resources/ru.lproj/ServicesMenu.strings
index 32db0bae3..9c37491ad 100644
--- a/client/mac/Resources/ru.lproj/ServicesMenu.strings
+++ b/client/mac/Resources/ru.lproj/ServicesMenu.strings
@@ -1,2 +1,2 @@
-"Sign with DigiDoc4 Client" = "Подпишите с помощью приложения DigiDoc4";
-"Encrypt with DigiDoc4 Client" = "Зашифруйте с помощью приложения DigiDoc4";
+"Sign with DigiDoc4" = "Подпишите с помощью приложения DigiDoc4";
+"Encrypt with DigiDoc4" = "Зашифруйте с помощью приложения DigiDoc4";
diff --git a/client/qdigidoc4.desktop b/client/qdigidoc4.desktop
index 5b9b7a434..4a2beeee8 100644
--- a/client/qdigidoc4.desktop
+++ b/client/qdigidoc4.desktop
@@ -5,9 +5,7 @@ Type=Application
Exec=qdigidoc4 %F
Icon=qdigidoc4
-Name=DigiDoc4 Client
-Name[et]=DigiDoc4 klient
-Name[ru]=DigiDoc4 клиент
+Name=DigiDoc4
Keywords=ID-card;Utility;
Keywords[et_EE]=ID-kaart;Haldusvahend;
diff --git a/client/qdigidoc4.rc b/client/qdigidoc4.rc
index fb5d0c891..45e0cb00b 100644
--- a/client/qdigidoc4.rc
+++ b/client/qdigidoc4.rc
@@ -21,23 +21,23 @@ BEGIN
BLOCK "040904B0"
BEGIN
VALUE "CompanyName", "RIA"
- VALUE "FileDescription", "DigiDoc4 Client"
+ VALUE "FileDescription", "DigiDoc4"
VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
VALUE "InternalName", "qdigidoc4"
VALUE "LegalCopyright", "Copyright (C) 2017-2023 Estonian Information System Authority"
VALUE "OriginalFilename", "qdigidoc4.exe"
- VALUE "ProductName", "DigiDoc4 Client"
+ VALUE "ProductName", "DigiDoc4"
VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
END
BLOCK "042504B0"
BEGIN
VALUE "CompanyName", "RIA"
- VALUE "FileDescription", "DigiDoc4 Klient"
+ VALUE "FileDescription", "DigiDoc4"
VALUE "FileVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
VALUE "InternalName", "qdigidoc4"
VALUE "LegalCopyright", "Copyright (C) 2017-2023 Riigi Infosüsteemi Amet"
VALUE "OriginalFilename", "qdigidoc4.exe"
- VALUE "ProductName", "DigiDoc4 Klient"
+ VALUE "ProductName", "DigiDoc4"
VALUE "ProductVersion", VER_STR(MAJOR_VER.MINOR_VER.RELEASE_VER.BUILD_VER)
END
END
diff --git a/qdigidoc4.en-US.wxl b/qdigidoc4.en-US.wxl
deleted file mode 100644
index 2a6ba6d9b..000000000
--- a/qdigidoc4.en-US.wxl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- DigiDoc4 client
- ID-card
-
diff --git a/qdigidoc4.et-EE.wxl b/qdigidoc4.et-EE.wxl
deleted file mode 100644
index 644fb09df..000000000
--- a/qdigidoc4.et-EE.wxl
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- DigiDoc4 klient
- ID-kaart
-
diff --git a/qdigidoc4.wxs b/qdigidoc4.wxs
index 622fbe3d7..d8f7e4b80 100644
--- a/qdigidoc4.wxs
+++ b/qdigidoc4.wxs
@@ -50,21 +50,11 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
-
-
-
DESKTOP_SHORTCUT = 1
-
@@ -74,8 +64,8 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
-
+
@@ -188,7 +178,6 @@ msiexec /a libdigidocpp-3.13.8.1378.msi /qn TARGETDIR=C:\target
-