Merge pull request #8 from swiszczoo/develop

Prepare to release 0.1.2
swiszczoo · Feb 18, 2022 · b879ed3 · b879ed3
2 parents 912ae3a + b2f27a0
commit b879ed3
Show file tree

Hide file tree

Showing 15 changed files with 185 additions and 89 deletions.
diff --git a/nsis/winpinator.nsh b/nsis/winpinator.nsh
@@ -92,9 +92,17 @@ InstallDirRegKey HKLM ${REG_KEY} "InstallLocation_${ARCH}"
 
 Var StartMenuDir
 Var ins86_1
+Var ins86_1_maj
+Var ins86_1_min
 Var ins64_1
+Var ins64_1_maj
+Var ins64_1_min
 Var ins86_2
+Var ins86_2_maj
+Var ins86_2_min
 Var ins64_2
+Var ins64_2_maj
+Var ins64_2_min
 
 !insertmacro MUI_PAGE_WELCOME
 !insertmacro MUI_PAGE_LICENSE "gpl-3.0.rtf"
@@ -389,20 +397,46 @@ SectionEnd
 Function .onInit
     !insertmacro MUI_LANGDLL_DISPLAY
 
-    # Check if MSVCP is installed
+    # Check if appropriate MSVCP version is installed
     ReadRegDword $ins64_1 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
+    ReadRegDword $ins64_1_maj HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Major"
+    ReadRegDword $ins64_1_min HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Minor"
+
     ReadRegDword $ins64_2 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Installed"
+    ReadRegDword $ins64_2_maj HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Major"
+    ReadRegDword $ins64_2_min HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Minor"
+
+
     ReadRegDword $ins86_1 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
+    ReadRegDword $ins86_1_maj HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Major"
+    ReadRegDword $ins86_1_min HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Minor"
+
     ReadRegDword $ins86_2 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Installed"
+    ReadRegDword $ins86_2_maj HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Major"
+    ReadRegDword $ins86_2_min HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Minor"
 
 !if ${ARCH} == "x64"
     ${If} $ins64_1 == "1"
-    ${OrIf} $ins64_2 == "1"
+    ${AndIf} $ins64_1_maj == "14"
+    ${AndIf} $ins64_1_min >= "30"
+      !insertmacro UnselectSection ${VCREDIST}
+    ${EndIf}
+
+    ${If} $ins64_2 == "1"
+    ${AndIf} $ins64_2_maj == "14"
+    ${AndIf} $ins64_2_min >= "30"
       !insertmacro UnselectSection ${VCREDIST}
     ${EndIf}
 !else
     ${If} $ins86_1 == "1"
-    ${OrIf} $ins86_2 == "1"
+    ${AndIf} $ins86_1_maj == "14"
+    ${AndIf} $ins86_1_min >= "30"
+      !insertmacro UnselectSection ${VCREDIST}
+    ${EndIf}
+
+    ${If} $ins86_2 == "1"
+    ${AndIf} $ins86_2_maj == "14"
+    ${AndIf} $ins86_2_min >= "30"
       !insertmacro UnselectSection ${VCREDIST}
     ${EndIf}
 !endif

diff --git a/po/en_US.po b/po/en_US.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-27 23:10+0100\n"
-"PO-Revision-Date: 2021-12-27 23:11+0100\n"
+"POT-Creation-Date: 2022-02-18 19:12+0100\n"
+"PO-Revision-Date: 2022-02-18 19:12+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en_US\n"
@@ -693,7 +693,7 @@ msgid "Send a folder..."
 msgstr "Send a folder..."
 
 #: .\gui\page_transferlist.cpp:65 .\gui\page_transferlist.cpp:261
-#: .\gui\settings_dialog.cpp:537
+#: .\gui\settings_dialog.cpp:538
 msgid "Clear history"
 msgstr "Clear history"
 
@@ -714,7 +714,7 @@ msgstr "Select directories to send..."
 msgid "Are you sure you want to clear entire history for this device?"
 msgstr "Are you sure you want to clear entire history for this device?"
 
-#: .\gui\page_transferlist.cpp:263 .\gui\settings_dialog.cpp:539
+#: .\gui\page_transferlist.cpp:263 .\gui\settings_dialog.cpp:540
 msgid "This operation cannot be undone!"
 msgstr "This operation cannot be undone!"
 
