diff --git a/.github/workflows/end-to-end-tests.yaml b/.github/workflows/end-to-end-tests.yaml index a8d1e2e431..85fbca670f 100644 --- a/.github/workflows/end-to-end-tests.yaml +++ b/.github/workflows/end-to-end-tests.yaml @@ -9,7 +9,7 @@ on: push: branches: [develop, master] repository_dispatch: - types: [upstream-sdk-notify] + types: [element-web-notify] # support triggering from other workflows workflow_call: diff --git a/.github/workflows/static_analysis.yaml b/.github/workflows/static_analysis.yaml index 81621efcc2..470e072892 100644 --- a/.github/workflows/static_analysis.yaml +++ b/.github/workflows/static_analysis.yaml @@ -6,7 +6,7 @@ on: merge_group: types: [checks_requested] repository_dispatch: - types: [upstream-sdk-notify] + types: [element-web-notify] concurrency: group: ${{ github.workflow }}-${{ github.ref }}-${{ github.event_name }} cancel-in-progress: true diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 67f9bc36cc..584acd225c 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -6,7 +6,7 @@ on: push: branches: [develop, master] repository_dispatch: - types: [upstream-sdk-notify] + types: [element-web-notify] workflow_call: inputs: disable_coverage: diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 093fb155c4..35dfab239d 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -907,10 +907,6 @@ "export_unsupported": "Your browser does not support the required cryptography extensions", "import_invalid_keyfile": "Not a valid %(brand)s keyfile", "import_invalid_passphrase": "Authentication check failed: incorrect password?", - "incompatible_database_description": "You've previously used a newer version of %(brand)s with this session. To use this version again with end to end encryption, you will need to sign out and back in again.", - "incompatible_database_disable": "Continue With Encryption Disabled", - "incompatible_database_sign_out_description": "To avoid losing your chat history, you must export your room keys before logging out. You will need to go back to the newer version of %(brand)s to do this", - "incompatible_database_title": "Incompatible Database", "messages_not_secure": { "cause_1": "Your homeserver", "cause_2": "The homeserver the user you're verifying is connected to", @@ -2568,7 +2564,6 @@ "msisdn_verification_field_label": "Verification code", "msisdn_verification_instructions": "Please enter verification code sent via text.", "msisdns_heading": "Phone numbers", - "name_placeholder": "No display name", "oidc_manage_button": "Manage account", "password_change_section": "Set a new account password…", "password_change_success": "Your password was successfully changed.",