merge-upstream-5.0.1 #66

Merged
778a69cd merged 80 commits from merge-upstream-5.0.1 into main 2024-12-26 12:55:41 +01:00
3 changed files with 11 additions and 7 deletions
Showing only changes of commit 5b5f295dc3 - Show all commits

View file

@ -124,9 +124,13 @@
<!-- Less than 10 seats left --> <!-- Less than 10 seats left -->
<span class="has-text-danger" v-if="lastSeatsLeft"> <span class="has-text-danger" v-if="lastSeatsLeft">
{{ {{
t("{number} seats left", { t(
number: seatsLeft, "{number} seats left",
}) {
number: seatsLeft,
},
seatsLeft ?? 0
)
}} }}
</span> </span>
<span <span

View file

@ -414,7 +414,7 @@
"Due on": "Due on", "Due on": "Due on",
"Organizers": "Organizers", "Organizers": "Organizers",
"(Masked)": "(Masked)", "(Masked)": "(Masked)",
"{available}/{capacity} available places": "No places left|{available}/{capacity} available places", "{available}/{capacity} available places": "No places left|{available}/{capacity} available place left|{available}/{capacity} available places",
"No one is participating|One person participating|{going} people participating": "No one is participating|One person participating|{going} people participating", "No one is participating|One person participating|{going} people participating": "No one is participating|One person participating|{going} people participating",
"Date and time": "Date and time", "Date and time": "Date and time",
"Location": "Location", "Location": "Location",
@ -1218,7 +1218,7 @@
"You will receive notifications about this group's public activity depending on %{notification_settings}.": "You will receive notifications about this group's public activity depending on %{notification_settings}.", "You will receive notifications about this group's public activity depending on %{notification_settings}.": "You will receive notifications about this group's public activity depending on %{notification_settings}.",
"Online": "Online", "Online": "Online",
"That you follow or of which you are a member": "That you follow or of which you are a member", "That you follow or of which you are a member": "That you follow or of which you are a member",
"{number} seats left": "{number} seats left", "{number} seats left": "No seat left|One seat left|{number} seats left",
"Published by {name}": "Published by {name}", "Published by {name}": "Published by {name}",
"Share this post": "Share this post", "Share this post": "Share this post",
"This post is accessible only through it's link. Be careful where you post this link.": "This post is accessible only through it's link. Be careful where you post this link.", "This post is accessible only through it's link. Be careful where you post this link.": "This post is accessible only through it's link. Be careful where you post this link.",

View file

@ -1562,7 +1562,7 @@
"{'@'}{username}": "{'@'}{username}", "{'@'}{username}": "{'@'}{username}",
"{'@'}{username} ({role})": "{'@'}{username} ({role})", "{'@'}{username} ({role})": "{'@'}{username} ({role})",
"{approved} / {total} seats": "{approved} / {total} places", "{approved} / {total} seats": "{approved} / {total} places",
"{available}/{capacity} available places": "Pas de places restantes|{available}/{capacity} places restantes|{available}/{capacity} places restantes", "{available}/{capacity} available places": "Pas de places restantes|{available}/{capacity} place restante|{available}/{capacity} places restantes",
"{count} events": "{count} événements", "{count} events": "{count} événements",
"{count} km": "{count} km", "{count} km": "{count} km",
"{count} members": "Aucun membre|Un·e membre|{count} membres", "{count} members": "Aucun membre|Un·e membre|{count} membres",
@ -1608,7 +1608,7 @@
"{number} organized events": "Aucun événement organisé|Un événement organisé|{number} événements organisés", "{number} organized events": "Aucun événement organisé|Un événement organisé|{number} événements organisés",
"{number} participations": "Aucune participation|Une participation|{number} participations", "{number} participations": "Aucune participation|Une participation|{number} participations",
"{number} posts": "Aucun billet|Un billet|{number} billets", "{number} posts": "Aucun billet|Un billet|{number} billets",
"{number} seats left": "{number} places restantes", "{number} seats left": "Aucune place restante|Une place restante|{number} places restantes",
"{old_group_name} was renamed to {group}.": "{old_group_name} a été renommé en {group}.", "{old_group_name} was renamed to {group}.": "{old_group_name} a été renommé en {group}.",
"{profileName} (suspended)": "{profileName} (suspendu·e)", "{profileName} (suspended)": "{profileName} (suspendu·e)",
"{profile} (by default)": "{profile} (par défault)", "{profile} (by default)": "{profile} (par défault)",