Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feat/disable-legal…
Browse files Browse the repository at this point in the history
…-hold

# Conflicts:
#	kalium
  • Loading branch information
saleniuk committed Dec 13, 2023
2 parents 0e4ef59 + c5b8aa5 commit 67ed394
Show file tree
Hide file tree
Showing 42 changed files with 50 additions and 51 deletions.
2 changes: 1 addition & 1 deletion app/src/main/res/values-af/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ar/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-bn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ca/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-da/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">BENUTZERNAME</string>
<string name="create_account_username_text">Geben Sie Ihren Benutzernamen ein. Andere können Sie so leichter in Wire finden und sich mit Ihnen verbinden.</string>
<string name="create_account_username_taken_error">Dieser Benutzername ist bereits vergeben. Bitte wählen Sie einen anderen.</string>
<string name="create_account_username_description">Mindestens 2 Zeichen, az, 09, und _</string>
<string name="create_account_username_description">Mindestens 2 Zeichen, a-z, 0-9, “_”, “-” und “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">VERPASSTE ANRUFE</string>
<string name="calls_label_calls_history">ANRUFLISTE</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-el/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-es/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ Un mensaje eliminado no puede ser restaurado.</string>
<string name="create_account_username_label">NOMBRE DE USUARIO</string>
<string name="create_account_username_text">Introduce tu nombre de usuario. Ayuda a otros a encontrarte en Wire y conectarse contigo.</string>
<string name="create_account_username_taken_error">Este nombre de usuario ya est&#225; registrado. Por favor, elije otro.</string>
<string name="create_account_username_description">Al menos 2 caracteres, a-z, 0-9 y _</string>
<string name="create_account_username_description">Al menos 2 caracteres, a-z, 0-9 “_”, “-” y “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">LLAMADAS PERDIDAS</string>
<string name="calls_label_calls_history">HISTORIAL DE LLAMADAS</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-et/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">KASUTAJANIMI</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-he/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-hi/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-hr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@
<string name="create_account_username_label">KORISNIČKO IME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">PROPUŠTENI POZIVI</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">FELHASZNÁLÓNÉV</string>
<string name="create_account_username_text">Adja meg felhasználónevét. Ez segít másoknak megtalálni Önt a Wire-ön, és kapcsolatba lépni Önnel.</string>
<string name="create_account_username_taken_error">Ez a Felhasználónév már foglalt. Kérjük, válasszon egy másikat.</string>
<string name="create_account_username_description">Legalább 2 karakter, és kizárólag a—z, 0—9 és _ karakterek</string>
<string name="create_account_username_description">Legalább 2 karakter, és kizárólag a—z, 0—9 “_”, “-” és “.” karakterek</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">NEM FOGADOTT HÍVÁSOK</string>
<string name="calls_label_calls_history">HÍVÁSNAPLÓ</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-id/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ Un messaggio eliminato non pu&#242; essere ripristinato.</string>
<string name="create_account_username_label">NOME UTENTE</string>
<string name="create_account_username_text">Inserisci il tuo nome utente. Aiuta gli altri a trovarti su Wire e connettersi con te.</string>
<string name="create_account_username_taken_error">Questo nome utente &#232; gi&#224; in uso. Scegline un altro, per favore.</string>
<string name="create_account_username_description">Almeno 2 caratteri, a-z, 0-9 e _</string>
<string name="create_account_username_description">Almeno 2 caratteri, a-z, 0-9 “_”, “-” e “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">CHIAMATE PERSE</string>
<string name="calls_label_calls_history">CRONOLOGIA DELLE CHIAMATE</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ja/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ko/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-lt/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-mk/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-nl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-no/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-pa/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
<string name="create_account_username_label">USERNAME</string>
<string name="create_account_username_text">Enter your username. It helps others to find you in Wire and connect with you.</string>
<string name="create_account_username_taken_error">This username is already taken. Please choose another one.</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9 and _</string>
<string name="create_account_username_description">At least 2 characters, a-z, 0-9, “_”, “-” and “.”</string>
<!-- Conversations -->
<string name="calls_label_missed_calls">MISSED CALLS</string>
<string name="calls_label_calls_history">CALL HISTORY</string>
Expand Down
Loading

0 comments on commit 67ed394

Please sign in to comment.