Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update warning location wording #1057

Merged
merged 4 commits into from
May 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/1057.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Changement du texte d'alerte affiché lors de la première utilisation du partage de position en temps réel.
2 changes: 1 addition & 1 deletion library/ui-strings/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2492,7 +2492,7 @@
<string name="time_unit_minute_short">min</string>
<string name="time_unit_hour_short">h</string>
<string name="live_location_labs_promotion_switch_title">Activer le partage de localisation</string>
<string name="live_location_labs_promotion_description">Attention : c\'est une fonctionnalité expérimentale qui utilise une implémentation temporaire. Cela implique que vous ne pourrez pas supprimer votre historique de positions, et les utilisateurs avancés pourront voir votre historique de positions même après avoir arrêter le partage de votre position en continu dans ce salon.</string>
<string name="live_location_labs_promotion_description">Attention : l’historique des positions partagées sera accessible aux autres membres du salon même après avoir arrêté le partage.</string> <!-- Tchap: Custom string -->
<string name="live_location_labs_promotion_title">Partage de position en continu</string>
<string name="settings_troubleshoot_test_current_gateway">Passerelle actuelle : %s</string>
<string name="settings_troubleshoot_test_current_gateway_title">Passerelle</string>
Expand Down
2 changes: 1 addition & 1 deletion towncrier.toml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tool.towncrier]
version = "2.11.5"
version = "2.11.6"
directory = "changelog.d"
filename = "TCHAP_CHANGES.md"
name = "Changes in Tchap"
Expand Down
2 changes: 1 addition & 1 deletion vector-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ ext.versionMinor = 11
// Note: even values are reserved for regular release, odd values for hotfix release.
// When creating a hotfix, you should decrease the value, since the current value
// is the value for the next regular release.
ext.versionPatch = 5
ext.versionPatch = 6

static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
Expand Down
Loading