Merge branch 'staged' into dev

xiaoyifang · Jan 24, 2025 · be14086 · be14086
2 parents c2f5c59 + 14df041
commit be14086
Show file tree

Hide file tree

Showing 57 changed files with 3,559 additions and 5,982 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,8 +22,8 @@ if (WIN32)
         include(FetchContent)
         FetchContent_Declare(
                 vcpkg-export
-                URL https://github.com/xiaoyifang/goldendict-ng/releases/download/vcpkg_240711_3d72d8c930e1b6a1b2432b262c61af7d3287dcd0/goldendict-ng-vcpkg-export.tar.zst
-                URL_HASH SHA512=CB7AB20F03CE1BB1D46FE5DF25C9B9F4E365B72CE0A817B3C9E39BD0C85DC571F992363A1A5E8DD1E31C44FF88C51E9A88A537688C6070B4E58FF8FA2585EAB7
+                URL https://github.com/xiaoyifang/goldendict-ng/releases/download/vcpkg_250123_b588ddc8230705392c53448597f5892966a8db15/goldendict-ng-vcpkg-export.tar.zst
+                URL_HASH SHA512=E8286C6C08BEE93F01E63A1BEAAC0FD88157B9F3AD7C2AABC172BD2F33834AF08A07321AB1823AD167DA4F82320DCE0EC56C75BB19A38402831D126068F8888E
         )
         FetchContent_MakeAvailable(vcpkg-export)
         set(VCPKG_MANIFEST_MODE OFF CACHE BOOL "disable existing manifest mode caused by the existrance of vcpkg.json" FORCE)

diff --git a/locale/ar_SA.ts b/locale/ar_SA.ts
diff --git a/locale/ay_BO.ts b/locale/ay_BO.ts
diff --git a/locale/be_BY.ts b/locale/be_BY.ts
diff --git a/locale/bg_BG.ts b/locale/bg_BG.ts
diff --git a/locale/crowdin.ts b/locale/crowdin.ts
@@ -345,25 +345,6 @@ between classic and school orthography in cyrillic)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Dialog</name>
-    <message>
-        <source>Proxy authentication required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You need to supply a Username and a Password to access via proxy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DictGroupWidget</name>
     <message>
@@ -3494,35 +3475,39 @@ from Stardict, Babylon and GLS dictionaries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On</source>
+        <source>Auto does nothing on some systems.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Off</source>
+        <source>Restart the program to apply the language change.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto</source>
+        <source>Restart to apply the interface style change.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto does nothing on some systems.</source>
+        <source>Restart to apply the interface font change.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart the program to apply the language change.</source>
+        <source>Restart needed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart to apply the interface style change.</source>
+        <source>Enable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart to apply the interface font change.</source>
+        <source>Disable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restart needed</source>
+        <source>Automatic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable application log</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3998,28 +3983,6 @@ based on English phonology</source>
         <source>Hepburn</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The most regular system, having a one-to-one relation to the
-kana writing systems. Standardized as ISO 3602
-
-Not implemented yet in GoldenDict.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Nihon-shiki</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Based on Nihon-shiki system, but modified for modern standard Japanese.
-Standardized as ISO 3602
-
-Not implemented yet in GoldenDict.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kunrei-shiki</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Syllabaries:</source>
         <translation type="unfinished"></translation>