diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 30f2a1c525..d7c3506fa0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,38 +1,34 @@
---
name: Bug report
-about: Create a report to help us improve SchildiChat
+about: Create a report to help us improve Element
title: ''
labels: ''
assignees: ''
---
-**Describe the bug**
+#### Describe the bug
A clear and concise description of what the bug is.
-**To Reproduce**
+#### To Reproduce
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
-**Expected behavior**
+#### Expected behavior
A clear and concise description of what you expected to happen.
-**Screenshots**
+#### Screenshots
If applicable, add screenshots to help explain your problem.
-**Smartphone (please complete the following information):**
+#### Smartphone (please complete the following information):
- Device: [e.g. Samsung S6]
- OS: [e.g. Android 6.0]
-**Additional context**
+#### Additional context
- App version and store [e.g. 1.0.0 - F-Droid]
- Homeserver: [e.g. matrix.org]
-**Upstream relevance**
- - Does this issue exist in Element Android?
- - If this issue exists in Element Android, please also link the corresponding bug report (create a new one if it doesn't exist yet)
-
Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 73c93186d7..da96d461c5 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,14 @@ assignees: ''
---
-**Is your feature request related to a problem? Please describe.**
+#### Is your feature request related to a problem? Please describe.
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-**Describe the solution you'd like**
+#### Describe the solution you'd like.
A clear and concise description of what you want to happen.
-**Describe alternatives you've considered**
+#### Describe alternatives you've considered.
A clear and concise description of any alternative solutions or features you've considered.
-**Additional context**
+#### Additional context
Add any other context or screenshots about the feature request here.
diff --git a/upstream_.github/ISSUE_TEMPLATE/matrix-sdk.md b/.github/ISSUE_TEMPLATE/matrix-sdk.md
similarity index 100%
rename from upstream_.github/ISSUE_TEMPLATE/matrix-sdk.md
rename to .github/ISSUE_TEMPLATE/matrix-sdk.md
diff --git a/upstream_.github/ISSUE_TEMPLATE/release.md b/.github/ISSUE_TEMPLATE/release.md
similarity index 100%
rename from upstream_.github/ISSUE_TEMPLATE/release.md
rename to .github/ISSUE_TEMPLATE/release.md
diff --git a/upstream_.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from upstream_.github/PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md
diff --git a/upstream_.github/dependabot.yml b/.github/dependabot.yml
similarity index 100%
rename from upstream_.github/dependabot.yml
rename to .github/dependabot.yml
diff --git a/upstream_.github/workflows/build.yml b/.github/workflows/build.yml
similarity index 100%
rename from upstream_.github/workflows/build.yml
rename to .github/workflows/build.yml
diff --git a/upstream_.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
similarity index 100%
rename from upstream_.github/workflows/gradle-wrapper-validation.yml
rename to .github/workflows/gradle-wrapper-validation.yml
diff --git a/upstream_.github/workflows/integration.yml b/.github/workflows/integration.yml
similarity index 100%
rename from upstream_.github/workflows/integration.yml
rename to .github/workflows/integration.yml
diff --git a/upstream_.github/workflows/quality.yml b/.github/workflows/quality.yml
similarity index 100%
rename from upstream_.github/workflows/quality.yml
rename to .github/workflows/quality.yml
diff --git a/upstream_.github/workflows/tests.yml b/.github/workflows/tests.yml
similarity index 100%
rename from upstream_.github/workflows/tests.yml
rename to .github/workflows/tests.yml
diff --git a/upstream_.github/workflows/update-gradle-wrapper.yml b/.github/workflows/update-gradle-wrapper.yml
similarity index 100%
rename from upstream_.github/workflows/update-gradle-wrapper.yml
rename to .github/workflows/update-gradle-wrapper.yml
diff --git a/README.md b/README.md
index 62bec0cec1..e89fb15010 100644
--- a/README.md
+++ b/README.md
@@ -1,30 +1,34 @@
-[![Translation status](https://weblate.bubu1.eu/widgets/schildichat/-/schildichat-android/svg-badge.svg)](https://weblate.bubu1.eu/projects/schildichat/schildichat-android/)
-[![SchildiChat-Android Matrix room #schildichat-android:matrix.org](https://img.shields.io/matrix/schildichat-android:matrix.org.svg?label=%23schildichat-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#schildichat-android:matrix.org)
+[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
+[![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
+[![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
+[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=bugs)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
-# SchildiChat for Android
+# Element Android
-SchildiChat for Android is a Matrix Client based on [Element Android](https://github.com/vector-im/element-android).
+Element Android is an Android Matrix Client provided by [Element](https://element.io/).
-Compared to Element, SchildiChat features following most important changes:
+It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-android) with a new user experience.
-- A unified chat list for both direct and group chats
-- Optional message bubbles
-- Further usability improvements and additional settings to configure the app
+[](https://play.google.com/store/apps/details?id=im.vector.app)
+[](https://f-droid.org/app/im.vector.app)
-A more thorough list of changes compared to Element can be found [here](FEATURES.md) - but keep in mind this list might not be up-to-date at all times.
+Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
-
-
+# New Android SDK
-Information about available app variants can be found [on our website](https://schildi.chat/android/).
+Element is based on a new Android SDK fully written in Kotlin (like Element). In order to make the early development as fast as possible, Element and the new SDK currently share the same git repository.
-Join the discussion on matrix
+At each Element release, the SDK module is copied to a dedicated repository: https://github.com/matrix-org/matrix-android-sdk2. That way, third party apps can add a regular gradle dependency to use it. So more details on how to do that here: https://github.com/matrix-org/matrix-android-sdk2.
-## Translations
+# Roadmap
-If you want to translate SchildiChat, visit its weblate [here](https://weblate.bubu1.eu/projects/schildichat/schildichat-android/).
-For translations that concern upstream Element code, visit their weblate [here](https://translate.element.io/engage/element-android/).
+The version 1.0.0 of Element still misses some features which was previously included in Riot-Android.
+The team will work to add them on a regular basis.
-## Screenshots
+## Contributing
-
+Please refer to [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
+
+Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/#element-android:matrix.org).
diff --git a/fastlane/Appfile b/fastlane/Appfile
index 811e38d972..25273b0b09 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -1,2 +1,2 @@
-json_key_file("../google-api-fastlane-release.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
-package_name("de.spiritcroc.riotx") # e.g. com.krausefx.app
+json_key_file("./fastlane/private/api-8525453667099313774-565354-aca0e6153603.json")
+package_name("im.vector.app")
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index f655abd1e3..85e3d777ac 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -16,29 +16,45 @@
default_platform(:android)
platform :android do
- keystore = ENV["keystore"]
- keystore_pass = ENV["keystorepass"]
- key_alias = ENV["keyalias"]
- key_pass = ENV["keypass"]
-
desc "Runs all the tests"
lane :test do
gradle(task: "test")
end
+ desc "Submit a new Beta Build to Crashlytics Beta"
+ lane :beta do
+ gradle(task: "clean assembleRelease")
+ crashlytics
+
+ # sh "your_script.sh"
+ # You can also use other beta testing services here
+ end
+
desc "Deploy a new version to the Google Play"
lane :deploy do
- gradle(
- task: "clean assembleGplayRelease",
- properties: {
- "android.injected.signing.store.file": keystore,
- "android.injected.signing.store.password": keystore_pass,
- "android.injected.signing.key.alias": key_alias,
- "android.injected.signing.key.password": key_pass
- }
- )
+ gradle(task: "clean assembleRelease")
+ upload_to_play_store
+ end
+
+ desc "Deploy Google Play metadata"
+ lane :deployMeta do
+ # Doc: https://docs.fastlane.tools/actions/upload_to_play_store/
upload_to_play_store(
- apk: lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]
+ skip_upload_apk: true,
+ skip_upload_aab: true,
+ skip_upload_images: true,
+ skip_upload_screenshots: true,
+ skip_upload_changelogs: true,
+ # Set to true to not update the PlayStore
+ validate_only: false
)
end
+
+ desc "Get version code"
+ lane :getVersionCode do
+ versions = google_play_track_version_codes(track: "production")
+ puts(versions)
+ version_code = versions[0]
+ puts(version_code)
+ end
end
diff --git a/fastlane/README.md b/fastlane/README.md
index 8f1119a8b0..54d3a005a6 100644
--- a/fastlane/README.md
+++ b/fastlane/README.md
@@ -21,14 +21,29 @@ or alternatively using `brew install fastlane`
fastlane android test
```
Runs all the tests
+### android beta
+```
+fastlane android beta
+```
+Submit a new Beta Build to Crashlytics Beta
### android deploy
```
fastlane android deploy
```
Deploy a new version to the Google Play
+### android deployMeta
+```
+fastlane android deployMeta
+```
+Deploy Google Play metadata
+### android getVersionCode
+```
+fastlane android getVersionCode
+```
+Get version code
----
-This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
+This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
diff --git a/upstream_fastlane/fastlane/metadata/android/de/full_description.txt b/fastlane/fastlane/metadata/android/de/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/de/full_description.txt
rename to fastlane/fastlane/metadata/android/de/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/de/short_description.txt b/fastlane/fastlane/metadata/android/de/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/de/short_description.txt
rename to fastlane/fastlane/metadata/android/de/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/de/title.txt b/fastlane/fastlane/metadata/android/de/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/de/title.txt
rename to fastlane/fastlane/metadata/android/de/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/en-US/full_description.txt b/fastlane/fastlane/metadata/android/en-US/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/en-US/full_description.txt
rename to fastlane/fastlane/metadata/android/en-US/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/en-US/short_description.txt b/fastlane/fastlane/metadata/android/en-US/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/en-US/short_description.txt
rename to fastlane/fastlane/metadata/android/en-US/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/en-US/title.txt b/fastlane/fastlane/metadata/android/en-US/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/en-US/title.txt
rename to fastlane/fastlane/metadata/android/en-US/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/es/full_description.txt b/fastlane/fastlane/metadata/android/es/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/es/full_description.txt
rename to fastlane/fastlane/metadata/android/es/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/es/short_description.txt b/fastlane/fastlane/metadata/android/es/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/es/short_description.txt
rename to fastlane/fastlane/metadata/android/es/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/es/title.txt b/fastlane/fastlane/metadata/android/es/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/es/title.txt
rename to fastlane/fastlane/metadata/android/es/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/et/short_description.txt b/fastlane/fastlane/metadata/android/et/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/et/short_description.txt
rename to fastlane/fastlane/metadata/android/et/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/et/title.txt b/fastlane/fastlane/metadata/android/et/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/et/title.txt
rename to fastlane/fastlane/metadata/android/et/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/fi/short_description.txt b/fastlane/fastlane/metadata/android/fi/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/fi/short_description.txt
rename to fastlane/fastlane/metadata/android/fi/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/fi/title.txt b/fastlane/fastlane/metadata/android/fi/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/fi/title.txt
rename to fastlane/fastlane/metadata/android/fi/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/fr/title.txt b/fastlane/fastlane/metadata/android/fr/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/fr/title.txt
rename to fastlane/fastlane/metadata/android/fr/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/hu/full_description.txt b/fastlane/fastlane/metadata/android/hu/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/hu/full_description.txt
rename to fastlane/fastlane/metadata/android/hu/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/hu/short_description.txt b/fastlane/fastlane/metadata/android/hu/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/hu/short_description.txt
rename to fastlane/fastlane/metadata/android/hu/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/hu/title.txt b/fastlane/fastlane/metadata/android/hu/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/hu/title.txt
rename to fastlane/fastlane/metadata/android/hu/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/it/full_description.txt b/fastlane/fastlane/metadata/android/it/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/it/full_description.txt
rename to fastlane/fastlane/metadata/android/it/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/it/short_description.txt b/fastlane/fastlane/metadata/android/it/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/it/short_description.txt
rename to fastlane/fastlane/metadata/android/it/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/it/title.txt b/fastlane/fastlane/metadata/android/it/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/it/title.txt
rename to fastlane/fastlane/metadata/android/it/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/kab/full_description.txt b/fastlane/fastlane/metadata/android/kab/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/kab/full_description.txt
rename to fastlane/fastlane/metadata/android/kab/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/kab/short_description.txt b/fastlane/fastlane/metadata/android/kab/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/kab/short_description.txt
rename to fastlane/fastlane/metadata/android/kab/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/kab/title.txt b/fastlane/fastlane/metadata/android/kab/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/kab/title.txt
rename to fastlane/fastlane/metadata/android/kab/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/pt_BR/full_description.txt b/fastlane/fastlane/metadata/android/pt_BR/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/pt_BR/full_description.txt
rename to fastlane/fastlane/metadata/android/pt_BR/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/pt_BR/short_description.txt b/fastlane/fastlane/metadata/android/pt_BR/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/pt_BR/short_description.txt
rename to fastlane/fastlane/metadata/android/pt_BR/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/pt_BR/title.txt b/fastlane/fastlane/metadata/android/pt_BR/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/pt_BR/title.txt
rename to fastlane/fastlane/metadata/android/pt_BR/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/ru/full_description.txt b/fastlane/fastlane/metadata/android/ru/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/ru/full_description.txt
rename to fastlane/fastlane/metadata/android/ru/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/ru/short_description.txt b/fastlane/fastlane/metadata/android/ru/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/ru/short_description.txt
rename to fastlane/fastlane/metadata/android/ru/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/ru/title.txt b/fastlane/fastlane/metadata/android/ru/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/ru/title.txt
rename to fastlane/fastlane/metadata/android/ru/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/sk/full_description.txt b/fastlane/fastlane/metadata/android/sk/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/sk/full_description.txt
rename to fastlane/fastlane/metadata/android/sk/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/sk/short_description.txt b/fastlane/fastlane/metadata/android/sk/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/sk/short_description.txt
rename to fastlane/fastlane/metadata/android/sk/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/sk/title.txt b/fastlane/fastlane/metadata/android/sk/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/sk/title.txt
rename to fastlane/fastlane/metadata/android/sk/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/sv/full_description.txt b/fastlane/fastlane/metadata/android/sv/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/sv/full_description.txt
rename to fastlane/fastlane/metadata/android/sv/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/sv/short_description.txt b/fastlane/fastlane/metadata/android/sv/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/sv/short_description.txt
rename to fastlane/fastlane/metadata/android/sv/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/sv/title.txt b/fastlane/fastlane/metadata/android/sv/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/sv/title.txt
rename to fastlane/fastlane/metadata/android/sv/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/th/short_description.txt b/fastlane/fastlane/metadata/android/th/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/th/short_description.txt
rename to fastlane/fastlane/metadata/android/th/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/th/title.txt b/fastlane/fastlane/metadata/android/th/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/th/title.txt
rename to fastlane/fastlane/metadata/android/th/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/tr/short_description.txt b/fastlane/fastlane/metadata/android/tr/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/tr/short_description.txt
rename to fastlane/fastlane/metadata/android/tr/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/tr/title.txt b/fastlane/fastlane/metadata/android/tr/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/tr/title.txt
rename to fastlane/fastlane/metadata/android/tr/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/uk/full_description.txt b/fastlane/fastlane/metadata/android/uk/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/uk/full_description.txt
rename to fastlane/fastlane/metadata/android/uk/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/uk/short_description.txt b/fastlane/fastlane/metadata/android/uk/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/uk/short_description.txt
rename to fastlane/fastlane/metadata/android/uk/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/uk/title.txt b/fastlane/fastlane/metadata/android/uk/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/uk/title.txt
rename to fastlane/fastlane/metadata/android/uk/title.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/zh_Hans/full_description.txt b/fastlane/fastlane/metadata/android/zh_Hans/full_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/zh_Hans/full_description.txt
rename to fastlane/fastlane/metadata/android/zh_Hans/full_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/zh_Hans/short_description.txt b/fastlane/fastlane/metadata/android/zh_Hans/short_description.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/zh_Hans/short_description.txt
rename to fastlane/fastlane/metadata/android/zh_Hans/short_description.txt
diff --git a/upstream_fastlane/fastlane/metadata/android/zh_Hans/title.txt b/fastlane/fastlane/metadata/android/zh_Hans/title.txt
similarity index 100%
rename from upstream_fastlane/fastlane/metadata/android/zh_Hans/title.txt
rename to fastlane/fastlane/metadata/android/zh_Hans/title.txt
diff --git a/upstream_fastlane/metadata/android/ar/changelogs/40100100.txt b/fastlane/metadata/android/ar/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/changelogs/40100100.txt
rename to fastlane/metadata/android/ar/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/ar/changelogs/40100110.txt b/fastlane/metadata/android/ar/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/changelogs/40100110.txt
rename to fastlane/metadata/android/ar/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/ar/changelogs/40100120.txt b/fastlane/metadata/android/ar/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/changelogs/40100120.txt
rename to fastlane/metadata/android/ar/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/ar/changelogs/40100130.txt b/fastlane/metadata/android/ar/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/changelogs/40100130.txt
rename to fastlane/metadata/android/ar/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/ar/changelogs/40100140.txt b/fastlane/metadata/android/ar/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/changelogs/40100140.txt
rename to fastlane/metadata/android/ar/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/ar/changelogs/40100150.txt b/fastlane/metadata/android/ar/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/changelogs/40100150.txt
rename to fastlane/metadata/android/ar/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/ar/changelogs/40100160.txt b/fastlane/metadata/android/ar/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/changelogs/40100160.txt
rename to fastlane/metadata/android/ar/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/ar/changelogs/40100170.txt b/fastlane/metadata/android/ar/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/changelogs/40100170.txt
rename to fastlane/metadata/android/ar/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/ar/changelogs/40101010.txt b/fastlane/metadata/android/ar/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/changelogs/40101010.txt
rename to fastlane/metadata/android/ar/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/ar/full_description.txt b/fastlane/metadata/android/ar/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/full_description.txt
rename to fastlane/metadata/android/ar/full_description.txt
diff --git a/upstream_fastlane/metadata/android/ar/short_description.txt b/fastlane/metadata/android/ar/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/short_description.txt
rename to fastlane/metadata/android/ar/short_description.txt
diff --git a/upstream_fastlane/metadata/android/ar/title.txt b/fastlane/metadata/android/ar/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ar/title.txt
rename to fastlane/metadata/android/ar/title.txt
diff --git a/upstream_fastlane/metadata/android/bg/full_description.txt b/fastlane/metadata/android/bg/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/bg/full_description.txt
rename to fastlane/metadata/android/bg/full_description.txt
diff --git a/upstream_fastlane/metadata/android/bg/short_description.txt b/fastlane/metadata/android/bg/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/bg/short_description.txt
rename to fastlane/metadata/android/bg/short_description.txt
diff --git a/upstream_fastlane/metadata/android/bg/title.txt b/fastlane/metadata/android/bg/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/bg/title.txt
rename to fastlane/metadata/android/bg/title.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40100100.txt b/fastlane/metadata/android/ca/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40100100.txt
rename to fastlane/metadata/android/ca/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40100110.txt b/fastlane/metadata/android/ca/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40100110.txt
rename to fastlane/metadata/android/ca/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40100120.txt b/fastlane/metadata/android/ca/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40100120.txt
rename to fastlane/metadata/android/ca/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40100130.txt b/fastlane/metadata/android/ca/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40100130.txt
rename to fastlane/metadata/android/ca/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40100140.txt b/fastlane/metadata/android/ca/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40100140.txt
rename to fastlane/metadata/android/ca/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40100150.txt b/fastlane/metadata/android/ca/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40100150.txt
rename to fastlane/metadata/android/ca/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40100160.txt b/fastlane/metadata/android/ca/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40100160.txt
rename to fastlane/metadata/android/ca/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40100170.txt b/fastlane/metadata/android/ca/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40100170.txt
rename to fastlane/metadata/android/ca/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40101000.txt b/fastlane/metadata/android/ca/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40101000.txt
rename to fastlane/metadata/android/ca/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40101010.txt b/fastlane/metadata/android/ca/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40101010.txt
rename to fastlane/metadata/android/ca/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40101020.txt b/fastlane/metadata/android/ca/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40101020.txt
rename to fastlane/metadata/android/ca/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/ca/changelogs/40101030.txt b/fastlane/metadata/android/ca/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/changelogs/40101030.txt
rename to fastlane/metadata/android/ca/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/ca/full_description.txt b/fastlane/metadata/android/ca/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/full_description.txt
rename to fastlane/metadata/android/ca/full_description.txt
diff --git a/upstream_fastlane/metadata/android/ca/short_description.txt b/fastlane/metadata/android/ca/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/short_description.txt
rename to fastlane/metadata/android/ca/short_description.txt
diff --git a/upstream_fastlane/metadata/android/ca/title.txt b/fastlane/metadata/android/ca/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ca/title.txt
rename to fastlane/metadata/android/ca/title.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40100100.txt b/fastlane/metadata/android/cs-CZ/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40100100.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40100110.txt b/fastlane/metadata/android/cs-CZ/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40100110.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40100120.txt b/fastlane/metadata/android/cs-CZ/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40100120.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40100130.txt b/fastlane/metadata/android/cs-CZ/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40100130.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40100140.txt b/fastlane/metadata/android/cs-CZ/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40100140.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40100150.txt b/fastlane/metadata/android/cs-CZ/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40100150.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40100160.txt b/fastlane/metadata/android/cs-CZ/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40100160.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40100170.txt b/fastlane/metadata/android/cs-CZ/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40100170.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101000.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101000.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101010.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101010.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101020.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101020.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101030.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101030.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101040.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101040.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101050.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101050.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101060.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101060.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101070.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101070.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101080.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101080.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101090.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101090.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101100.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101100.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101100.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/changelogs/40101110.txt b/fastlane/metadata/android/cs-CZ/changelogs/40101110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/changelogs/40101110.txt
rename to fastlane/metadata/android/cs-CZ/changelogs/40101110.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/full_description.txt b/fastlane/metadata/android/cs-CZ/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/full_description.txt
rename to fastlane/metadata/android/cs-CZ/full_description.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/short_description.txt b/fastlane/metadata/android/cs-CZ/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/short_description.txt
rename to fastlane/metadata/android/cs-CZ/short_description.txt
diff --git a/upstream_fastlane/metadata/android/cs-CZ/title.txt b/fastlane/metadata/android/cs-CZ/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/cs-CZ/title.txt
rename to fastlane/metadata/android/cs-CZ/title.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40100100.txt b/fastlane/metadata/android/de-DE/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40100100.txt
rename to fastlane/metadata/android/de-DE/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40100110.txt b/fastlane/metadata/android/de-DE/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40100110.txt
rename to fastlane/metadata/android/de-DE/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40100120.txt b/fastlane/metadata/android/de-DE/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40100120.txt
rename to fastlane/metadata/android/de-DE/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40100130.txt b/fastlane/metadata/android/de-DE/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40100130.txt
rename to fastlane/metadata/android/de-DE/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40100140.txt b/fastlane/metadata/android/de-DE/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40100140.txt
rename to fastlane/metadata/android/de-DE/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40100150.txt b/fastlane/metadata/android/de-DE/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40100150.txt
rename to fastlane/metadata/android/de-DE/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40100160.txt b/fastlane/metadata/android/de-DE/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40100160.txt
rename to fastlane/metadata/android/de-DE/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40100170.txt b/fastlane/metadata/android/de-DE/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40100170.txt
rename to fastlane/metadata/android/de-DE/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101000.txt b/fastlane/metadata/android/de-DE/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101000.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101010.txt b/fastlane/metadata/android/de-DE/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101010.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101020.txt b/fastlane/metadata/android/de-DE/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101020.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101030.txt b/fastlane/metadata/android/de-DE/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101030.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101040.txt b/fastlane/metadata/android/de-DE/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101040.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101050.txt b/fastlane/metadata/android/de-DE/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101050.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101060.txt b/fastlane/metadata/android/de-DE/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101060.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101070.txt b/fastlane/metadata/android/de-DE/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101070.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101080.txt b/fastlane/metadata/android/de-DE/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101080.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101090.txt b/fastlane/metadata/android/de-DE/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101090.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101100.txt b/fastlane/metadata/android/de-DE/changelogs/40101100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101100.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101100.txt
diff --git a/upstream_fastlane/metadata/android/de-DE/changelogs/40101110.txt b/fastlane/metadata/android/de-DE/changelogs/40101110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/de-DE/changelogs/40101110.txt
rename to fastlane/metadata/android/de-DE/changelogs/40101110.txt
diff --git a/fastlane/metadata/android/de-DE/full_description.txt b/fastlane/metadata/android/de-DE/full_description.txt
index 7b951d5cf8..30eb153ee9 100644
--- a/fastlane/metadata/android/de-DE/full_description.txt
+++ b/fastlane/metadata/android/de-DE/full_description.txt
@@ -1,12 +1,39 @@
-SchildiChat ist ein Client für das Matrix-Protokoll und basiert auf der Element-Codebasis.
-Im Gegensatz zu vergleichbaren Anwendungen bietet SchildiChat eine klassischere Oberfläche, wie sie von anderen verbreiteten Messengern bekannt ist, ohne dabei auf die volle Funktionalität der Referenzimplementierung zu verzichten.
+Element ist ein sicherer Messenger und ideal für die produktive Zusammenarbeit mit Ihrem Team im Homeoffice. Mit eingebauter Ende-zu-Ende-Verschlüsselung ermöglicht Element auch umfangreiche und sichere Videokonferenzen, das Teilen von Dateien, Sprachanrufe und vieles mehr.
-Das Matrix-Protokoll ist ein dezentralisierter Ansatz für die moderne Nachrichtenübermittlung, und erlaubt hierbei Ende-zu-Ende-Verschlüsselung, einen gemeinsamen Verlauf über mehrere Geräte, und mehr.
+Element bietet folgende Funktionen:
+- Fortschrittliche Werkzeuge für die Online-Kommunikation
+- Vollständig verschlüsselte Nachrichten, um eine sichere Kommunikation innerhalb und außerhalb von Unternehmen zu ermöglichen
+- Dezentralisierte Chats, basierend auf dem quelloffenen Matrix-Protokoll
+- Sichere und kontrollierte Dateifreigabe durch verschlüsselte Daten beim Verwalten von Projekten
+- Videochats mit VoIP und Bildschirmübertragung
+- Einfache Einbindung in Ihre bevorzugten Online-Kollaborations- und Projektverwaltungswerkzeuge, VoIP-Dienste und andere Kommunikationsapps für Ihr Team
-Verglichen mit der Element-Referenzanwendung bietet SchildiChat folgende Änderungen:
-- Eine gemeinsame Liste für Direkt-Chats und Gruppen
-- Optionale Nachrichtenblasen
-- Weitere Verbesserungen bezüglich der Benutzerfreundlichkeit und zusätzliche Einstellungen zur Konfiguration der App
+Element unterscheidet sich grundlegend von anderen Kommunikations- und Kollaborationsapps. Es läuft auf Matrix, einem offenen Netzwerk für sichere und dezentralisierte Kommunikation. Es erlaubt Nutzern ihre eigene Infrastruktur zu betreiben und gibt ihnen damit vollständige Kontrolle und Besitz über ihre eigenen Daten und Nachrichten.
-SchildiChat ist quelloffen: https://github.com/SchildiChat/SchildiChat-android
-Mehr Informationen zum Matrix-Protokoll: https://matrix.org/
+Privatsphäre/Datenschutz und verschlüsselte Kommunikation
+Element schützt Sie vor unerwünschter Werbung, dem Datensammeln und geschlossenen Plattformen. Auch schützt es all Ihre Daten, Ihre Video- und Sprachkommunikation mittels Ende-zu-Ende-Verschlüsselung und durch das Quersignieren von Geräten zur Verifizierung.
+
+Element gibt Ihnen volle Kontrolle über Ihre Privatsphäre und ermöglicht es Ihnen zugleich, mit jedem im Matrix-Netzwerk sicher zu kommunizieren - oder auch auf anderen geschäftlichen Kollaborationswerkzeugen, zum Beispiel durch das Einbinden von Apps wie Slack.
+
+Element kann man selber betreiben
+Um mehr Kontrolle über Ihre sensiblen Daten und Konversationen zu ermöglichen, kann man Element selbst betreiben, oder Sie wählen irgendeinen Matrix-basierten Dienst - der Standard für quelloffene, dezentralisierte Kommunikation. Element gibt Ihnen Privatsphäre, Sicherheitskonformität und Flexibilität für Integrationen.
+
+Besitzen Sie Ihre Daten
+Sie entscheiden, wo Sie Ihre Daten und Nachrichten aufbewahren - ohne das Datensammeln oder den Zugriff Dritter zu riskieren.
+
+Element gibt Ihnen auf verschiedene Arten Kontrolle:
+1. Sie können sich kostenlos auf dem öffentlichen matrix.org-Server registrieren, der von den Matrix-Entwicklern gehostet wird, oder einen von Tausenden öffentlichen Servern, die von Freiwilligen betrieben werden, auswählen
+2. Sie haben die Möglichkeit, ein Konto auf einem eigenen Server in der eigenen IT-Infrastruktur betreiben
+3. Außerdem können Sie durch ein Abonnement der Element Matrix Services ein Konto auf einem für Sie maßgeschneiderten Server erstellen
+
+Offene Kommunikation und Zusammenarbeit
+Sie können mit jedem im Matrix-Netzwerk chatten, egal ob ihr Kontakt Element, eine andere Matrix-App oder sogar eine völlig andere Anwendung nutzt.
+
+Super sicher
+Durch Ende-zu-Ende-Verschlüsselung können nur die Personen, die in der Unterhaltung sind, die Nachrichten lesen. Außerdem stellt die Verifizierung mittels Quersignierung sicher, dass Sie wirklich mit dem Chatten, mit dem Sie glauben - und niemand Anderem.
+
+Vollständige Kommunikation und Integration
+Kurznachrichten, Sprach- und Videoanrufe, Dateifreigaben, Bildschirmübertragungen und einer Menge an Integrationen, Bots und Widgets. Schaffen Sie Räume und Communities, bleiben Sie auf dem Laufenden und erledigen Sie Sachen.
+
+Da Weitermachen, wo Sie aufgehört haben
+Bleiben Sie in Kontakt, egal wo Sie sind, mit vollständig synchronisiertem Nachrichtenverlauf quer über all Ihre Geräte und im Netz auf https://app.element.io
diff --git a/fastlane/metadata/android/de-DE/short_description.txt b/fastlane/metadata/android/de-DE/short_description.txt
index 7fff3c6358..d27bd3ef12 100644
--- a/fastlane/metadata/android/de-DE/short_description.txt
+++ b/fastlane/metadata/android/de-DE/short_description.txt
@@ -1 +1 @@
-Sicherer Messenger für Matrix mit gewohnter Nutzeroberfläche
+Gruppen-Messenger - verschlüsselte Kommunikation, Gruppenchat und Videoanrufe
diff --git a/fastlane/metadata/android/de-DE/title.txt b/fastlane/metadata/android/de-DE/title.txt
index e5e6b4db47..6304f37925 100644
--- a/fastlane/metadata/android/de-DE/title.txt
+++ b/fastlane/metadata/android/de-DE/title.txt
@@ -1 +1 @@
-SchildiChat
+Element - Sicherer Messenger
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40100100.txt b/fastlane/metadata/android/en-US/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40100100.txt
rename to fastlane/metadata/android/en-US/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40100110.txt b/fastlane/metadata/android/en-US/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40100110.txt
rename to fastlane/metadata/android/en-US/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40100120.txt b/fastlane/metadata/android/en-US/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40100120.txt
rename to fastlane/metadata/android/en-US/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40100130.txt b/fastlane/metadata/android/en-US/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40100130.txt
rename to fastlane/metadata/android/en-US/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40100140.txt b/fastlane/metadata/android/en-US/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40100140.txt
rename to fastlane/metadata/android/en-US/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40100150.txt b/fastlane/metadata/android/en-US/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40100150.txt
rename to fastlane/metadata/android/en-US/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40100160.txt b/fastlane/metadata/android/en-US/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40100160.txt
rename to fastlane/metadata/android/en-US/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40100170.txt b/fastlane/metadata/android/en-US/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40100170.txt
rename to fastlane/metadata/android/en-US/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101000.txt b/fastlane/metadata/android/en-US/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101000.txt
rename to fastlane/metadata/android/en-US/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101010.txt b/fastlane/metadata/android/en-US/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101010.txt
rename to fastlane/metadata/android/en-US/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101020.txt b/fastlane/metadata/android/en-US/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101020.txt
rename to fastlane/metadata/android/en-US/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101030.txt b/fastlane/metadata/android/en-US/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101030.txt
rename to fastlane/metadata/android/en-US/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101040.txt b/fastlane/metadata/android/en-US/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101040.txt
rename to fastlane/metadata/android/en-US/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101050.txt b/fastlane/metadata/android/en-US/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101050.txt
rename to fastlane/metadata/android/en-US/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101060.txt b/fastlane/metadata/android/en-US/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101060.txt
rename to fastlane/metadata/android/en-US/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101070.txt b/fastlane/metadata/android/en-US/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101070.txt
rename to fastlane/metadata/android/en-US/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101080.txt b/fastlane/metadata/android/en-US/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101080.txt
rename to fastlane/metadata/android/en-US/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101090.txt b/fastlane/metadata/android/en-US/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101090.txt
rename to fastlane/metadata/android/en-US/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101100.txt b/fastlane/metadata/android/en-US/changelogs/40101100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101100.txt
rename to fastlane/metadata/android/en-US/changelogs/40101100.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101110.txt b/fastlane/metadata/android/en-US/changelogs/40101110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101110.txt
rename to fastlane/metadata/android/en-US/changelogs/40101110.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101120.txt b/fastlane/metadata/android/en-US/changelogs/40101120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101120.txt
rename to fastlane/metadata/android/en-US/changelogs/40101120.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101130.txt b/fastlane/metadata/android/en-US/changelogs/40101130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101130.txt
rename to fastlane/metadata/android/en-US/changelogs/40101130.txt
diff --git a/upstream_fastlane/metadata/android/en-US/changelogs/40101140.txt b/fastlane/metadata/android/en-US/changelogs/40101140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/changelogs/40101140.txt
rename to fastlane/metadata/android/en-US/changelogs/40101140.txt
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
index a979272ea1..853885944c 100644
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ b/fastlane/metadata/android/en-US/full_description.txt
@@ -1,12 +1,39 @@
-SchildiChat is a client for the matrix protocol, based on the Element app.
-Compared to other clients, it provides a more classic instant messenger feel, while still providing the full functionality of the reference client.
+Element is both a secure messenger and a productivity team collaboration app that is ideal for group chats while remote working. This chat app uses end-to-end encryption to provide powerful video conferencing, file sharing and voice calls.
-The matrix protocol is a decentralized approach to modern messaging, allowing for end-to-end encryption, shared message history across multiple devices, and more.
+Element’s features include:
+- Advanced online communication tools
+- Fully encrypted messages to allow safer corporate communication, even for remote workers
+- Decentralized chat based on the Matrix open source framework
+- File sharing securely with encrypted data while managing projects
+- Video chats with Voice over IP and screen sharing
+- Easy integration with your favourite online collaboration tools, project management tools, VoIP services and other team messaging apps
-Compared to the Element app, SchildiChat features following changes:
-- A unified chat list for both direct and group chats
-- Optional message bubbles
-- Further usability improvements and additional settings to configure the app
+Element is completely different from other messaging and collaboration apps. It operates on Matrix, an open network for secure messaging and decentralized communication. It allows self-hosting to give users maximum ownership and control of their data and messages.
-SchildiChat is open source: https://github.com/SchildiChat/SchildiChat-android
-More information about the Matrix protocol: https://matrix.org/
+Privacy and encrypted messaging
+Element protects you from unwanted ads, data mining and walled gardens. It also secures all your data, one-to-one video and voice communication through end-to-end encryption and cross-signed device verification.
+
+Element gives you control over your privacy while allowing you to communicate securely with anyone on the Matrix network, or other business collaboration tools by integrating with apps such as Slack.
+
+Element can be self-hosted
+To allow more control of your sensitive data and conversations, Element can be self-hosted or you can choose any Matrix-based host - the standard for open source, decentralized communication. Element gives you privacy, security compliance and integration flexibility.
+
+Own your data
+You decide where to keep your data and messages. Without the risk of data mining or access from third parties.
+
+Element puts you in control in different ways:
+1. Get a free account on the matrix.org public server hosted by the Matrix developers, or choose from thousands of public servers hosted by volunteers
+2. Self-host your account by running a server on your own IT infrastructure
+3. Sign up for an account on a custom server by simply subscribing to the Element Matrix Services hosting platform
+
+Open messaging and collaboration
+You can chat with anyone on the Matrix network, whether they’re using Element, another Matrix app or even if they are using a different messaging app.
+
+Super secure
+Real end-to-end encryption (only those in the conversation can decrypt messages), and cross-signed device verification.
+
+Complete communication and integration
+Messaging, voice and video calls, file sharing, screen sharing and a whole bunch of integrations, bots and widgets. Build rooms, communities, stay in touch and get things done.
+
+Pick up where you left off
+Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png
index a20ece3fd5..97f45aafd3 100644
Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
index d0680e0eef..e449d60ca9 100644
Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ
diff --git a/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
diff --git a/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
diff --git a/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
diff --git a/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
diff --git a/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
diff --git a/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/6.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/6.png
diff --git a/upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/7.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
similarity index 100%
rename from upstream_fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
rename to fastlane/metadata/android/en-US/images/phoneScreenshots/7.png
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
index e4815121e8..5a98f6f772 100644
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ b/fastlane/metadata/android/en-US/short_description.txt
@@ -1 +1 @@
-Secure messenger for Matrix with a traditional instant messaging experience
+Group messenger - encrypted messaging, group chat and video calls
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
index e5e6b4db47..12fa89b99b 100644
--- a/fastlane/metadata/android/en-US/title.txt
+++ b/fastlane/metadata/android/en-US/title.txt
@@ -1 +1 @@
-SchildiChat
+Element - Secure Messenger
\ No newline at end of file
diff --git a/upstream_fastlane/metadata/android/eo/full_description.txt b/fastlane/metadata/android/eo/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/eo/full_description.txt
rename to fastlane/metadata/android/eo/full_description.txt
diff --git a/upstream_fastlane/metadata/android/eo/short_description.txt b/fastlane/metadata/android/eo/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/eo/short_description.txt
rename to fastlane/metadata/android/eo/short_description.txt
diff --git a/upstream_fastlane/metadata/android/eo/title.txt b/fastlane/metadata/android/eo/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/eo/title.txt
rename to fastlane/metadata/android/eo/title.txt
diff --git a/upstream_fastlane/metadata/android/es-ES/changelogs/40100100.txt b/fastlane/metadata/android/es-ES/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/es-ES/changelogs/40100100.txt
rename to fastlane/metadata/android/es-ES/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/es-ES/full_description.txt b/fastlane/metadata/android/es-ES/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/es-ES/full_description.txt
rename to fastlane/metadata/android/es-ES/full_description.txt
diff --git a/upstream_fastlane/metadata/android/es-ES/short_description.txt b/fastlane/metadata/android/es-ES/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/es-ES/short_description.txt
rename to fastlane/metadata/android/es-ES/short_description.txt
diff --git a/upstream_fastlane/metadata/android/es-ES/title.txt b/fastlane/metadata/android/es-ES/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/es-ES/title.txt
rename to fastlane/metadata/android/es-ES/title.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40100100.txt b/fastlane/metadata/android/et/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40100100.txt
rename to fastlane/metadata/android/et/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40100110.txt b/fastlane/metadata/android/et/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40100110.txt
rename to fastlane/metadata/android/et/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40100120.txt b/fastlane/metadata/android/et/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40100120.txt
rename to fastlane/metadata/android/et/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40100130.txt b/fastlane/metadata/android/et/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40100130.txt
rename to fastlane/metadata/android/et/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40100140.txt b/fastlane/metadata/android/et/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40100140.txt
rename to fastlane/metadata/android/et/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40100150.txt b/fastlane/metadata/android/et/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40100150.txt
rename to fastlane/metadata/android/et/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40100160.txt b/fastlane/metadata/android/et/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40100160.txt
rename to fastlane/metadata/android/et/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40100170.txt b/fastlane/metadata/android/et/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40100170.txt
rename to fastlane/metadata/android/et/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101000.txt b/fastlane/metadata/android/et/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101000.txt
rename to fastlane/metadata/android/et/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101010.txt b/fastlane/metadata/android/et/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101010.txt
rename to fastlane/metadata/android/et/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101020.txt b/fastlane/metadata/android/et/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101020.txt
rename to fastlane/metadata/android/et/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101030.txt b/fastlane/metadata/android/et/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101030.txt
rename to fastlane/metadata/android/et/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101040.txt b/fastlane/metadata/android/et/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101040.txt
rename to fastlane/metadata/android/et/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101050.txt b/fastlane/metadata/android/et/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101050.txt
rename to fastlane/metadata/android/et/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101060.txt b/fastlane/metadata/android/et/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101060.txt
rename to fastlane/metadata/android/et/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101070.txt b/fastlane/metadata/android/et/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101070.txt
rename to fastlane/metadata/android/et/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101080.txt b/fastlane/metadata/android/et/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101080.txt
rename to fastlane/metadata/android/et/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101090.txt b/fastlane/metadata/android/et/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101090.txt
rename to fastlane/metadata/android/et/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101100.txt b/fastlane/metadata/android/et/changelogs/40101100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101100.txt
rename to fastlane/metadata/android/et/changelogs/40101100.txt
diff --git a/upstream_fastlane/metadata/android/et/changelogs/40101110.txt b/fastlane/metadata/android/et/changelogs/40101110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/changelogs/40101110.txt
rename to fastlane/metadata/android/et/changelogs/40101110.txt
diff --git a/upstream_fastlane/metadata/android/et/full_description.txt b/fastlane/metadata/android/et/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/full_description.txt
rename to fastlane/metadata/android/et/full_description.txt
diff --git a/upstream_fastlane/metadata/android/et/short_description.txt b/fastlane/metadata/android/et/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/short_description.txt
rename to fastlane/metadata/android/et/short_description.txt
diff --git a/upstream_fastlane/metadata/android/et/title.txt b/fastlane/metadata/android/et/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/et/title.txt
rename to fastlane/metadata/android/et/title.txt
diff --git a/upstream_fastlane/metadata/android/fa/changelogs/40100100.txt b/fastlane/metadata/android/fa/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/changelogs/40100100.txt
rename to fastlane/metadata/android/fa/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/fa/changelogs/40100110.txt b/fastlane/metadata/android/fa/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/changelogs/40100110.txt
rename to fastlane/metadata/android/fa/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/fa/changelogs/40100120.txt b/fastlane/metadata/android/fa/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/changelogs/40100120.txt
rename to fastlane/metadata/android/fa/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/fa/changelogs/40100130.txt b/fastlane/metadata/android/fa/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/changelogs/40100130.txt
rename to fastlane/metadata/android/fa/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/fa/changelogs/40100140.txt b/fastlane/metadata/android/fa/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/changelogs/40100140.txt
rename to fastlane/metadata/android/fa/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/fa/changelogs/40100150.txt b/fastlane/metadata/android/fa/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/changelogs/40100150.txt
rename to fastlane/metadata/android/fa/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/fa/changelogs/40100160.txt b/fastlane/metadata/android/fa/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/changelogs/40100160.txt
rename to fastlane/metadata/android/fa/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/fa/changelogs/40100170.txt b/fastlane/metadata/android/fa/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/changelogs/40100170.txt
rename to fastlane/metadata/android/fa/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/fa/changelogs/40101000.txt b/fastlane/metadata/android/fa/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/changelogs/40101000.txt
rename to fastlane/metadata/android/fa/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/fa/changelogs/40101010.txt b/fastlane/metadata/android/fa/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/changelogs/40101010.txt
rename to fastlane/metadata/android/fa/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/fa/full_description.txt b/fastlane/metadata/android/fa/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/full_description.txt
rename to fastlane/metadata/android/fa/full_description.txt
diff --git a/upstream_fastlane/metadata/android/fa/short_description.txt b/fastlane/metadata/android/fa/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/short_description.txt
rename to fastlane/metadata/android/fa/short_description.txt
diff --git a/upstream_fastlane/metadata/android/fa/title.txt b/fastlane/metadata/android/fa/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fa/title.txt
rename to fastlane/metadata/android/fa/title.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/changelogs/40100100.txt b/fastlane/metadata/android/fi-FI/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/changelogs/40100100.txt
rename to fastlane/metadata/android/fi-FI/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/changelogs/40100110.txt b/fastlane/metadata/android/fi-FI/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/changelogs/40100110.txt
rename to fastlane/metadata/android/fi-FI/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/changelogs/40100120.txt b/fastlane/metadata/android/fi-FI/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/changelogs/40100120.txt
rename to fastlane/metadata/android/fi-FI/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/changelogs/40100130.txt b/fastlane/metadata/android/fi-FI/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/changelogs/40100130.txt
rename to fastlane/metadata/android/fi-FI/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/changelogs/40100140.txt b/fastlane/metadata/android/fi-FI/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/changelogs/40100140.txt
rename to fastlane/metadata/android/fi-FI/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/changelogs/40100150.txt b/fastlane/metadata/android/fi-FI/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/changelogs/40100150.txt
rename to fastlane/metadata/android/fi-FI/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/changelogs/40100160.txt b/fastlane/metadata/android/fi-FI/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/changelogs/40100160.txt
rename to fastlane/metadata/android/fi-FI/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/changelogs/40100170.txt b/fastlane/metadata/android/fi-FI/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/changelogs/40100170.txt
rename to fastlane/metadata/android/fi-FI/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/changelogs/40101000.txt b/fastlane/metadata/android/fi-FI/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/changelogs/40101000.txt
rename to fastlane/metadata/android/fi-FI/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/changelogs/40101010.txt b/fastlane/metadata/android/fi-FI/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/changelogs/40101010.txt
rename to fastlane/metadata/android/fi-FI/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/full_description.txt b/fastlane/metadata/android/fi-FI/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/full_description.txt
rename to fastlane/metadata/android/fi-FI/full_description.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/short_description.txt b/fastlane/metadata/android/fi-FI/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/short_description.txt
rename to fastlane/metadata/android/fi-FI/short_description.txt
diff --git a/upstream_fastlane/metadata/android/fi-FI/title.txt b/fastlane/metadata/android/fi-FI/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fi-FI/title.txt
rename to fastlane/metadata/android/fi-FI/title.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40100100.txt b/fastlane/metadata/android/fr-FR/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40100100.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40100110.txt b/fastlane/metadata/android/fr-FR/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40100110.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40100120.txt b/fastlane/metadata/android/fr-FR/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40100120.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40100130.txt b/fastlane/metadata/android/fr-FR/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40100130.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40100140.txt b/fastlane/metadata/android/fr-FR/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40100140.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40100150.txt b/fastlane/metadata/android/fr-FR/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40100150.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40100160.txt b/fastlane/metadata/android/fr-FR/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40100160.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40100170.txt b/fastlane/metadata/android/fr-FR/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40100170.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40101000.txt b/fastlane/metadata/android/fr-FR/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40101000.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40101010.txt b/fastlane/metadata/android/fr-FR/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40101010.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40101020.txt b/fastlane/metadata/android/fr-FR/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40101020.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40101030.txt b/fastlane/metadata/android/fr-FR/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40101030.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40101040.txt b/fastlane/metadata/android/fr-FR/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40101040.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40101050.txt b/fastlane/metadata/android/fr-FR/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40101050.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40101060.txt b/fastlane/metadata/android/fr-FR/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40101060.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40101070.txt b/fastlane/metadata/android/fr-FR/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40101070.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40101080.txt b/fastlane/metadata/android/fr-FR/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40101080.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/changelogs/40101090.txt b/fastlane/metadata/android/fr-FR/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/changelogs/40101090.txt
rename to fastlane/metadata/android/fr-FR/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/full_description.txt
rename to fastlane/metadata/android/fr-FR/full_description.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/short_description.txt
rename to fastlane/metadata/android/fr-FR/short_description.txt
diff --git a/upstream_fastlane/metadata/android/fr-FR/title.txt b/fastlane/metadata/android/fr-FR/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fr-FR/title.txt
rename to fastlane/metadata/android/fr-FR/title.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40100100.txt b/fastlane/metadata/android/fy/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40100100.txt
rename to fastlane/metadata/android/fy/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40100110.txt b/fastlane/metadata/android/fy/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40100110.txt
rename to fastlane/metadata/android/fy/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40100120.txt b/fastlane/metadata/android/fy/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40100120.txt
rename to fastlane/metadata/android/fy/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40100130.txt b/fastlane/metadata/android/fy/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40100130.txt
rename to fastlane/metadata/android/fy/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40100140.txt b/fastlane/metadata/android/fy/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40100140.txt
rename to fastlane/metadata/android/fy/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40100150.txt b/fastlane/metadata/android/fy/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40100150.txt
rename to fastlane/metadata/android/fy/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40100160.txt b/fastlane/metadata/android/fy/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40100160.txt
rename to fastlane/metadata/android/fy/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40100170.txt b/fastlane/metadata/android/fy/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40100170.txt
rename to fastlane/metadata/android/fy/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40101000.txt b/fastlane/metadata/android/fy/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40101000.txt
rename to fastlane/metadata/android/fy/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40101010.txt b/fastlane/metadata/android/fy/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40101010.txt
rename to fastlane/metadata/android/fy/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40101020.txt b/fastlane/metadata/android/fy/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40101020.txt
rename to fastlane/metadata/android/fy/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40101030.txt b/fastlane/metadata/android/fy/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40101030.txt
rename to fastlane/metadata/android/fy/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40101040.txt b/fastlane/metadata/android/fy/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40101040.txt
rename to fastlane/metadata/android/fy/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40101050.txt b/fastlane/metadata/android/fy/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40101050.txt
rename to fastlane/metadata/android/fy/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/fy/changelogs/40101060.txt b/fastlane/metadata/android/fy/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/changelogs/40101060.txt
rename to fastlane/metadata/android/fy/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/fy/short_description.txt b/fastlane/metadata/android/fy/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/short_description.txt
rename to fastlane/metadata/android/fy/short_description.txt
diff --git a/upstream_fastlane/metadata/android/fy/title.txt b/fastlane/metadata/android/fy/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/fy/title.txt
rename to fastlane/metadata/android/fy/title.txt
diff --git a/upstream_fastlane/metadata/android/ga/title.txt b/fastlane/metadata/android/ga/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ga/title.txt
rename to fastlane/metadata/android/ga/title.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40100100.txt b/fastlane/metadata/android/hu-HU/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40100100.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40100110.txt b/fastlane/metadata/android/hu-HU/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40100110.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40100120.txt b/fastlane/metadata/android/hu-HU/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40100120.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40100130.txt b/fastlane/metadata/android/hu-HU/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40100130.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40100140.txt b/fastlane/metadata/android/hu-HU/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40100140.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40100150.txt b/fastlane/metadata/android/hu-HU/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40100150.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40100160.txt b/fastlane/metadata/android/hu-HU/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40100160.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40100170.txt b/fastlane/metadata/android/hu-HU/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40100170.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101000.txt b/fastlane/metadata/android/hu-HU/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101000.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101010.txt b/fastlane/metadata/android/hu-HU/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101010.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101020.txt b/fastlane/metadata/android/hu-HU/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101020.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101030.txt b/fastlane/metadata/android/hu-HU/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101030.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101040.txt b/fastlane/metadata/android/hu-HU/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101040.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101050.txt b/fastlane/metadata/android/hu-HU/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101050.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101060.txt b/fastlane/metadata/android/hu-HU/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101060.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101070.txt b/fastlane/metadata/android/hu-HU/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101070.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101080.txt b/fastlane/metadata/android/hu-HU/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101080.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101090.txt b/fastlane/metadata/android/hu-HU/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101090.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101100.txt b/fastlane/metadata/android/hu-HU/changelogs/40101100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101100.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101100.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/changelogs/40101110.txt b/fastlane/metadata/android/hu-HU/changelogs/40101110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/changelogs/40101110.txt
rename to fastlane/metadata/android/hu-HU/changelogs/40101110.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/full_description.txt b/fastlane/metadata/android/hu-HU/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/full_description.txt
rename to fastlane/metadata/android/hu-HU/full_description.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/short_description.txt b/fastlane/metadata/android/hu-HU/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/short_description.txt
rename to fastlane/metadata/android/hu-HU/short_description.txt
diff --git a/upstream_fastlane/metadata/android/hu-HU/title.txt b/fastlane/metadata/android/hu-HU/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/hu-HU/title.txt
rename to fastlane/metadata/android/hu-HU/title.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40100100.txt b/fastlane/metadata/android/it-IT/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40100100.txt
rename to fastlane/metadata/android/it-IT/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40100110.txt b/fastlane/metadata/android/it-IT/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40100110.txt
rename to fastlane/metadata/android/it-IT/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40100120.txt b/fastlane/metadata/android/it-IT/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40100120.txt
rename to fastlane/metadata/android/it-IT/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40100130.txt b/fastlane/metadata/android/it-IT/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40100130.txt
rename to fastlane/metadata/android/it-IT/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40100140.txt b/fastlane/metadata/android/it-IT/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40100140.txt
rename to fastlane/metadata/android/it-IT/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40100150.txt b/fastlane/metadata/android/it-IT/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40100150.txt
rename to fastlane/metadata/android/it-IT/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40100160.txt b/fastlane/metadata/android/it-IT/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40100160.txt
rename to fastlane/metadata/android/it-IT/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40100170.txt b/fastlane/metadata/android/it-IT/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40100170.txt
rename to fastlane/metadata/android/it-IT/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101000.txt b/fastlane/metadata/android/it-IT/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101000.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101010.txt b/fastlane/metadata/android/it-IT/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101010.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101020.txt b/fastlane/metadata/android/it-IT/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101020.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101030.txt b/fastlane/metadata/android/it-IT/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101030.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101040.txt b/fastlane/metadata/android/it-IT/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101040.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101050.txt b/fastlane/metadata/android/it-IT/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101050.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101060.txt b/fastlane/metadata/android/it-IT/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101060.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101070.txt b/fastlane/metadata/android/it-IT/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101070.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101080.txt b/fastlane/metadata/android/it-IT/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101080.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101090.txt b/fastlane/metadata/android/it-IT/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101090.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101100.txt b/fastlane/metadata/android/it-IT/changelogs/40101100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101100.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101100.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/changelogs/40101110.txt b/fastlane/metadata/android/it-IT/changelogs/40101110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/changelogs/40101110.txt
rename to fastlane/metadata/android/it-IT/changelogs/40101110.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/full_description.txt b/fastlane/metadata/android/it-IT/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/full_description.txt
rename to fastlane/metadata/android/it-IT/full_description.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/short_description.txt b/fastlane/metadata/android/it-IT/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/short_description.txt
rename to fastlane/metadata/android/it-IT/short_description.txt
diff --git a/upstream_fastlane/metadata/android/it-IT/title.txt b/fastlane/metadata/android/it-IT/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/it-IT/title.txt
rename to fastlane/metadata/android/it-IT/title.txt
diff --git a/upstream_fastlane/metadata/android/iw-IL/changelogs/40100100.txt b/fastlane/metadata/android/iw-IL/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/iw-IL/changelogs/40100100.txt
rename to fastlane/metadata/android/iw-IL/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/iw-IL/changelogs/40100110.txt b/fastlane/metadata/android/iw-IL/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/iw-IL/changelogs/40100110.txt
rename to fastlane/metadata/android/iw-IL/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/iw-IL/changelogs/40100120.txt b/fastlane/metadata/android/iw-IL/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/iw-IL/changelogs/40100120.txt
rename to fastlane/metadata/android/iw-IL/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/iw-IL/changelogs/40100130.txt b/fastlane/metadata/android/iw-IL/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/iw-IL/changelogs/40100130.txt
rename to fastlane/metadata/android/iw-IL/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/iw-IL/full_description.txt b/fastlane/metadata/android/iw-IL/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/iw-IL/full_description.txt
rename to fastlane/metadata/android/iw-IL/full_description.txt
diff --git a/upstream_fastlane/metadata/android/iw-IL/short_description.txt b/fastlane/metadata/android/iw-IL/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/iw-IL/short_description.txt
rename to fastlane/metadata/android/iw-IL/short_description.txt
diff --git a/upstream_fastlane/metadata/android/iw-IL/title.txt b/fastlane/metadata/android/iw-IL/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/iw-IL/title.txt
rename to fastlane/metadata/android/iw-IL/title.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40100100.txt b/fastlane/metadata/android/ja-JP/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40100100.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40100110.txt b/fastlane/metadata/android/ja-JP/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40100110.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40100120.txt b/fastlane/metadata/android/ja-JP/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40100120.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40100130.txt b/fastlane/metadata/android/ja-JP/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40100130.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40100140.txt b/fastlane/metadata/android/ja-JP/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40100140.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40100150.txt b/fastlane/metadata/android/ja-JP/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40100150.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40100160.txt b/fastlane/metadata/android/ja-JP/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40100160.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40100170.txt b/fastlane/metadata/android/ja-JP/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40100170.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40101000.txt b/fastlane/metadata/android/ja-JP/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40101000.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40101010.txt b/fastlane/metadata/android/ja-JP/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40101010.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40101020.txt b/fastlane/metadata/android/ja-JP/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40101020.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/changelogs/40101030.txt b/fastlane/metadata/android/ja-JP/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/changelogs/40101030.txt
rename to fastlane/metadata/android/ja-JP/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/full_description.txt b/fastlane/metadata/android/ja-JP/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/full_description.txt
rename to fastlane/metadata/android/ja-JP/full_description.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/short_description.txt b/fastlane/metadata/android/ja-JP/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/short_description.txt
rename to fastlane/metadata/android/ja-JP/short_description.txt
diff --git a/upstream_fastlane/metadata/android/ja-JP/title.txt b/fastlane/metadata/android/ja-JP/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ja-JP/title.txt
rename to fastlane/metadata/android/ja-JP/title.txt
diff --git a/upstream_fastlane/metadata/android/kab/full_description.txt b/fastlane/metadata/android/kab/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/kab/full_description.txt
rename to fastlane/metadata/android/kab/full_description.txt
diff --git a/upstream_fastlane/metadata/android/kab/short_description.txt b/fastlane/metadata/android/kab/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/kab/short_description.txt
rename to fastlane/metadata/android/kab/short_description.txt
diff --git a/upstream_fastlane/metadata/android/kab/title.txt b/fastlane/metadata/android/kab/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/kab/title.txt
rename to fastlane/metadata/android/kab/title.txt
diff --git a/upstream_fastlane/metadata/android/nb/changelogs/40100170.txt b/fastlane/metadata/android/nb/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/nb/changelogs/40100170.txt
rename to fastlane/metadata/android/nb/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/nb/changelogs/40101010.txt b/fastlane/metadata/android/nb/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/nb/changelogs/40101010.txt
rename to fastlane/metadata/android/nb/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/nb/short_description.txt b/fastlane/metadata/android/nb/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/nb/short_description.txt
rename to fastlane/metadata/android/nb/short_description.txt
diff --git a/upstream_fastlane/metadata/android/nb/title.txt b/fastlane/metadata/android/nb/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/nb/title.txt
rename to fastlane/metadata/android/nb/title.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40100100.txt b/fastlane/metadata/android/no-NO/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40100100.txt
rename to fastlane/metadata/android/no-NO/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40100110.txt b/fastlane/metadata/android/no-NO/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40100110.txt
rename to fastlane/metadata/android/no-NO/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40100120.txt b/fastlane/metadata/android/no-NO/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40100120.txt
rename to fastlane/metadata/android/no-NO/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40100130.txt b/fastlane/metadata/android/no-NO/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40100130.txt
rename to fastlane/metadata/android/no-NO/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40100140.txt b/fastlane/metadata/android/no-NO/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40100140.txt
rename to fastlane/metadata/android/no-NO/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40100150.txt b/fastlane/metadata/android/no-NO/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40100150.txt
rename to fastlane/metadata/android/no-NO/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40100160.txt b/fastlane/metadata/android/no-NO/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40100160.txt
rename to fastlane/metadata/android/no-NO/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40100170.txt b/fastlane/metadata/android/no-NO/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40100170.txt
rename to fastlane/metadata/android/no-NO/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40101000.txt b/fastlane/metadata/android/no-NO/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40101000.txt
rename to fastlane/metadata/android/no-NO/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40101010.txt b/fastlane/metadata/android/no-NO/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40101010.txt
rename to fastlane/metadata/android/no-NO/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40101020.txt b/fastlane/metadata/android/no-NO/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40101020.txt
rename to fastlane/metadata/android/no-NO/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/changelogs/40101030.txt b/fastlane/metadata/android/no-NO/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/changelogs/40101030.txt
rename to fastlane/metadata/android/no-NO/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/full_description.txt b/fastlane/metadata/android/no-NO/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/full_description.txt
rename to fastlane/metadata/android/no-NO/full_description.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/short_description.txt b/fastlane/metadata/android/no-NO/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/short_description.txt
rename to fastlane/metadata/android/no-NO/short_description.txt
diff --git a/upstream_fastlane/metadata/android/no-NO/title.txt b/fastlane/metadata/android/no-NO/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/no-NO/title.txt
rename to fastlane/metadata/android/no-NO/title.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40100100.txt b/fastlane/metadata/android/pt-BR/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40100100.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40100110.txt b/fastlane/metadata/android/pt-BR/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40100110.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40100120.txt b/fastlane/metadata/android/pt-BR/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40100120.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40100130.txt b/fastlane/metadata/android/pt-BR/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40100130.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40100140.txt b/fastlane/metadata/android/pt-BR/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40100140.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40100150.txt b/fastlane/metadata/android/pt-BR/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40100150.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40100160.txt b/fastlane/metadata/android/pt-BR/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40100160.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40100170.txt b/fastlane/metadata/android/pt-BR/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40100170.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101000.txt b/fastlane/metadata/android/pt-BR/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101000.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101010.txt b/fastlane/metadata/android/pt-BR/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101010.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101020.txt b/fastlane/metadata/android/pt-BR/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101020.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101030.txt b/fastlane/metadata/android/pt-BR/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101030.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101040.txt b/fastlane/metadata/android/pt-BR/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101040.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101050.txt b/fastlane/metadata/android/pt-BR/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101050.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101060.txt b/fastlane/metadata/android/pt-BR/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101060.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101070.txt b/fastlane/metadata/android/pt-BR/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101070.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101080.txt b/fastlane/metadata/android/pt-BR/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101080.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101090.txt b/fastlane/metadata/android/pt-BR/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101090.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101100.txt b/fastlane/metadata/android/pt-BR/changelogs/40101100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101100.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101100.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/changelogs/40101110.txt b/fastlane/metadata/android/pt-BR/changelogs/40101110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/changelogs/40101110.txt
rename to fastlane/metadata/android/pt-BR/changelogs/40101110.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/full_description.txt b/fastlane/metadata/android/pt-BR/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/full_description.txt
rename to fastlane/metadata/android/pt-BR/full_description.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/short_description.txt b/fastlane/metadata/android/pt-BR/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/short_description.txt
rename to fastlane/metadata/android/pt-BR/short_description.txt
diff --git a/upstream_fastlane/metadata/android/pt-BR/title.txt b/fastlane/metadata/android/pt-BR/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/pt-BR/title.txt
rename to fastlane/metadata/android/pt-BR/title.txt
diff --git a/upstream_fastlane/metadata/android/ro/short_description.txt b/fastlane/metadata/android/ro/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ro/short_description.txt
rename to fastlane/metadata/android/ro/short_description.txt
diff --git a/upstream_fastlane/metadata/android/ro/title.txt b/fastlane/metadata/android/ro/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ro/title.txt
rename to fastlane/metadata/android/ro/title.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40100100.txt b/fastlane/metadata/android/ru-RU/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40100100.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40100110.txt b/fastlane/metadata/android/ru-RU/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40100110.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40100120.txt b/fastlane/metadata/android/ru-RU/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40100120.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40100130.txt b/fastlane/metadata/android/ru-RU/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40100130.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40100140.txt b/fastlane/metadata/android/ru-RU/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40100140.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40100150.txt b/fastlane/metadata/android/ru-RU/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40100150.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40100160.txt b/fastlane/metadata/android/ru-RU/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40100160.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40100170.txt b/fastlane/metadata/android/ru-RU/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40100170.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40101000.txt b/fastlane/metadata/android/ru-RU/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40101000.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40101010.txt b/fastlane/metadata/android/ru-RU/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40101010.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40101020.txt b/fastlane/metadata/android/ru-RU/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40101020.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/ru-RU/changelogs/40101030.txt b/fastlane/metadata/android/ru-RU/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/ru-RU/changelogs/40101030.txt
rename to fastlane/metadata/android/ru-RU/changelogs/40101030.txt
diff --git a/fastlane/metadata/android/ru-RU/full_description.txt b/fastlane/metadata/android/ru-RU/full_description.txt
index fac6103b7d..2ac7f9be54 100644
--- a/fastlane/metadata/android/ru-RU/full_description.txt
+++ b/fastlane/metadata/android/ru-RU/full_description.txt
@@ -1,12 +1,30 @@
-SchildiChat - это клиент для протокола Matrix, основанный на приложении Element.
-По сравнению с другими клиентами, он обеспечивает более классический вид обмена мгновенными сообщениями, при этом обеспечивая полную функциональность эталонного клиента.
+Element - это новый тип приложения для обмена сообщениями и совместной работы, которое:
-Протокол Matrix - это децентрализованный подход к современному обмену сообщениями, позволяющий осуществлять сквозное шифрование, совместно использовать историю сообщений на нескольких устройствах и многое другое.
+1. Позволяет вам контролировать вашу конфиденциальность
+2. Позволяет общаться с кем угодно в сети Matrix и даже за ее пределами за счет интеграции с такими приложениями, как Slack
+3. Защищает вас от рекламы, данных и огороженных стеной садов
+4. Обеспечивает безопасность с помощью сквозного шифрования с перекрестной подписью для проверки других пользователей
-По сравнению с приложением Element, SchildiChat имеет следующие изменения:
-- Единый список чатов как для прямых, так и для групповых чатов
-- Опциональные пузыри сообщений
-- Дальнейшие улучшения удобства использования
+Element полностью отличается от других приложений для обмена сообщениями и совместной работы, потому что он децентрализован и имеет открытый исходный код.
-SchildiChat имеет открытый исходный код: https://github.com/SchildiChat/SchildiChat-android
-Подробнее о протоколе Matrix: https://matrix.org/
+Element позволяет вам самостоятельно размещать или выбирать хост-узел, чтобы у вас была конфиденциальность, право собственности и контроль над своими данными и разговорами. Он предоставляет вам доступ к открытой сети, поэтому вы не ограничены общением исключительно с пользователями Element. И он очень надежен и безопаснен.
+
+Element может делать все это, потому что он работает на Matrix - стандарте открытого, децентрализованного общения.
+
+Element предоставляет вам полный контроль, позволяя выбрать поставщиков услуг, обслуживающих серверы с вашими беседами. Вы свободны выбрать любой способ размещения прямо из приложения Element:
+
+1. Получить бесплатную учетную запись на общедоступном сервере matrix.org, размещенном разработчиками Matrix, или выберите один из тысяч общедоступных серверов, размещенных волонтерами.
+2. Разместить свою учетную запись на собственном сервере
+3. Зарегистрироваться на индивидуальном сервере, просто подписавшись на услуги платформы Element Matrix Services
+
+Почему выбирают Element?
+
+СОБСТВЕННЫЕ ДАННЫЕ: Вы решаете, где хранить свои данные и сообщения. Вы владеете ими и контролируете их, а не какая-то мегакорпорация, что собирает ваши данные и предоставляет сторонним лицам доступ к ним.
+
+ОТКРЫТОЕ ОБЩЕНИЕ И СОТРУДНИЧЕСТВО: Вы можете общаться с кем угодно в сети Matrix, независимо от того, используют ли они приложение Element или другое приложение Matrix, и даже если они используют другую систему обмена сообщениями, такую как Slack, IRC или XMPP.
+
+СУПЕР-БЕЗОПАСНОСТЬ: Настоящее сквозное шифрование (только участники разговора могут расшифровывать сообщения) и перекрестная подпись для проверки устройств участников разговора.
+
+ПОЛНАЯ КОММУНИКАЦИЯ: Обмен сообщениями, голосовые и видеозвонки, совместное использование файлов, совместное использование экрана и целый ряд интеграций, ботов и виджетов. Создавайте комнаты, сообщества, оставайтесь на связи и добивайтесь результатов.
+
+ВЫ ВЕЗДЕ: Оставайтесь на связи, где бы вы ни находились, благодаря полностью синхронизированной истории сообщений на всех ваших устройствах и в Интернете по адресу https://app.element.io.
diff --git a/fastlane/metadata/android/ru-RU/short_description.txt b/fastlane/metadata/android/ru-RU/short_description.txt
index 17e475e511..64452ed22d 100644
--- a/fastlane/metadata/android/ru-RU/short_description.txt
+++ b/fastlane/metadata/android/ru-RU/short_description.txt
@@ -1 +1 @@
-Безопасный мессенджер для Matrix с традиционным обменом мгновенными сообщениями
\ No newline at end of file
+Защищённый децентрализованный чат и звонки. Держите ваши данные в безопасности.
diff --git a/fastlane/metadata/android/ru-RU/title.txt b/fastlane/metadata/android/ru-RU/title.txt
index e5e6b4db47..00e488e69f 100644
--- a/fastlane/metadata/android/ru-RU/title.txt
+++ b/fastlane/metadata/android/ru-RU/title.txt
@@ -1 +1 @@
-SchildiChat
+Element (ранее Riot.im)
diff --git a/upstream_fastlane/metadata/android/si-LK/title.txt b/fastlane/metadata/android/si-LK/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/si-LK/title.txt
rename to fastlane/metadata/android/si-LK/title.txt
diff --git a/upstream_fastlane/metadata/android/sk/changelogs/40100100.txt b/fastlane/metadata/android/sk/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sk/changelogs/40100100.txt
rename to fastlane/metadata/android/sk/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/sk/changelogs/40100110.txt b/fastlane/metadata/android/sk/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sk/changelogs/40100110.txt
rename to fastlane/metadata/android/sk/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/sk/changelogs/40100120.txt b/fastlane/metadata/android/sk/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sk/changelogs/40100120.txt
rename to fastlane/metadata/android/sk/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/sk/changelogs/40100130.txt b/fastlane/metadata/android/sk/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sk/changelogs/40100130.txt
rename to fastlane/metadata/android/sk/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/sk/changelogs/40100140.txt b/fastlane/metadata/android/sk/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sk/changelogs/40100140.txt
rename to fastlane/metadata/android/sk/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/sk/changelogs/40100150.txt b/fastlane/metadata/android/sk/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sk/changelogs/40100150.txt
rename to fastlane/metadata/android/sk/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/sk/changelogs/40100160.txt b/fastlane/metadata/android/sk/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sk/changelogs/40100160.txt
rename to fastlane/metadata/android/sk/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/sk/changelogs/40100170.txt b/fastlane/metadata/android/sk/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sk/changelogs/40100170.txt
rename to fastlane/metadata/android/sk/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/sk/full_description.txt b/fastlane/metadata/android/sk/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sk/full_description.txt
rename to fastlane/metadata/android/sk/full_description.txt
diff --git a/upstream_fastlane/metadata/android/sk/short_description.txt b/fastlane/metadata/android/sk/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sk/short_description.txt
rename to fastlane/metadata/android/sk/short_description.txt
diff --git a/upstream_fastlane/metadata/android/sk/title.txt b/fastlane/metadata/android/sk/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sk/title.txt
rename to fastlane/metadata/android/sk/title.txt
diff --git a/upstream_fastlane/metadata/android/sr/changelogs/40100100.txt b/fastlane/metadata/android/sr/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sr/changelogs/40100100.txt
rename to fastlane/metadata/android/sr/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/sr/changelogs/40100110.txt b/fastlane/metadata/android/sr/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sr/changelogs/40100110.txt
rename to fastlane/metadata/android/sr/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/sr/changelogs/40100120.txt b/fastlane/metadata/android/sr/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sr/changelogs/40100120.txt
rename to fastlane/metadata/android/sr/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/sr/changelogs/40100130.txt b/fastlane/metadata/android/sr/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sr/changelogs/40100130.txt
rename to fastlane/metadata/android/sr/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/sr/changelogs/40100140.txt b/fastlane/metadata/android/sr/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sr/changelogs/40100140.txt
rename to fastlane/metadata/android/sr/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/sr/changelogs/40100150.txt b/fastlane/metadata/android/sr/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sr/changelogs/40100150.txt
rename to fastlane/metadata/android/sr/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/sr/changelogs/40100160.txt b/fastlane/metadata/android/sr/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sr/changelogs/40100160.txt
rename to fastlane/metadata/android/sr/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/sr/changelogs/40100170.txt b/fastlane/metadata/android/sr/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sr/changelogs/40100170.txt
rename to fastlane/metadata/android/sr/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/sr/full_description.txt b/fastlane/metadata/android/sr/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sr/full_description.txt
rename to fastlane/metadata/android/sr/full_description.txt
diff --git a/upstream_fastlane/metadata/android/sr/short_description.txt b/fastlane/metadata/android/sr/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sr/short_description.txt
rename to fastlane/metadata/android/sr/short_description.txt
diff --git a/upstream_fastlane/metadata/android/sr/title.txt b/fastlane/metadata/android/sr/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sr/title.txt
rename to fastlane/metadata/android/sr/title.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40100100.txt b/fastlane/metadata/android/sv-SE/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40100100.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40100110.txt b/fastlane/metadata/android/sv-SE/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40100110.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40100120.txt b/fastlane/metadata/android/sv-SE/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40100120.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40100130.txt b/fastlane/metadata/android/sv-SE/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40100130.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40100140.txt b/fastlane/metadata/android/sv-SE/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40100140.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40100150.txt b/fastlane/metadata/android/sv-SE/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40100150.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40100160.txt b/fastlane/metadata/android/sv-SE/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40100160.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40100170.txt b/fastlane/metadata/android/sv-SE/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40100170.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40101000.txt b/fastlane/metadata/android/sv-SE/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40101000.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40101010.txt b/fastlane/metadata/android/sv-SE/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40101010.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40101020.txt b/fastlane/metadata/android/sv-SE/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40101020.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40101030.txt b/fastlane/metadata/android/sv-SE/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40101030.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40101040.txt b/fastlane/metadata/android/sv-SE/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40101040.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40101050.txt b/fastlane/metadata/android/sv-SE/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40101050.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40101060.txt b/fastlane/metadata/android/sv-SE/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40101060.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40101070.txt b/fastlane/metadata/android/sv-SE/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40101070.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40101080.txt b/fastlane/metadata/android/sv-SE/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40101080.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/changelogs/40101090.txt b/fastlane/metadata/android/sv-SE/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/changelogs/40101090.txt
rename to fastlane/metadata/android/sv-SE/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/full_description.txt b/fastlane/metadata/android/sv-SE/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/full_description.txt
rename to fastlane/metadata/android/sv-SE/full_description.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/short_description.txt b/fastlane/metadata/android/sv-SE/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/short_description.txt
rename to fastlane/metadata/android/sv-SE/short_description.txt
diff --git a/upstream_fastlane/metadata/android/sv-SE/title.txt b/fastlane/metadata/android/sv-SE/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/sv-SE/title.txt
rename to fastlane/metadata/android/sv-SE/title.txt
diff --git a/upstream_fastlane/metadata/android/th/short_description.txt b/fastlane/metadata/android/th/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/th/short_description.txt
rename to fastlane/metadata/android/th/short_description.txt
diff --git a/upstream_fastlane/metadata/android/th/title.txt b/fastlane/metadata/android/th/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/th/title.txt
rename to fastlane/metadata/android/th/title.txt
diff --git a/upstream_fastlane/metadata/android/tr-TR/changelogs/40100100.txt b/fastlane/metadata/android/tr-TR/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/tr-TR/changelogs/40100100.txt
rename to fastlane/metadata/android/tr-TR/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/tr-TR/changelogs/40100110.txt b/fastlane/metadata/android/tr-TR/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/tr-TR/changelogs/40100110.txt
rename to fastlane/metadata/android/tr-TR/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/tr-TR/changelogs/40100120.txt b/fastlane/metadata/android/tr-TR/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/tr-TR/changelogs/40100120.txt
rename to fastlane/metadata/android/tr-TR/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/tr-TR/changelogs/40100130.txt b/fastlane/metadata/android/tr-TR/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/tr-TR/changelogs/40100130.txt
rename to fastlane/metadata/android/tr-TR/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/tr-TR/changelogs/40100140.txt b/fastlane/metadata/android/tr-TR/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/tr-TR/changelogs/40100140.txt
rename to fastlane/metadata/android/tr-TR/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/tr-TR/changelogs/40100170.txt b/fastlane/metadata/android/tr-TR/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/tr-TR/changelogs/40100170.txt
rename to fastlane/metadata/android/tr-TR/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/tr-TR/changelogs/40101000.txt b/fastlane/metadata/android/tr-TR/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/tr-TR/changelogs/40101000.txt
rename to fastlane/metadata/android/tr-TR/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/tr-TR/changelogs/40101010.txt b/fastlane/metadata/android/tr-TR/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/tr-TR/changelogs/40101010.txt
rename to fastlane/metadata/android/tr-TR/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/tr-TR/full_description.txt b/fastlane/metadata/android/tr-TR/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/tr-TR/full_description.txt
rename to fastlane/metadata/android/tr-TR/full_description.txt
diff --git a/upstream_fastlane/metadata/android/tr-TR/short_description.txt b/fastlane/metadata/android/tr-TR/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/tr-TR/short_description.txt
rename to fastlane/metadata/android/tr-TR/short_description.txt
diff --git a/upstream_fastlane/metadata/android/tr-TR/title.txt b/fastlane/metadata/android/tr-TR/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/tr-TR/title.txt
rename to fastlane/metadata/android/tr-TR/title.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40100100.txt b/fastlane/metadata/android/uk/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40100100.txt
rename to fastlane/metadata/android/uk/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40100110.txt b/fastlane/metadata/android/uk/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40100110.txt
rename to fastlane/metadata/android/uk/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40100120.txt b/fastlane/metadata/android/uk/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40100120.txt
rename to fastlane/metadata/android/uk/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40100130.txt b/fastlane/metadata/android/uk/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40100130.txt
rename to fastlane/metadata/android/uk/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40100140.txt b/fastlane/metadata/android/uk/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40100140.txt
rename to fastlane/metadata/android/uk/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40100150.txt b/fastlane/metadata/android/uk/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40100150.txt
rename to fastlane/metadata/android/uk/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40100160.txt b/fastlane/metadata/android/uk/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40100160.txt
rename to fastlane/metadata/android/uk/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40100170.txt b/fastlane/metadata/android/uk/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40100170.txt
rename to fastlane/metadata/android/uk/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101000.txt b/fastlane/metadata/android/uk/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101000.txt
rename to fastlane/metadata/android/uk/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101010.txt b/fastlane/metadata/android/uk/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101010.txt
rename to fastlane/metadata/android/uk/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101020.txt b/fastlane/metadata/android/uk/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101020.txt
rename to fastlane/metadata/android/uk/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101030.txt b/fastlane/metadata/android/uk/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101030.txt
rename to fastlane/metadata/android/uk/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101040.txt b/fastlane/metadata/android/uk/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101040.txt
rename to fastlane/metadata/android/uk/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101050.txt b/fastlane/metadata/android/uk/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101050.txt
rename to fastlane/metadata/android/uk/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101060.txt b/fastlane/metadata/android/uk/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101060.txt
rename to fastlane/metadata/android/uk/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101070.txt b/fastlane/metadata/android/uk/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101070.txt
rename to fastlane/metadata/android/uk/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101080.txt b/fastlane/metadata/android/uk/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101080.txt
rename to fastlane/metadata/android/uk/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101090.txt b/fastlane/metadata/android/uk/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101090.txt
rename to fastlane/metadata/android/uk/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101100.txt b/fastlane/metadata/android/uk/changelogs/40101100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101100.txt
rename to fastlane/metadata/android/uk/changelogs/40101100.txt
diff --git a/upstream_fastlane/metadata/android/uk/changelogs/40101110.txt b/fastlane/metadata/android/uk/changelogs/40101110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/changelogs/40101110.txt
rename to fastlane/metadata/android/uk/changelogs/40101110.txt
diff --git a/upstream_fastlane/metadata/android/uk/full_description.txt b/fastlane/metadata/android/uk/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/full_description.txt
rename to fastlane/metadata/android/uk/full_description.txt
diff --git a/upstream_fastlane/metadata/android/uk/short_description.txt b/fastlane/metadata/android/uk/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/short_description.txt
rename to fastlane/metadata/android/uk/short_description.txt
diff --git a/upstream_fastlane/metadata/android/uk/title.txt b/fastlane/metadata/android/uk/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/uk/title.txt
rename to fastlane/metadata/android/uk/title.txt
diff --git a/upstream_fastlane/metadata/android/vi/changelogs/40100100.txt b/fastlane/metadata/android/vi/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/vi/changelogs/40100100.txt
rename to fastlane/metadata/android/vi/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/vi/changelogs/40100110.txt b/fastlane/metadata/android/vi/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/vi/changelogs/40100110.txt
rename to fastlane/metadata/android/vi/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/vi/short_description.txt b/fastlane/metadata/android/vi/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/vi/short_description.txt
rename to fastlane/metadata/android/vi/short_description.txt
diff --git a/upstream_fastlane/metadata/android/vi/title.txt b/fastlane/metadata/android/vi/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/vi/title.txt
rename to fastlane/metadata/android/vi/title.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40100100.txt b/fastlane/metadata/android/zh-CN/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40100100.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40100110.txt b/fastlane/metadata/android/zh-CN/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40100110.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40100120.txt b/fastlane/metadata/android/zh-CN/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40100120.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40100130.txt b/fastlane/metadata/android/zh-CN/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40100130.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40100140.txt b/fastlane/metadata/android/zh-CN/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40100140.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40100150.txt b/fastlane/metadata/android/zh-CN/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40100150.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40100160.txt b/fastlane/metadata/android/zh-CN/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40100160.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40100170.txt b/fastlane/metadata/android/zh-CN/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40100170.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101000.txt b/fastlane/metadata/android/zh-CN/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101000.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101010.txt b/fastlane/metadata/android/zh-CN/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101010.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101020.txt b/fastlane/metadata/android/zh-CN/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101020.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101030.txt b/fastlane/metadata/android/zh-CN/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101030.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101040.txt b/fastlane/metadata/android/zh-CN/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101040.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101050.txt b/fastlane/metadata/android/zh-CN/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101050.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101060.txt b/fastlane/metadata/android/zh-CN/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101060.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101070.txt b/fastlane/metadata/android/zh-CN/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101070.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101080.txt b/fastlane/metadata/android/zh-CN/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101080.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101090.txt b/fastlane/metadata/android/zh-CN/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101090.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101100.txt b/fastlane/metadata/android/zh-CN/changelogs/40101100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101100.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101100.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/changelogs/40101110.txt b/fastlane/metadata/android/zh-CN/changelogs/40101110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/changelogs/40101110.txt
rename to fastlane/metadata/android/zh-CN/changelogs/40101110.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/full_description.txt b/fastlane/metadata/android/zh-CN/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/full_description.txt
rename to fastlane/metadata/android/zh-CN/full_description.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/short_description.txt b/fastlane/metadata/android/zh-CN/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/short_description.txt
rename to fastlane/metadata/android/zh-CN/short_description.txt
diff --git a/upstream_fastlane/metadata/android/zh-CN/title.txt b/fastlane/metadata/android/zh-CN/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-CN/title.txt
rename to fastlane/metadata/android/zh-CN/title.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40100100.txt b/fastlane/metadata/android/zh-TW/changelogs/40100100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40100100.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40100100.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40100110.txt b/fastlane/metadata/android/zh-TW/changelogs/40100110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40100110.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40100110.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40100120.txt b/fastlane/metadata/android/zh-TW/changelogs/40100120.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40100120.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40100120.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40100130.txt b/fastlane/metadata/android/zh-TW/changelogs/40100130.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40100130.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40100130.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40100140.txt b/fastlane/metadata/android/zh-TW/changelogs/40100140.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40100140.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40100140.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40100150.txt b/fastlane/metadata/android/zh-TW/changelogs/40100150.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40100150.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40100150.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40100160.txt b/fastlane/metadata/android/zh-TW/changelogs/40100160.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40100160.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40100160.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40100170.txt b/fastlane/metadata/android/zh-TW/changelogs/40100170.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40100170.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40100170.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101000.txt b/fastlane/metadata/android/zh-TW/changelogs/40101000.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101000.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101000.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101010.txt b/fastlane/metadata/android/zh-TW/changelogs/40101010.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101010.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101010.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101020.txt b/fastlane/metadata/android/zh-TW/changelogs/40101020.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101020.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101020.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101030.txt b/fastlane/metadata/android/zh-TW/changelogs/40101030.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101030.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101030.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101040.txt b/fastlane/metadata/android/zh-TW/changelogs/40101040.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101040.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101040.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101050.txt b/fastlane/metadata/android/zh-TW/changelogs/40101050.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101050.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101050.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101060.txt b/fastlane/metadata/android/zh-TW/changelogs/40101060.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101060.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101060.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101070.txt b/fastlane/metadata/android/zh-TW/changelogs/40101070.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101070.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101070.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101080.txt b/fastlane/metadata/android/zh-TW/changelogs/40101080.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101080.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101080.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101090.txt b/fastlane/metadata/android/zh-TW/changelogs/40101090.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101090.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101090.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101100.txt b/fastlane/metadata/android/zh-TW/changelogs/40101100.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101100.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101100.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/changelogs/40101110.txt b/fastlane/metadata/android/zh-TW/changelogs/40101110.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/changelogs/40101110.txt
rename to fastlane/metadata/android/zh-TW/changelogs/40101110.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/full_description.txt b/fastlane/metadata/android/zh-TW/full_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/full_description.txt
rename to fastlane/metadata/android/zh-TW/full_description.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/short_description.txt b/fastlane/metadata/android/zh-TW/short_description.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/short_description.txt
rename to fastlane/metadata/android/zh-TW/short_description.txt
diff --git a/upstream_fastlane/metadata/android/zh-TW/title.txt b/fastlane/metadata/android/zh-TW/title.txt
similarity index 100%
rename from upstream_fastlane/metadata/android/zh-TW/title.txt
rename to fastlane/metadata/android/zh-TW/title.txt
diff --git a/upstream_.github/ISSUE_TEMPLATE/bug_report.md b/tmp_sc_.github/ISSUE_TEMPLATE/bug_report.md
similarity index 56%
rename from upstream_.github/ISSUE_TEMPLATE/bug_report.md
rename to tmp_sc_.github/ISSUE_TEMPLATE/bug_report.md
index d7c3506fa0..30f2a1c525 100644
--- a/upstream_.github/ISSUE_TEMPLATE/bug_report.md
+++ b/tmp_sc_.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,34 +1,38 @@
---
name: Bug report
-about: Create a report to help us improve Element
+about: Create a report to help us improve SchildiChat
title: ''
labels: ''
assignees: ''
---
-#### Describe the bug
+**Describe the bug**
A clear and concise description of what the bug is.
-#### To Reproduce
+**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error
-#### Expected behavior
+**Expected behavior**
A clear and concise description of what you expected to happen.
-#### Screenshots
+**Screenshots**
If applicable, add screenshots to help explain your problem.
-#### Smartphone (please complete the following information):
+**Smartphone (please complete the following information):**
- Device: [e.g. Samsung S6]
- OS: [e.g. Android 6.0]
-#### Additional context
+**Additional context**
- App version and store [e.g. 1.0.0 - F-Droid]
- Homeserver: [e.g. matrix.org]
+**Upstream relevance**
+ - Does this issue exist in Element Android?
+ - If this issue exists in Element Android, please also link the corresponding bug report (create a new one if it doesn't exist yet)
+
Add any other context about the problem here.
diff --git a/upstream_.github/ISSUE_TEMPLATE/feature_request.md b/tmp_sc_.github/ISSUE_TEMPLATE/feature_request.md
similarity index 71%
rename from upstream_.github/ISSUE_TEMPLATE/feature_request.md
rename to tmp_sc_.github/ISSUE_TEMPLATE/feature_request.md
index da96d461c5..73c93186d7 100644
--- a/upstream_.github/ISSUE_TEMPLATE/feature_request.md
+++ b/tmp_sc_.github/ISSUE_TEMPLATE/feature_request.md
@@ -7,14 +7,14 @@ assignees: ''
---
-#### Is your feature request related to a problem? Please describe.
+**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-#### Describe the solution you'd like.
+**Describe the solution you'd like**
A clear and concise description of what you want to happen.
-#### Describe alternatives you've considered.
+**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.
-#### Additional context
+**Additional context**
Add any other context or screenshots about the feature request here.
diff --git a/tmp_sc_README.md b/tmp_sc_README.md
new file mode 100644
index 0000000000..62bec0cec1
--- /dev/null
+++ b/tmp_sc_README.md
@@ -0,0 +1,30 @@
+[![Translation status](https://weblate.bubu1.eu/widgets/schildichat/-/schildichat-android/svg-badge.svg)](https://weblate.bubu1.eu/projects/schildichat/schildichat-android/)
+[![SchildiChat-Android Matrix room #schildichat-android:matrix.org](https://img.shields.io/matrix/schildichat-android:matrix.org.svg?label=%23schildichat-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#schildichat-android:matrix.org)
+
+# SchildiChat for Android
+
+SchildiChat for Android is a Matrix Client based on [Element Android](https://github.com/vector-im/element-android).
+
+Compared to Element, SchildiChat features following most important changes:
+
+- A unified chat list for both direct and group chats
+- Optional message bubbles
+- Further usability improvements and additional settings to configure the app
+
+A more thorough list of changes compared to Element can be found [here](FEATURES.md) - but keep in mind this list might not be up-to-date at all times.
+
+
+
+
+Information about available app variants can be found [on our website](https://schildi.chat/android/).
+
+Join the discussion on matrix
+
+## Translations
+
+If you want to translate SchildiChat, visit its weblate [here](https://weblate.bubu1.eu/projects/schildichat/schildichat-android/).
+For translations that concern upstream Element code, visit their weblate [here](https://translate.element.io/engage/element-android/).
+
+## Screenshots
+
+
diff --git a/tmp_sc_fastlane/Appfile b/tmp_sc_fastlane/Appfile
new file mode 100644
index 0000000000..811e38d972
--- /dev/null
+++ b/tmp_sc_fastlane/Appfile
@@ -0,0 +1,2 @@
+json_key_file("../google-api-fastlane-release.json") # Path to the json secret file - Follow https://docs.fastlane.tools/actions/supply/#setup to get one
+package_name("de.spiritcroc.riotx") # e.g. com.krausefx.app
diff --git a/tmp_sc_fastlane/Fastfile b/tmp_sc_fastlane/Fastfile
new file mode 100644
index 0000000000..f655abd1e3
--- /dev/null
+++ b/tmp_sc_fastlane/Fastfile
@@ -0,0 +1,44 @@
+# This file contains the fastlane.tools configuration
+# You can find the documentation at https://docs.fastlane.tools
+#
+# For a list of all available actions, check out
+#
+# https://docs.fastlane.tools/actions
+#
+# For a list of all available plugins, check out
+#
+# https://docs.fastlane.tools/plugins/available-plugins
+#
+
+# Uncomment the line if you want fastlane to automatically update itself
+# update_fastlane
+
+default_platform(:android)
+
+platform :android do
+ keystore = ENV["keystore"]
+ keystore_pass = ENV["keystorepass"]
+ key_alias = ENV["keyalias"]
+ key_pass = ENV["keypass"]
+
+ desc "Runs all the tests"
+ lane :test do
+ gradle(task: "test")
+ end
+
+ desc "Deploy a new version to the Google Play"
+ lane :deploy do
+ gradle(
+ task: "clean assembleGplayRelease",
+ properties: {
+ "android.injected.signing.store.file": keystore,
+ "android.injected.signing.store.password": keystore_pass,
+ "android.injected.signing.key.alias": key_alias,
+ "android.injected.signing.key.password": key_pass
+ }
+ )
+ upload_to_play_store(
+ apk: lane_context[SharedValues::GRADLE_APK_OUTPUT_PATH]
+ )
+ end
+end
diff --git a/upstream_fastlane/README.md b/tmp_sc_fastlane/README.md
similarity index 70%
rename from upstream_fastlane/README.md
rename to tmp_sc_fastlane/README.md
index 54d3a005a6..8f1119a8b0 100644
--- a/upstream_fastlane/README.md
+++ b/tmp_sc_fastlane/README.md
@@ -21,29 +21,14 @@ or alternatively using `brew install fastlane`
fastlane android test
```
Runs all the tests
-### android beta
-```
-fastlane android beta
-```
-Submit a new Beta Build to Crashlytics Beta
### android deploy
```
fastlane android deploy
```
Deploy a new version to the Google Play
-### android deployMeta
-```
-fastlane android deployMeta
-```
-Deploy Google Play metadata
-### android getVersionCode
-```
-fastlane android getVersionCode
-```
-Get version code
----
-This README.md is auto-generated and will be re-generated every time [fastlane](https://fastlane.tools) is run.
+This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run.
More information about fastlane can be found on [fastlane.tools](https://fastlane.tools).
The documentation of fastlane can be found on [docs.fastlane.tools](https://docs.fastlane.tools).
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/full_description.txt b/tmp_sc_fastlane/metadata/android/de-DE/full_description.txt
new file mode 100644
index 0000000000..7b951d5cf8
--- /dev/null
+++ b/tmp_sc_fastlane/metadata/android/de-DE/full_description.txt
@@ -0,0 +1,12 @@
+SchildiChat ist ein Client für das Matrix-Protokoll und basiert auf der Element-Codebasis.
+Im Gegensatz zu vergleichbaren Anwendungen bietet SchildiChat eine klassischere Oberfläche, wie sie von anderen verbreiteten Messengern bekannt ist, ohne dabei auf die volle Funktionalität der Referenzimplementierung zu verzichten.
+
+Das Matrix-Protokoll ist ein dezentralisierter Ansatz für die moderne Nachrichtenübermittlung, und erlaubt hierbei Ende-zu-Ende-Verschlüsselung, einen gemeinsamen Verlauf über mehrere Geräte, und mehr.
+
+Verglichen mit der Element-Referenzanwendung bietet SchildiChat folgende Änderungen:
+- Eine gemeinsame Liste für Direkt-Chats und Gruppen
+- Optionale Nachrichtenblasen
+- Weitere Verbesserungen bezüglich der Benutzerfreundlichkeit und zusätzliche Einstellungen zur Konfiguration der App
+
+SchildiChat ist quelloffen: https://github.com/SchildiChat/SchildiChat-android
+Mehr Informationen zum Matrix-Protokoll: https://matrix.org/
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png b/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
similarity index 100%
rename from fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
rename to tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/1_de-DE.png
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png b/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
similarity index 100%
rename from fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
rename to tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/2_de-DE.png
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png b/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
similarity index 100%
rename from fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
rename to tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/3_de-DE.png
diff --git a/fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png b/tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
similarity index 100%
rename from fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
rename to tmp_sc_fastlane/metadata/android/de-DE/images/phoneScreenshots/4_de-DE.png
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/short_description.txt b/tmp_sc_fastlane/metadata/android/de-DE/short_description.txt
new file mode 100644
index 0000000000..7fff3c6358
--- /dev/null
+++ b/tmp_sc_fastlane/metadata/android/de-DE/short_description.txt
@@ -0,0 +1 @@
+Sicherer Messenger für Matrix mit gewohnter Nutzeroberfläche
diff --git a/tmp_sc_fastlane/metadata/android/de-DE/title.txt b/tmp_sc_fastlane/metadata/android/de-DE/title.txt
new file mode 100644
index 0000000000..e5e6b4db47
--- /dev/null
+++ b/tmp_sc_fastlane/metadata/android/de-DE/title.txt
@@ -0,0 +1 @@
+SchildiChat
diff --git a/fastlane/metadata/android/en-US/changelogs/40100250.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100250.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100250.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100250.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100270.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100270.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100270.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100270.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100290.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100290.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100290.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100290.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100300.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100300.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100300.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100300.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100310.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100310.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100310.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100310.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100330.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100330.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100330.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100330.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100340.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100340.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100340.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100340.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100350.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100350.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100350.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100350.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100360.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100360.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100360.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100360.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100370.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100370.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100370.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100370.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100390.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100390.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100390.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100390.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100410.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100410.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100410.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100410.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100420.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100420.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100420.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100420.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100430.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100430.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100430.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100430.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100440.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100440.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100440.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100440.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100450.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100450.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100450.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100450.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100470.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100470.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100470.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100470.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100480.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100480.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100480.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100480.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100500.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100500.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100500.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100500.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100510.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100510.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100510.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100510.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100530.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100530.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100530.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100530.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100560.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100560.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100560.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100560.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100580.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100580.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100580.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100580.txt
diff --git a/fastlane/metadata/android/en-US/changelogs/40100590.txt b/tmp_sc_fastlane/metadata/android/en-US/changelogs/40100590.txt
similarity index 100%
rename from fastlane/metadata/android/en-US/changelogs/40100590.txt
rename to tmp_sc_fastlane/metadata/android/en-US/changelogs/40100590.txt
diff --git a/tmp_sc_fastlane/metadata/android/en-US/full_description.txt b/tmp_sc_fastlane/metadata/android/en-US/full_description.txt
new file mode 100644
index 0000000000..a979272ea1
--- /dev/null
+++ b/tmp_sc_fastlane/metadata/android/en-US/full_description.txt
@@ -0,0 +1,12 @@
+SchildiChat is a client for the matrix protocol, based on the Element app.
+Compared to other clients, it provides a more classic instant messenger feel, while still providing the full functionality of the reference client.
+
+The matrix protocol is a decentralized approach to modern messaging, allowing for end-to-end encryption, shared message history across multiple devices, and more.
+
+Compared to the Element app, SchildiChat features following changes:
+- A unified chat list for both direct and group chats
+- Optional message bubbles
+- Further usability improvements and additional settings to configure the app
+
+SchildiChat is open source: https://github.com/SchildiChat/SchildiChat-android
+More information about the Matrix protocol: https://matrix.org/
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png b/tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png
new file mode 100644
index 0000000000..a20ece3fd5
Binary files /dev/null and b/tmp_sc_fastlane/metadata/android/en-US/images/featureGraphic.png differ
diff --git a/tmp_sc_fastlane/metadata/android/en-US/images/icon.png b/tmp_sc_fastlane/metadata/android/en-US/images/icon.png
new file mode 100644
index 0000000000..d0680e0eef
Binary files /dev/null and b/tmp_sc_fastlane/metadata/android/en-US/images/icon.png differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png b/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
rename to tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png b/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
rename to tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png b/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
rename to tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/3_en-US.png
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png b/tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
similarity index 100%
rename from fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
rename to tmp_sc_fastlane/metadata/android/en-US/images/phoneScreenshots/4_en-US.png
diff --git a/tmp_sc_fastlane/metadata/android/en-US/short_description.txt b/tmp_sc_fastlane/metadata/android/en-US/short_description.txt
new file mode 100644
index 0000000000..e4815121e8
--- /dev/null
+++ b/tmp_sc_fastlane/metadata/android/en-US/short_description.txt
@@ -0,0 +1 @@
+Secure messenger for Matrix with a traditional instant messaging experience
diff --git a/tmp_sc_fastlane/metadata/android/en-US/title.txt b/tmp_sc_fastlane/metadata/android/en-US/title.txt
new file mode 100644
index 0000000000..e5e6b4db47
--- /dev/null
+++ b/tmp_sc_fastlane/metadata/android/en-US/title.txt
@@ -0,0 +1 @@
+SchildiChat
diff --git a/fastlane/metadata/android/ru-RU/changelogs/40100250.txt b/tmp_sc_fastlane/metadata/android/ru-RU/changelogs/40100250.txt
similarity index 100%
rename from fastlane/metadata/android/ru-RU/changelogs/40100250.txt
rename to tmp_sc_fastlane/metadata/android/ru-RU/changelogs/40100250.txt
diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/full_description.txt b/tmp_sc_fastlane/metadata/android/ru-RU/full_description.txt
new file mode 100644
index 0000000000..fac6103b7d
--- /dev/null
+++ b/tmp_sc_fastlane/metadata/android/ru-RU/full_description.txt
@@ -0,0 +1,12 @@
+SchildiChat - это клиент для протокола Matrix, основанный на приложении Element.
+По сравнению с другими клиентами, он обеспечивает более классический вид обмена мгновенными сообщениями, при этом обеспечивая полную функциональность эталонного клиента.
+
+Протокол Matrix - это децентрализованный подход к современному обмену сообщениями, позволяющий осуществлять сквозное шифрование, совместно использовать историю сообщений на нескольких устройствах и многое другое.
+
+По сравнению с приложением Element, SchildiChat имеет следующие изменения:
+- Единый список чатов как для прямых, так и для групповых чатов
+- Опциональные пузыри сообщений
+- Дальнейшие улучшения удобства использования
+
+SchildiChat имеет открытый исходный код: https://github.com/SchildiChat/SchildiChat-android
+Подробнее о протоколе Matrix: https://matrix.org/
diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/short_description.txt b/tmp_sc_fastlane/metadata/android/ru-RU/short_description.txt
new file mode 100644
index 0000000000..17e475e511
--- /dev/null
+++ b/tmp_sc_fastlane/metadata/android/ru-RU/short_description.txt
@@ -0,0 +1 @@
+Безопасный мессенджер для Matrix с традиционным обменом мгновенными сообщениями
\ No newline at end of file
diff --git a/tmp_sc_fastlane/metadata/android/ru-RU/title.txt b/tmp_sc_fastlane/metadata/android/ru-RU/title.txt
new file mode 100644
index 0000000000..e5e6b4db47
--- /dev/null
+++ b/tmp_sc_fastlane/metadata/android/ru-RU/title.txt
@@ -0,0 +1 @@
+SchildiChat
diff --git a/tmp_sc_fastlane/report.xml b/tmp_sc_fastlane/report.xml
new file mode 100644
index 0000000000..bdca184943
--- /dev/null
+++ b/tmp_sc_fastlane/report.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/upstream_README.md b/upstream_README.md
deleted file mode 100644
index e89fb15010..0000000000
--- a/upstream_README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-[![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
-[![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
-[![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
-[![Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=alert_status)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
-[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
-[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=im.vector.app.android&metric=bugs)](https://sonarcloud.io/dashboard?id=im.vector.app.android)
-
-# Element Android
-
-Element Android is an Android Matrix Client provided by [Element](https://element.io/).
-
-It is a total rewrite of [Riot-Android](https://github.com/vector-im/riot-android) with a new user experience.
-
-[](https://play.google.com/store/apps/details?id=im.vector.app)
-[](https://f-droid.org/app/im.vector.app)
-
-Nightly build: [![Buildkite](https://badge.buildkite.com/ad0065c1b70f557cd3b1d3d68f9c2154010f83c4d6f71706a9.svg?branch=develop)](https://buildkite.com/matrix-dot-org/element-android/builds?branch=develop)
-
-# New Android SDK
-
-Element is based on a new Android SDK fully written in Kotlin (like Element). In order to make the early development as fast as possible, Element and the new SDK currently share the same git repository.
-
-At each Element release, the SDK module is copied to a dedicated repository: https://github.com/matrix-org/matrix-android-sdk2. That way, third party apps can add a regular gradle dependency to use it. So more details on how to do that here: https://github.com/matrix-org/matrix-android-sdk2.
-
-# Roadmap
-
-The version 1.0.0 of Element still misses some features which was previously included in Riot-Android.
-The team will work to add them on a regular basis.
-
-## Contributing
-
-Please refer to [CONTRIBUTING.md](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md) if you want to contribute on Matrix Android projects!
-
-Come chat with the community in the dedicated Matrix [room](https://matrix.to/#/#element-android:matrix.org).
diff --git a/upstream_fastlane/Appfile b/upstream_fastlane/Appfile
deleted file mode 100644
index 25273b0b09..0000000000
--- a/upstream_fastlane/Appfile
+++ /dev/null
@@ -1,2 +0,0 @@
-json_key_file("./fastlane/private/api-8525453667099313774-565354-aca0e6153603.json")
-package_name("im.vector.app")
diff --git a/upstream_fastlane/Fastfile b/upstream_fastlane/Fastfile
deleted file mode 100644
index 85e3d777ac..0000000000
--- a/upstream_fastlane/Fastfile
+++ /dev/null
@@ -1,60 +0,0 @@
-# This file contains the fastlane.tools configuration
-# You can find the documentation at https://docs.fastlane.tools
-#
-# For a list of all available actions, check out
-#
-# https://docs.fastlane.tools/actions
-#
-# For a list of all available plugins, check out
-#
-# https://docs.fastlane.tools/plugins/available-plugins
-#
-
-# Uncomment the line if you want fastlane to automatically update itself
-# update_fastlane
-
-default_platform(:android)
-
-platform :android do
- desc "Runs all the tests"
- lane :test do
- gradle(task: "test")
- end
-
- desc "Submit a new Beta Build to Crashlytics Beta"
- lane :beta do
- gradle(task: "clean assembleRelease")
- crashlytics
-
- # sh "your_script.sh"
- # You can also use other beta testing services here
- end
-
- desc "Deploy a new version to the Google Play"
- lane :deploy do
- gradle(task: "clean assembleRelease")
- upload_to_play_store
- end
-
- desc "Deploy Google Play metadata"
- lane :deployMeta do
- # Doc: https://docs.fastlane.tools/actions/upload_to_play_store/
- upload_to_play_store(
- skip_upload_apk: true,
- skip_upload_aab: true,
- skip_upload_images: true,
- skip_upload_screenshots: true,
- skip_upload_changelogs: true,
- # Set to true to not update the PlayStore
- validate_only: false
- )
- end
-
- desc "Get version code"
- lane :getVersionCode do
- versions = google_play_track_version_codes(track: "production")
- puts(versions)
- version_code = versions[0]
- puts(version_code)
- end
-end
diff --git a/upstream_fastlane/metadata/android/de-DE/full_description.txt b/upstream_fastlane/metadata/android/de-DE/full_description.txt
deleted file mode 100644
index 30eb153ee9..0000000000
--- a/upstream_fastlane/metadata/android/de-DE/full_description.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Element ist ein sicherer Messenger und ideal für die produktive Zusammenarbeit mit Ihrem Team im Homeoffice. Mit eingebauter Ende-zu-Ende-Verschlüsselung ermöglicht Element auch umfangreiche und sichere Videokonferenzen, das Teilen von Dateien, Sprachanrufe und vieles mehr.
-
-Element bietet folgende Funktionen:
-- Fortschrittliche Werkzeuge für die Online-Kommunikation
-- Vollständig verschlüsselte Nachrichten, um eine sichere Kommunikation innerhalb und außerhalb von Unternehmen zu ermöglichen
-- Dezentralisierte Chats, basierend auf dem quelloffenen Matrix-Protokoll
-- Sichere und kontrollierte Dateifreigabe durch verschlüsselte Daten beim Verwalten von Projekten
-- Videochats mit VoIP und Bildschirmübertragung
-- Einfache Einbindung in Ihre bevorzugten Online-Kollaborations- und Projektverwaltungswerkzeuge, VoIP-Dienste und andere Kommunikationsapps für Ihr Team
-
-Element unterscheidet sich grundlegend von anderen Kommunikations- und Kollaborationsapps. Es läuft auf Matrix, einem offenen Netzwerk für sichere und dezentralisierte Kommunikation. Es erlaubt Nutzern ihre eigene Infrastruktur zu betreiben und gibt ihnen damit vollständige Kontrolle und Besitz über ihre eigenen Daten und Nachrichten.
-
-Privatsphäre/Datenschutz und verschlüsselte Kommunikation
-Element schützt Sie vor unerwünschter Werbung, dem Datensammeln und geschlossenen Plattformen. Auch schützt es all Ihre Daten, Ihre Video- und Sprachkommunikation mittels Ende-zu-Ende-Verschlüsselung und durch das Quersignieren von Geräten zur Verifizierung.
-
-Element gibt Ihnen volle Kontrolle über Ihre Privatsphäre und ermöglicht es Ihnen zugleich, mit jedem im Matrix-Netzwerk sicher zu kommunizieren - oder auch auf anderen geschäftlichen Kollaborationswerkzeugen, zum Beispiel durch das Einbinden von Apps wie Slack.
-
-Element kann man selber betreiben
-Um mehr Kontrolle über Ihre sensiblen Daten und Konversationen zu ermöglichen, kann man Element selbst betreiben, oder Sie wählen irgendeinen Matrix-basierten Dienst - der Standard für quelloffene, dezentralisierte Kommunikation. Element gibt Ihnen Privatsphäre, Sicherheitskonformität und Flexibilität für Integrationen.
-
-Besitzen Sie Ihre Daten
-Sie entscheiden, wo Sie Ihre Daten und Nachrichten aufbewahren - ohne das Datensammeln oder den Zugriff Dritter zu riskieren.
-
-Element gibt Ihnen auf verschiedene Arten Kontrolle:
-1. Sie können sich kostenlos auf dem öffentlichen matrix.org-Server registrieren, der von den Matrix-Entwicklern gehostet wird, oder einen von Tausenden öffentlichen Servern, die von Freiwilligen betrieben werden, auswählen
-2. Sie haben die Möglichkeit, ein Konto auf einem eigenen Server in der eigenen IT-Infrastruktur betreiben
-3. Außerdem können Sie durch ein Abonnement der Element Matrix Services ein Konto auf einem für Sie maßgeschneiderten Server erstellen
-
-Offene Kommunikation und Zusammenarbeit
-Sie können mit jedem im Matrix-Netzwerk chatten, egal ob ihr Kontakt Element, eine andere Matrix-App oder sogar eine völlig andere Anwendung nutzt.
-
-Super sicher
-Durch Ende-zu-Ende-Verschlüsselung können nur die Personen, die in der Unterhaltung sind, die Nachrichten lesen. Außerdem stellt die Verifizierung mittels Quersignierung sicher, dass Sie wirklich mit dem Chatten, mit dem Sie glauben - und niemand Anderem.
-
-Vollständige Kommunikation und Integration
-Kurznachrichten, Sprach- und Videoanrufe, Dateifreigaben, Bildschirmübertragungen und einer Menge an Integrationen, Bots und Widgets. Schaffen Sie Räume und Communities, bleiben Sie auf dem Laufenden und erledigen Sie Sachen.
-
-Da Weitermachen, wo Sie aufgehört haben
-Bleiben Sie in Kontakt, egal wo Sie sind, mit vollständig synchronisiertem Nachrichtenverlauf quer über all Ihre Geräte und im Netz auf https://app.element.io
diff --git a/upstream_fastlane/metadata/android/de-DE/short_description.txt b/upstream_fastlane/metadata/android/de-DE/short_description.txt
deleted file mode 100644
index d27bd3ef12..0000000000
--- a/upstream_fastlane/metadata/android/de-DE/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Gruppen-Messenger - verschlüsselte Kommunikation, Gruppenchat und Videoanrufe
diff --git a/upstream_fastlane/metadata/android/de-DE/title.txt b/upstream_fastlane/metadata/android/de-DE/title.txt
deleted file mode 100644
index 6304f37925..0000000000
--- a/upstream_fastlane/metadata/android/de-DE/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Element - Sicherer Messenger
diff --git a/upstream_fastlane/metadata/android/en-US/full_description.txt b/upstream_fastlane/metadata/android/en-US/full_description.txt
deleted file mode 100644
index 853885944c..0000000000
--- a/upstream_fastlane/metadata/android/en-US/full_description.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-Element is both a secure messenger and a productivity team collaboration app that is ideal for group chats while remote working. This chat app uses end-to-end encryption to provide powerful video conferencing, file sharing and voice calls.
-
-Element’s features include:
-- Advanced online communication tools
-- Fully encrypted messages to allow safer corporate communication, even for remote workers
-- Decentralized chat based on the Matrix open source framework
-- File sharing securely with encrypted data while managing projects
-- Video chats with Voice over IP and screen sharing
-- Easy integration with your favourite online collaboration tools, project management tools, VoIP services and other team messaging apps
-
-Element is completely different from other messaging and collaboration apps. It operates on Matrix, an open network for secure messaging and decentralized communication. It allows self-hosting to give users maximum ownership and control of their data and messages.
-
-Privacy and encrypted messaging
-Element protects you from unwanted ads, data mining and walled gardens. It also secures all your data, one-to-one video and voice communication through end-to-end encryption and cross-signed device verification.
-
-Element gives you control over your privacy while allowing you to communicate securely with anyone on the Matrix network, or other business collaboration tools by integrating with apps such as Slack.
-
-Element can be self-hosted
-To allow more control of your sensitive data and conversations, Element can be self-hosted or you can choose any Matrix-based host - the standard for open source, decentralized communication. Element gives you privacy, security compliance and integration flexibility.
-
-Own your data
-You decide where to keep your data and messages. Without the risk of data mining or access from third parties.
-
-Element puts you in control in different ways:
-1. Get a free account on the matrix.org public server hosted by the Matrix developers, or choose from thousands of public servers hosted by volunteers
-2. Self-host your account by running a server on your own IT infrastructure
-3. Sign up for an account on a custom server by simply subscribing to the Element Matrix Services hosting platform
-
-Open messaging and collaboration
-You can chat with anyone on the Matrix network, whether they’re using Element, another Matrix app or even if they are using a different messaging app.
-
-Super secure
-Real end-to-end encryption (only those in the conversation can decrypt messages), and cross-signed device verification.
-
-Complete communication and integration
-Messaging, voice and video calls, file sharing, screen sharing and a whole bunch of integrations, bots and widgets. Build rooms, communities, stay in touch and get things done.
-
-Pick up where you left off
-Stay in touch wherever you are with fully synchronised message history across all your devices and on the web at https://app.element.io
\ No newline at end of file
diff --git a/upstream_fastlane/metadata/android/en-US/images/featureGraphic.png b/upstream_fastlane/metadata/android/en-US/images/featureGraphic.png
deleted file mode 100644
index 97f45aafd3..0000000000
Binary files a/upstream_fastlane/metadata/android/en-US/images/featureGraphic.png and /dev/null differ
diff --git a/upstream_fastlane/metadata/android/en-US/images/icon.png b/upstream_fastlane/metadata/android/en-US/images/icon.png
deleted file mode 100644
index e449d60ca9..0000000000
Binary files a/upstream_fastlane/metadata/android/en-US/images/icon.png and /dev/null differ
diff --git a/upstream_fastlane/metadata/android/en-US/short_description.txt b/upstream_fastlane/metadata/android/en-US/short_description.txt
deleted file mode 100644
index 5a98f6f772..0000000000
--- a/upstream_fastlane/metadata/android/en-US/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Group messenger - encrypted messaging, group chat and video calls
\ No newline at end of file
diff --git a/upstream_fastlane/metadata/android/en-US/title.txt b/upstream_fastlane/metadata/android/en-US/title.txt
deleted file mode 100644
index 12fa89b99b..0000000000
--- a/upstream_fastlane/metadata/android/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Element - Secure Messenger
\ No newline at end of file
diff --git a/upstream_fastlane/metadata/android/ru-RU/full_description.txt b/upstream_fastlane/metadata/android/ru-RU/full_description.txt
deleted file mode 100644
index 2ac7f9be54..0000000000
--- a/upstream_fastlane/metadata/android/ru-RU/full_description.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-Element - это новый тип приложения для обмена сообщениями и совместной работы, которое:
-
-1. Позволяет вам контролировать вашу конфиденциальность
-2. Позволяет общаться с кем угодно в сети Matrix и даже за ее пределами за счет интеграции с такими приложениями, как Slack
-3. Защищает вас от рекламы, данных и огороженных стеной садов
-4. Обеспечивает безопасность с помощью сквозного шифрования с перекрестной подписью для проверки других пользователей
-
-Element полностью отличается от других приложений для обмена сообщениями и совместной работы, потому что он децентрализован и имеет открытый исходный код.
-
-Element позволяет вам самостоятельно размещать или выбирать хост-узел, чтобы у вас была конфиденциальность, право собственности и контроль над своими данными и разговорами. Он предоставляет вам доступ к открытой сети, поэтому вы не ограничены общением исключительно с пользователями Element. И он очень надежен и безопаснен.
-
-Element может делать все это, потому что он работает на Matrix - стандарте открытого, децентрализованного общения.
-
-Element предоставляет вам полный контроль, позволяя выбрать поставщиков услуг, обслуживающих серверы с вашими беседами. Вы свободны выбрать любой способ размещения прямо из приложения Element:
-
-1. Получить бесплатную учетную запись на общедоступном сервере matrix.org, размещенном разработчиками Matrix, или выберите один из тысяч общедоступных серверов, размещенных волонтерами.
-2. Разместить свою учетную запись на собственном сервере
-3. Зарегистрироваться на индивидуальном сервере, просто подписавшись на услуги платформы Element Matrix Services
-
-Почему выбирают Element?
-
-СОБСТВЕННЫЕ ДАННЫЕ: Вы решаете, где хранить свои данные и сообщения. Вы владеете ими и контролируете их, а не какая-то мегакорпорация, что собирает ваши данные и предоставляет сторонним лицам доступ к ним.
-
-ОТКРЫТОЕ ОБЩЕНИЕ И СОТРУДНИЧЕСТВО: Вы можете общаться с кем угодно в сети Matrix, независимо от того, используют ли они приложение Element или другое приложение Matrix, и даже если они используют другую систему обмена сообщениями, такую как Slack, IRC или XMPP.
-
-СУПЕР-БЕЗОПАСНОСТЬ: Настоящее сквозное шифрование (только участники разговора могут расшифровывать сообщения) и перекрестная подпись для проверки устройств участников разговора.
-
-ПОЛНАЯ КОММУНИКАЦИЯ: Обмен сообщениями, голосовые и видеозвонки, совместное использование файлов, совместное использование экрана и целый ряд интеграций, ботов и виджетов. Создавайте комнаты, сообщества, оставайтесь на связи и добивайтесь результатов.
-
-ВЫ ВЕЗДЕ: Оставайтесь на связи, где бы вы ни находились, благодаря полностью синхронизированной истории сообщений на всех ваших устройствах и в Интернете по адресу https://app.element.io.
diff --git a/upstream_fastlane/metadata/android/ru-RU/short_description.txt b/upstream_fastlane/metadata/android/ru-RU/short_description.txt
deleted file mode 100644
index 64452ed22d..0000000000
--- a/upstream_fastlane/metadata/android/ru-RU/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Защищённый децентрализованный чат и звонки. Держите ваши данные в безопасности.
diff --git a/upstream_fastlane/metadata/android/ru-RU/title.txt b/upstream_fastlane/metadata/android/ru-RU/title.txt
deleted file mode 100644
index 00e488e69f..0000000000
--- a/upstream_fastlane/metadata/android/ru-RU/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Element (ранее Riot.im)