@@ -890,7 +890,7 @@ msgstr "Incoming port for registration:"
 msgid "Automatic"
 msgstr "Automatic"
 
-#: .\gui\settings_dialog.cpp:536
+#: .\gui\settings_dialog.cpp:537
 msgid "Are you sure you want to clear all history?"
 msgstr "Are you sure you want to clear all history?"
 
@@ -986,85 +986,94 @@ msgid_plural "Send %d elements..."
 msgstr[0] "Send %d element..."
 msgstr[1] "Send %d elements..."
 
-#: .\gui\winpinator_frame.cpp:21
+#: .\gui\winpinator_frame.cpp:23
 msgid "Winpinator"
 msgstr "Winpinator"
 
 #. TRANSLATORS: format string
-#: .\gui\winpinator_frame.cpp:68 .\gui\winpinator_frame.cpp:321
+#: .\gui\winpinator_frame.cpp:71 .\gui\winpinator_frame.cpp:328
 #, c-format
 msgid "IP: %s"
 msgstr "IP: %s"
 
-#: .\gui\winpinator_frame.cpp:72 .\gui\winpinator_frame.cpp:305
-#: .\gui\winpinator_frame.cpp:316
+#: .\gui\winpinator_frame.cpp:75 .\gui\winpinator_frame.cpp:312
+#: .\gui\winpinator_frame.cpp:323
 msgid "Offline!"
 msgstr "Offline!"
 
-#: .\gui\winpinator_frame.cpp:137
+#: .\gui\winpinator_frame.cpp:138
 msgid "&Open save folder...\tCtrl+O"
 msgstr "&Open save folder...\tCtrl+O"
 
-#: .\gui\winpinator_frame.cpp:138 .\tray_icon.cpp:81
+#: .\gui\winpinator_frame.cpp:139 .\tray_icon.cpp:81
 msgid "Open the incoming files folder in Explorer"
 msgstr "Open the incoming files folder in Explorer"
 
-#: .\gui\winpinator_frame.cpp:139
+#: .\gui\winpinator_frame.cpp:140
 msgid "&Preferences..."
 msgstr "&Preferences..."
 
-#: .\gui\winpinator_frame.cpp:140
+#: .\gui\winpinator_frame.cpp:141
 msgid "Adjust app preferences"
 msgstr "Adjust app preferences"
 
-#: .\gui\winpinator_frame.cpp:142
+#: .\gui\winpinator_frame.cpp:143
 msgid "E&xit\tAlt+F4"
 msgstr "E&xit\tAlt+F4"
 
-#: .\gui\winpinator_frame.cpp:143
+#: .\gui\winpinator_frame.cpp:144
 msgid "Close this window but let Winpinator run in background"
 msgstr "Close this window but let Winpinator run in background"
 
-#: .\gui\winpinator_frame.cpp:145
+#: .\gui\winpinator_frame.cpp:146
 msgid "Exit and &stop the service\tCtrl+Alt+F4"
 msgstr "Exit and &stop the service\tCtrl+Alt+F4"
 
-#: .\gui\winpinator_frame.cpp:146
+#: .\gui\winpinator_frame.cpp:147
 msgid "Exit Winpinator and stop being visible to other computers"
 msgstr "Exit Winpinator and stop being visible to other computers"
 
-#: .\gui\winpinator_frame.cpp:148
+#: .\gui\winpinator_frame.cpp:149
 msgid "&File"
 msgstr "&File"
 
-#: .\gui\winpinator_frame.cpp:151
+#: .\gui\winpinator_frame.cpp:152
 msgid "&Help topics...\tF1"
 msgstr "&Help topics...\tF1"
 
-#: .\gui\winpinator_frame.cpp:152
+#: .\gui\winpinator_frame.cpp:153
 msgid "Show help and documentation of Winpinator"
 msgstr "Show help and documentation of Winpinator"
 
-#: .\gui\winpinator_frame.cpp:153
+#: .\gui\winpinator_frame.cpp:154
 msgid "&What's new?..."
 msgstr "&What's new?..."
 
-#: .\gui\winpinator_frame.cpp:154
+#: .\gui\winpinator_frame.cpp:155
 msgid "Show release notes"
 msgstr "Show release notes"
 
