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@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0
+        uses: github/codeql-action/init@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
         with:
           languages: ${{ matrix.language }}
       - name: Set up JDK 17
@@ -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@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0
+        uses: github/codeql-action/analyze@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1

.github/workflows/scorecard.yml

@@ -29,7 +29,7 @@ jobs:
           persist-credentials: false
 
       - name: "Run analysis"
-        uses: ossf/scorecard-action@80e868c13c90f172d68d1f4501dee99e2479f7af # v2.1.3
+        uses: ossf/scorecard-action@08b4669551908b1024bb425080c797723083c031 # v2.2.0
         with:
           results_file: results.sarif
           results_format: sarif
@@ -37,6 +37,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@6c089f53dd51dc3fc7e599c3cb5356453a52ca9e # v2.20.0
+        uses: github/codeql-action/upload-sarif@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
         with:
           sarif_file: results.sarif

app/src/main/res/values-gl/strings.xml

@@ -47,7 +47,7 @@
     <string name="auth_connection_established">Estabeleceuse a conexión</string>
     <string name="auth_fail_get_user_name">O seu servidor non está devolvendo unha identificación de usuario correcta; contacte cun administrador.</string>
     <string name="auth_host_url">Enderezo do servidor https://…</string>
-    <string name="auth_incorrect_address_title">O formato do enderezo do servidor é incorrecto</string>
+    <string name="auth_incorrect_address_title">O formato do enderezo do servidor é erróneo</string>
     <string name="auth_incorrect_path_title">Non se atopou o servidor</string>
     <string name="auth_no_net_conn_title">Sen conexión de rede</string>
     <string name="auth_nossl_plain_ok_title">Non hai conexións seguras dispoñíbeis.</string>
@@ -61,7 +61,7 @@
     <string name="auth_testing_connection">Probando a conexión</string>
     <string name="auth_timeout_title">O servidor tardou de máis en responder</string>
     <string name="auth_trying_to_login">Tentando acceder a…</string>
-    <string name="auth_unauthorized">Nome de usuario ou contrasinal incorrecto</string>
+    <string name="auth_unauthorized">Nome de usuario ou contrasinal erróneo</string>
     <string name="auth_unknown_error_exception_title">Erro descoñecido: %1$s</string>
     <string name="auth_unknown_error_http_title">Produciuse un erro HTTP descoñecido!</string>
     <string name="auth_unknown_error_title">Produciuse un erro descoñecido!</string>
@@ -772,7 +772,7 @@
     <string name="sync_conflicts_in_favourites_ticker">Atopáronse conflitos</string>
     <string name="sync_current_folder_was_removed">O cartafol %1$s xa non existe</string>
     <string name="sync_fail_content">Non foi posíbel sincronizar %1$s</string>
-    <string name="sync_fail_content_unauthorized">Contrasinal incorrecto para %1$s</string>
+    <string name="sync_fail_content_unauthorized">Contrasinal erróneo para %1$s</string>
     <string name="sync_fail_in_favourites_ticker">Produciuse un fallo no mantemento sincronizado de ficheiros</string>
     <string name="sync_fail_ticker">Produciuse un fallo na sincronización</string>
     <string name="sync_fail_ticker_unauthorized">Produciuse un fallo na sincronización, acceda de novo.</string>

app/src/main/res/values-ko/strings.xml

@@ -158,6 +158,7 @@
     <string name="conflict_local_file">로컬 파일</string>
     <string name="conflict_message_description">두 버전을 모두 선택하면 기존 파일 이름에 번호가 추가됩니다.</string>
     <string name="conflict_server_file">서버 파일</string>
+    <string name="contact_backup_title">연락처 백업</string>
     <string name="contactlist_item_icon">연락처 목록 사용자 아이콘</string>
     <string name="contactlist_no_permission">권한이 없어서 가져올 수 없습니다.</string>
     <string name="contacts">연락처</string>
@@ -234,6 +235,7 @@
     <string name="drawer_item_all_files">모든 파일</string>
     <string name="drawer_item_favorites">즐겨찾기</string>
     <string name="drawer_item_gallery">미디어</string>
+    <string name="drawer_item_groupfolders">그룹 폴더</string>
     <string name="drawer_item_home">홈</string>
     <string name="drawer_item_notifications">알림</string>
     <string name="drawer_item_on_device">장치</string>
@@ -247,6 +249,7 @@
     <string name="drawer_quota_unlimited">%1$s 사용됨</string>
     <string name="drawer_synced_folders">자동 업로드</string>
     <string name="e2e_not_yet_setup">E2E가 아직 설정되지 않음</string>
+    <string name="e2e_offline">인터넷 연결 없이 불가능</string>
     <string name="encrypted">암호화하도록 설정</string>
     <string name="end_to_end_encryption_confirm_button">암호화 설정</string>
     <string name="end_to_end_encryption_decrypting">복호화중…</string>
@@ -648,7 +651,7 @@
     <string name="select_one_template">하나의 템플릿을 선택하십시오</string>
     <string name="select_template">템플릿 선택</string>
     <string name="send">보내기</string>
-    <string name="send_note">메모 전달</string>
+    <string name="send_note">받는이에게 메모 보내기</string>
     <string name="send_share">공유 전달 </string>
     <string name="sendbutton_description">보내기 버튼 아이콘</string>
     <string name="set_as">다음으로 설정</string>

app/src/main/res/values-uk/strings.xml

@@ -62,7 +62,7 @@
     <string name="auth_testing_connection">Перевірка з\'єднання</string>
     <string name="auth_timeout_title">Сервер занадто довго не відповідає</string>
     <string name="auth_trying_to_login">Триває авторизація…</string>
-    <string name="auth_unauthorized">Невірне ім\'я користувача або пароль</string>
+    <string name="auth_unauthorized">Недійсне ім\'я користувача або пароль</string>
     <string name="auth_unknown_error_exception_title">Невідома помилка: %1$s</string>
     <string name="auth_unknown_error_http_title">Сталася невідома помилка HTTP!</string>
     <string name="auth_unknown_error_title">Виникла невідома помилка!</string>