Merge branch 'develop' into feat-boost-log

2020-09-15 16:50:55 +01:00 · 2020-09-15 16:50:55 +01:00 · d544f5ed38
parent e65caabdea 10fbcfc7d0
commit d544f5ed38
10 changed files with 2869 additions and 2167 deletions
--- a/translations/wsjtx_ca.ts
+++ b/translations/wsjtx_ca.ts
--- a/translations/wsjtx_da.ts
+++ b/translations/wsjtx_da.ts
--- a/translations/wsjtx_en.ts
+++ b/translations/wsjtx_en.ts
--- a/translations/wsjtx_en_GB.ts
+++ b/translations/wsjtx_en_GB.ts
--- a/translations/wsjtx_es.ts
+++ b/translations/wsjtx_es.ts
--- a/translations/wsjtx_it.ts
+++ b/translations/wsjtx_it.ts
--- a/translations/wsjtx_ja.ts
+++ b/translations/wsjtx_ja.ts
--- a/translations/wsjtx_zh.ts
+++ b/translations/wsjtx_zh.ts
--- a/translations/wsjtx_zh_HK.ts
+++ b/translations/wsjtx_zh_HK.ts
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@ -2874,7 +2874,7 @@ void MainWindow::on_actionKeyboard_shortcuts_triggered()
  <tr><td><b>Alt+F4   </b></td><td>Exit program</td></tr>
  <tr><td><b>F5       </b></td><td>Display special mouse commands (Alt: transmit Tx5)</td></tr>
  <tr><td><b>F6       </b></td><td>Open next file in directory (Alt: toggle "Call 1st")</td></tr>
-  <tr><td><b>Shift+F6 </b></td><td>Decode all remaining files in directrory</td></tr>
+  <tr><td><b>Shift+F6 </b></td><td>Decode all remaining files in directory</td></tr>
  <tr><td><b>F7       </b></td><td>Display Message Averaging window</td></tr>
  <tr><td><b>F11      </b></td><td>Move Rx frequency down 1 Hz</td></tr>
  <tr><td><b>Ctrl+F11 </b></td><td>Move identical Rx and Tx frequencies down 1 Hz</td></tr>