-#: .\gui\winpinator_frame.cpp:155
+#: .\gui\winpinator_frame.cpp:156
 msgid "&About Winpinator..."
 msgstr "&About Winpinator..."
 
-#: .\gui\winpinator_frame.cpp:156
+#: .\gui\winpinator_frame.cpp:157
 msgid "Show credits dialog"
 msgstr "Show credits dialog"
 
-#: .\gui\winpinator_frame.cpp:158
+#: .\gui\winpinator_frame.cpp:159
 msgid "&Help"
 msgstr "&Help"
 
+#: .\gui\winpinator_frame.cpp:262
+msgid "Sorry, but Winpinator help is not available yet."
+msgstr "Sorry, but Winpinator help is not available yet."
+
+#: .\gui\winpinator_frame.cpp:263
+#| msgid "Data unavailable"
+msgid "Help not available"
+msgstr "Help not available"
+
 #: .\service\notification_accept_files.cpp:91
 msgid "Incoming files"
 msgstr "Incoming files"
@@ -1126,7 +1135,7 @@ msgstr "Transfer success"
 msgid "Transfer between you and %s has finished successfully!"
 msgstr "Transfer between you and %s has finished successfully!"
 
-#: .\service\service_utils.cpp:97
+#: .\service\service_utils.cpp:98
 msgid "Unknown OS"
 msgstr "Unknown OS"
 

diff --git a/po/pl_PL.po b/po/pl_PL.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-27 23:10+0100\n"
-"PO-Revision-Date: 2021-12-27 23:23+0100\n"
+"POT-Creation-Date: 2022-02-18 19:12+0100\n"
+"PO-Revision-Date: 2022-02-18 19:13+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: pl_PL\n"
@@ -713,7 +713,7 @@ msgid "Send a folder..."
 msgstr "Wyślij folder..."
 
 #: .\gui\page_transferlist.cpp:65 .\gui\page_transferlist.cpp:261
-#: .\gui\settings_dialog.cpp:537
+#: .\gui\settings_dialog.cpp:538
 msgid "Clear history"
 msgstr "Wyczyść historię"
 
@@ -735,7 +735,7 @@ msgid "Are you sure you want to clear entire history for this device?"
 msgstr ""
 "Czy jesteś pewien, że chcesz wyczyścić całą historię dla tego urządzenia?"
 
-#: .\gui\page_transferlist.cpp:263 .\gui\settings_dialog.cpp:539
+#: .\gui\page_transferlist.cpp:263 .\gui\settings_dialog.cpp:540
 msgid "This operation cannot be undone!"
 msgstr "Tej operacji nie można cofnąć!"
 
@@ -911,7 +911,7 @@ msgstr "Port przychodzący dla rejestracji:"
 msgid "Automatic"
 msgstr "Automatycznie"
 
-#: .\gui\settings_dialog.cpp:536
+#: .\gui\settings_dialog.cpp:537
 msgid "Are you sure you want to clear all history?"
 msgstr "Czy jesteś pewien, że chcesz wyczyścić całą historię?"
 
@@ -1008,86 +1008,94 @@ msgstr[0] "Wyślij %d element..."
 msgstr[1] "Wyślij %d elementy..."
 msgstr[2] "Wyślij %d elementów..."
 
-#: .\gui\winpinator_frame.cpp:21
+#: .\gui\winpinator_frame.cpp:23
 msgid "Winpinator"
 msgstr "Winpinator"
 
 #. TRANSLATORS: format string
-#: .\gui\winpinator_frame.cpp:68 .\gui\winpinator_frame.cpp:321
+#: .\gui\winpinator_frame.cpp:71 .\gui\winpinator_frame.cpp:328
 #, c-format
 msgid "IP: %s"
 msgstr "Adres IP: %s"
 
-#: .\gui\winpinator_frame.cpp:72 .\gui\winpinator_frame.cpp:305
-#: .\gui\winpinator_frame.cpp:316
+#: .\gui\winpinator_frame.cpp:75 .\gui\winpinator_frame.cpp:312
+#: .\gui\winpinator_frame.cpp:323
 msgid "Offline!"
 msgstr "Offline!"
 
-#: .\gui\winpinator_frame.cpp:137
+#: .\gui\winpinator_frame.cpp:138
 msgid "&Open save folder...\tCtrl+O"
 msgstr "&Otwórz folder zapisywania...\tCtrl+O"
 
