Merge remote-tracking branch 'origin/master' into dev

.github/workflows/codeql.yml

@@ -32,7 +32,7 @@ jobs:
         with:
           swap-size-gb: 10
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0225834cc549ee0ca93cb085b92954821a145866 # v2.3.5
+        uses: github/codeql-action/init@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK
@@ -46,4 +46,4 @@ jobs:
           echo "org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError" > "$HOME/.gradle/gradle.properties"
           ./gradlew assembleDebug
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0225834cc549ee0ca93cb085b92954821a145866 # v2.3.5
+        uses: github/codeql-action/analyze@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6

.github/workflows/scorecard.yml

@@ -33,6 +33,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@0225834cc549ee0ca93cb085b92954821a145866 # v2.3.5
+        uses: github/codeql-action/upload-sarif@83f0fe6c4988d98a455712a27f0255212bba9bd4 # v2.3.6
         with:
           sarif_file: results.sarif

app/src/main/res/values-b+en+001/strings.xml

@@ -524,6 +524,7 @@
     <string name="pass_code_removed">Passcode deleted</string>
     <string name="pass_code_stored">Passcode stored</string>
     <string name="pass_code_wrong">Incorrect passcode</string>
+    <string name="pdf_password_protected">Unable to open password-protected PDF. Please use an external PDF viewer.</string>
     <string name="pdf_zoom_tip">Tap on a page to zoom in</string>
     <string name="permission_allow">Allow</string>
     <string name="permission_deny">Deny</string>

app/src/main/res/values-zh-rHK/strings.xml

@@ -524,6 +524,7 @@
     <string name="pass_code_removed">通行碼已刪除</string>
     <string name="pass_code_stored">通行碼已儲存</string>
     <string name="pass_code_wrong">通行碼錯誤</string>
+    <string name="pdf_password_protected">無法開啟密碼保護的 PDF。請使用外部 PDF 檢視程式。</string>
     <string name="pdf_zoom_tip">點擊頁面放大</string>
     <string name="permission_allow">允許</string>
     <string name="permission_deny">拒絕</string>