Merge branch 'staged' into dev

xiaoyifang · Oct 8, 2023 · e7cbf9f · e7cbf9f
2 parents 6ae6ad8 + f84d756
commit e7cbf9f
Show file tree

Hide file tree

Showing 64 changed files with 1,543 additions and 1,198 deletions.
diff --git a/.github/workflows/AutoTag.yml b/.github/workflows/AutoTag.yml
@@ -21,7 +21,7 @@ jobs:
     runs-on: ubuntu-latest
 
     env:
-      version: 23.09.11
+      version: 23.10.01
       version-suffix: alpha
       prerelease: true
 
@@ -39,11 +39,3 @@ jobs:
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           custom_tag: ${{env.version}}-${{env.version-suffix}}.${{ steps.vars.outputs.sha_short }}
-
-
-      - name: Bump version and push tag
-        if: ${{env.prerelease != 'true'}}
-        uses: mathieudutour/[email protected]
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          custom_tag: ${{env.version}}
diff --git a/.github/workflows/macos-homebrew-breakpad.yml b/.github/workflows/macos-homebrew-breakpad.yml
@@ -26,7 +26,7 @@ jobs:
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
-      version: 23.09.11
+      version: 23.10.01
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/macos-homebrew.yml b/.github/workflows/macos-homebrew.yml
@@ -26,7 +26,7 @@ jobs:
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict
-      version: 23.09.11
+      version: 23.10.01
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/ubuntu-6.2.yml b/.github/workflows/ubuntu-6.2.yml
@@ -29,7 +29,7 @@ jobs:
         qt_ver: [ 6.5.2 ]
         qt_arch: [gcc_64]
     env:
-      version: 23.09.11
+      version: 23.10.01
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -30,7 +30,7 @@ jobs:
         qt_ver: [5.15.2]
         qt_arch: [gcc_64]
     env:
-      version: 23.09.11
+      version: 23.10.01
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/windows-6.x.yml b/.github/workflows/windows-6.x.yml
@@ -31,7 +31,7 @@ jobs:
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe
-      version: 23.09.11
+      version: 23.10.01
       version-suffix: alpha
       prerelease: true
     steps:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -32,7 +32,7 @@ jobs:
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe
-      version: 23.09.11
+      version: 23.10.01
       version-suffix: alpha
       prerelease: true
     # 步骤

diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 [![Crowdin](https://badges.crowdin.net/goldendict-ng/localized.svg)](https://crowdin.com/project/goldendict-ng)
 [![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=xiaoyifang_goldendict&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=xiaoyifang_goldendict)
 [![Windows-6.x](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/windows-6.x.yml/badge.svg)](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/windows-6.x.yml)
-[![Ubuntu-6.2](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/ubuntu-6.2.yml/badge.svg?branch=staged)](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/ubuntu-6.2.yml)
+[![Ubuntu-6.2](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/ubuntu-6.2.yml/badge.svg?event=push)](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/ubuntu-6.2.yml)
 [![macos-homebrew](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/macos-homebrew.yml/badge.svg)](https://github.com/xiaoyifang/goldendict-ng/actions/workflows/macos-homebrew.yml)
 
 The Next Generation GoldenDict. A feature-rich open-source dictionary lookup program,

diff --git a/goldendict.pro b/goldendict.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 TARGET = goldendict
-VERSION = 23.09.11
+VERSION = 23.10.01
 
 # Generate version file. We do this here and in a build rule described later.
 # The build rule is required since qmake isn't run each time the project is
@@ -133,7 +133,7 @@ win32 {
 
     win32-msvc* {
         # VS does not recognize 22.number.alpha,cause errors during compilation under MSVC++
-        VERSION = 23.09.11 
+        VERSION = 23.10.01 
         DEFINES += __WIN32 _CRT_SECURE_NO_WARNINGS
         contains(QMAKE_TARGET.arch, x86_64) {
             DEFINES += NOMINMAX __WIN64

diff --git a/locale/ar_SA.ts b/locale/ar_SA.ts
@@ -3777,6 +3777,14 @@ from Stardict, Babylon and GLS dictionaries</source>
       <source>Print version and diagnosis info.</source>
       <translation type="unfinished">Print version and diagnosis info.</translation>
     </message>
+    <message>
+      <source>Force the word to be translated in scanpopup</source>
+      <translation type="unfinished">Force the word to be translated in scanpopup</translation>
+    </message>
+    <message>
+      <source>Force the word to be translated in the mainwindow</source>
+      <translation type="unfinished">Force the word to be translated in the mainwindow</translation>
+    </message>
   </context>
   <context>
     <name>QuickFilterLine</name>
@@ -3997,10 +4005,6 @@ Not implemented yet in GoldenDict.</source>
       <source>Lingua Libre</source>
       <translation>Lingua Libre</translation>
     </message>
-    <message>
-      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Prouncations provied by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;التصريحات التي أدلى بها &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;، مكتبة وسائط لغوية تعاونية في ويكيميديا فرنسا. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
       <source>Enable Lingua Libre</source>
       <translation>قم بتمكين Lingua Libre</translation>
@@ -4218,6 +4222,10 @@ of the appropriate groups to use them.</source>
       <source>Text to Speech</source>
       <translation>قراءة النّصوص</translation>
     </message>
+    <message>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pronunciations provided by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation type="unfinished">&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pronunciations provided by &lt;a href=&quot;https://lingualibre.org&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Lingua Libre&lt;/span&gt;&lt;/a&gt;, a collaborative linguistic media library of Wikimedia France. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
   </context>
   <context>
     <name>StylesComboBox</name>