-#: .\gui\winpinator_frame.cpp:138 .\tray_icon.cpp:81
+#: .\gui\winpinator_frame.cpp:139 .\tray_icon.cpp:81
 msgid "Open the incoming files folder in Explorer"
 msgstr "Otwórz folder dla plików przychodzących w Eksploratorze Windows"
 
-#: .\gui\winpinator_frame.cpp:139
+#: .\gui\winpinator_frame.cpp:140
 msgid "&Preferences..."
 msgstr "&Preferencje..."
 
-#: .\gui\winpinator_frame.cpp:140
+#: .\gui\winpinator_frame.cpp:141
 msgid "Adjust app preferences"
 msgstr "Dostosuj ustawienia aplikacji"
 
-#: .\gui\winpinator_frame.cpp:142
+#: .\gui\winpinator_frame.cpp:143
 msgid "E&xit\tAlt+F4"
 msgstr "&Wyjdź\tAlt+F4"
 
-#: .\gui\winpinator_frame.cpp:143
+#: .\gui\winpinator_frame.cpp:144
 msgid "Close this window but let Winpinator run in background"
 msgstr "Zamknij to okno, ale pozostaw Winpinatora uruchomionego w tle"
 
-#: .\gui\winpinator_frame.cpp:145
+#: .\gui\winpinator_frame.cpp:146
 msgid "Exit and &stop the service\tCtrl+Alt+F4"
 msgstr "Wyjdź i zatrzymaj usługę\tCtrl+Alt+F4"
 
-#: .\gui\winpinator_frame.cpp:146
+#: .\gui\winpinator_frame.cpp:147
 msgid "Exit Winpinator and stop being visible to other computers"
 msgstr ""
 "Wyjdź z Winpinatora i przestań być dostępny dla innych komputerów w sieci"
 
-#: .\gui\winpinator_frame.cpp:148
+#: .\gui\winpinator_frame.cpp:149
 msgid "&File"
 msgstr "&Plik"
 
-#: .\gui\winpinator_frame.cpp:151
+#: .\gui\winpinator_frame.cpp:152
 msgid "&Help topics...\tF1"
 msgstr "&Tematy pomocy...\tF1"
 
-#: .\gui\winpinator_frame.cpp:152
+#: .\gui\winpinator_frame.cpp:153
 msgid "Show help and documentation of Winpinator"
 msgstr "Pokaż pomoc i dokumentację Winpinatora"
 
-#: .\gui\winpinator_frame.cpp:153
+#: .\gui\winpinator_frame.cpp:154
 msgid "&What's new?..."
 msgstr "&Co nowego?..."
 
-#: .\gui\winpinator_frame.cpp:154
+#: .\gui\winpinator_frame.cpp:155
 msgid "Show release notes"
 msgstr "Pokaż dzienniki zmian"
 
-#: .\gui\winpinator_frame.cpp:155
+#: .\gui\winpinator_frame.cpp:156
 msgid "&About Winpinator..."
 msgstr "&O programie Winpinator..."
 
-#: .\gui\winpinator_frame.cpp:156
+#: .\gui\winpinator_frame.cpp:157
 msgid "Show credits dialog"
 msgstr "Pokaż okno o autorach"
 
-#: .\gui\winpinator_frame.cpp:158
+#: .\gui\winpinator_frame.cpp:159
 msgid "&Help"
 msgstr "&Pomoc"
 
+#: .\gui\winpinator_frame.cpp:262
+msgid "Sorry, but Winpinator help is not available yet."
+msgstr "Przepraszamy, ale pomoc do Winpinatora nie jest jeszcze dostępna."
+
+#: .\gui\winpinator_frame.cpp:263
+msgid "Help not available"
+msgstr "Pomoc niedostępna"
+
 #: .\service\notification_accept_files.cpp:91
 msgid "Incoming files"
 msgstr "Pliki przychodzące"
@@ -1151,7 +1159,7 @@ msgstr "Transfer ukończony"
 msgid "Transfer between you and %s has finished successfully!"
 msgstr "Transfer między Tobą a użytkownikiem %s zakończył się pomyślnie!"
 
-#: .\service\service_utils.cpp:97
+#: .\service\service_utils.cpp:98
 msgid "Unknown OS"
 msgstr "Nieznany system"