nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Benjamin Neff 2022-03-05 16:31:34 +01:00
commit 5d81555ae1
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -42,6 +42,7 @@ Although the chat was never enabled per default and was marked as experimental,
## Refactor ## Refactor
## Bug fixes ## Bug fixes
* Don't suggest to retry exports on failure [#8343](https://github.com/diaspora/diaspora/pull/8343)
## Features ## Features

4
config/locales/diaspora/en.yml
View file

@ -831,7 +831,7 @@ en:
Hello %{name} Hello %{name}
We’ve encountered an issue while processing your personal data for download. We’ve encountered an issue while processing your personal data for download.
Please try again! If this issue persists, please contact your podmin for help.
Sorry, Sorry,
@ -852,7 +852,7 @@ en:
Hello %{name} Hello %{name}
We’ve encountered an issue while processing your photos for download. We’ve encountered an issue while processing your photos for download.
Please try again! If this issue persists, please contact your podmin for help.
Sorry, Sorry,