Copione merged onto master

2020-07-12 00:01:16 +02:00 · 2020-07-12 00:01:16 +02:00 · 0172418677
parent 5ce105974e 8f0f600b6b
commit 0172418677
32 changed files with 258 additions and 210 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -80,8 +80,8 @@ protobuf {
    }
 }

-def canonicalVersionCode = 670
-def canonicalVersionName = "4.66.2"
+def canonicalVersionCode = 671
+def canonicalVersionName = "4.66.3"

 def postFixSize = 10
 def abiPostFix = ['universal'   : 0,
--- a/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/PassphraseRequiredActivity.java
@ -164,7 +164,7 @@ public abstract class PassphraseRequiredActivity extends BaseActivity implements
  }

  private boolean userMustCreateSignalPin() {
-    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.kbsValues().hasPin() && !SignalStore.kbsValues().lastPinCreateFailed();
+    return !SignalStore.registrationValues().isRegistrationComplete() && !SignalStore.kbsValues().hasPin() && !SignalStore.kbsValues().lastPinCreateFailed() && !SignalStore.kbsValues().hasOptedOut();
  }

  private boolean userMustSetProfileName() {
--- a/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/keyvalue/KbsValues.java
@ -62,6 +62,7 @@ public final class KbsValues extends SignalStoreValues {
              .putString(LOCK_LOCAL_PIN_HASH, PinHashing.localPinHash(pin))
              .putString(PIN, pin)
              .putLong(LAST_CREATE_FAILED_TIMESTAMP, -1)
+              .putBoolean(OPTED_OUT, false)
              .commit();
  }

@ -144,27 +145,16 @@ public final class KbsValues extends SignalStoreValues {
    return getLocalPinHash() != null;
  }

-  /**
-   * Should only be called by {@link org.thoughtcrime.securesms.pin.PinState}.
-   */
-  public synchronized void optIn() {
-    putBoolean(OPTED_OUT, false);
-  }
-
-  /**
-   * Should only be called by {@link org.thoughtcrime.securesms.pin.PinState}.
-   */
+  /** Should only be called by {@link org.thoughtcrime.securesms.pin.PinState}. */
  public synchronized void optOut() {
-    putBoolean(OPTED_OUT, true);
-  }
-
-  /**
-   * Should only be called by {@link org.thoughtcrime.securesms.pin.PinState}.
-   */
-  public synchronized void resetMasterKey() {
    getStore().beginWrite()
-              .remove(MASTER_KEY)
-              .apply();
+              .putBoolean(OPTED_OUT, true)
+              .remove(TOKEN_RESPONSE)
+              .putBlob(MASTER_KEY, MasterKey.createNew(new SecureRandom()).serialize())
+              .remove(LOCK_LOCAL_PIN_HASH)
+              .remove(PIN)
+              .putLong(LAST_CREATE_FAILED_TIMESTAMP, -1)
+              .commit();
  }

  public synchronized boolean hasOptedOut() {
--- a/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/lock/v2/BaseKbsPinFragment.java
@ -100,7 +100,8 @@ abstract class BaseKbsPinFragment<ViewModel extends BaseKbsPinViewModel> extends
  @Override
  public void onPrepareOptionsMenu(@NonNull Menu menu) {
    if (RegistrationLockUtil.userHasRegistrationLock(requireContext()) ||
-        SignalStore.kbsValues().hasPin())
+        SignalStore.kbsValues().hasPin()                               ||
+        SignalStore.kbsValues().hasOptedOut())
    {
      menu.clear();
    }
--- a/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionPin.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/logsubmit/LogSectionPin.java
@ -22,6 +22,7 @@ public class LogSectionPin implements LogSection {
                              .append("ReglockV1: ").append(TextSecurePreferences.isV1RegistrationLockEnabled(context)).append("\n")
                              .append("ReglockV2: ").append(SignalStore.kbsValues().isV2RegistrationLockEnabled()).append("\n")
                              .append("Signal PIN: ").append(SignalStore.kbsValues().hasPin()).append("\n")
+                              .append("Opted Out: ").append(SignalStore.kbsValues().hasOptedOut()).append("\n")
                              .append("Last Creation Failed: ").append(SignalStore.kbsValues().lastPinCreateFailed()).append("\n")
                              .append("Needs Account Restore: ").append(SignalStore.storageServiceValues().needsAccountRestore()).append("\n")
                              .append("PIN Required at Registration: ").append(SignalStore.registrationValues().pinWasRequiredAtRegistration()).append("\n")
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinOptOutDialog.java
@ -34,30 +34,25 @@ public final class PinOptOutDialog {
  }

  private static void show(@NonNull Context context,
-                           boolean skip,
+                           boolean isForSkip,
                           @NonNull Runnable onSuccess,
                           @NonNull Runnable onFailed)
  {
    AlertDialog dialog = new AlertDialog.Builder(context)
                                        .setTitle(R.string.PinOptOutDialog_warning)
-                                        .setMessage(R.string.PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin)
+                                        .setMessage(R.string.PinOptOutDialog_if_you_disable_the_pin_you_will_lose_all_data)
                                        .setCancelable(true)
                                        .setPositiveButton(R.string.PinOptOutDialog_disable_pin, (d, which) -> {
                                          d.dismiss();
                                          AlertDialog progress = SimpleProgressDialog.show(context);

                                          SimpleTask.run(() -> {
-                                            try {
-                                              if (skip) {
-                                                PinState.onPinCreationSkipped(context);
-                                              } else {
-                                                PinState.onPinOptOut(context);
-                                              }
-                                              return true;
-                                            } catch (IOException | UnauthenticatedResponseException e) {
-                                              Log.w(TAG, e);
-                                              return false;
+                                            if (isForSkip) {
+                                              PinState.onPinCreationSkipped();
+                                            } else {
+                                              PinState.onPinOptOut();
                                            }
+                                            return true;
                                          }, success -> {
                                            if (success) {
                                              onSuccess.run();
--- a/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/pin/PinState.java
@ -18,9 +18,7 @@ import org.thoughtcrime.securesms.lock.v2.PinKeyboardType;
 import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.megaphone.Megaphones;
 import org.thoughtcrime.securesms.registration.service.KeyBackupSystemWrongPinException;
-import org.thoughtcrime.securesms.util.Hex;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.guava.Optional;
 import org.whispersystems.signalservice.api.KbsPinData;
 import org.whispersystems.signalservice.api.KeyBackupService;
@ -32,6 +30,7 @@ import org.whispersystems.signalservice.internal.contacts.crypto.Unauthenticated
 import org.whispersystems.signalservice.internal.contacts.entities.TokenResponse;

 import java.io.IOException;
+import java.security.SecureRandom;
 import java.util.Arrays;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
@ -156,10 +155,19 @@ public final class PinState {
  {
    Log.i(TAG, "onPinChangedOrCreated()");

-    boolean isFirstPin = !SignalStore.kbsValues().hasPin() || SignalStore.kbsValues().hasOptedOut();
+    KbsValues                         kbsValues        = SignalStore.kbsValues();
+    boolean                           isFirstPin       = !kbsValues.hasPin() || kbsValues.hasOptedOut();
+    MasterKey                         masterKey        = kbsValues.getOrCreateMasterKey();
+    KeyBackupService                  keyBackupService = ApplicationDependencies.getKeyBackupService();
+    KeyBackupService.PinChangeSession pinChangeSession = keyBackupService.newPinChangeSession();
+    HashedPin                         hashedPin        = PinHashing.hashPin(pin, pinChangeSession);
+    KbsPinData                        kbsData          = pinChangeSession.setPin(hashedPin, masterKey);

-    setPin(context, pin, keyboard);
-    SignalStore.kbsValues().optIn();
+    kbsValues.setKbsMasterKey(kbsData, pin);
+    TextSecurePreferences.clearRegistrationLockV1(context);
+    SignalStore.pinValues().setKeyboardType(keyboard);
+    SignalStore.pinValues().resetPinReminders();
+    ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.PINS_FOR_ALL);

    if (isFirstPin) {
      Log.i(TAG, "First time setting a PIN. Refreshing attributes to set the 'storage' capability.");
@ -185,13 +193,11 @@ public final class PinState {
   * Invoked when the user has enabled the "PIN opt out" setting.
   */
  @WorkerThread
-  public static synchronized void onPinOptOut(@NonNull Context context)
-    throws IOException, UnauthenticatedResponseException
-  {
+  public static synchronized void onPinOptOut() {
    Log.i(TAG, "onPinOptOutEnabled()");
    assertState(State.PIN_WITH_REGISTRATION_LOCK_DISABLED, State.NO_REGISTRATION_LOCK);

-    optOutOfPin(context);
+    optOutOfPin();

    updateState(buildInferredStateFromOtherFields());
  }
@ -200,13 +206,11 @@ public final class PinState {
   * Invoked when the user has chosen to skip PIN creation.
   */
  @WorkerThread
-  public static synchronized void onPinCreationSkipped(@NonNull Context context)
-    throws IOException, UnauthenticatedResponseException
-  {
+  public static synchronized void onPinCreationSkipped() {
    Log.i(TAG, "onPinCreationSkipped()");
    assertState(State.NO_REGISTRATION_LOCK);

-    optOutOfPin(context);
+    optOutOfPin();

    updateState(buildInferredStateFromOtherFields());
  }
@ -295,6 +299,20 @@ public final class PinState {
    }
  }

+  @WorkerThread
+  private static void bestEffortForcePushStorage() {
+    Optional<JobTracker.JobState> result = ApplicationDependencies.getJobManager().runSynchronously(new StorageForcePushJob(), TimeUnit.SECONDS.toMillis(10));
+
+    if (result.isPresent() && result.get() == JobTracker.JobState.SUCCESS) {
+      Log.i(TAG, "Storage was force-pushed successfully.");
+    } else if (result.isPresent()) {
+      Log.w(TAG, "Storage force-pushed finished, but was not successful. Enqueuing one for later. (Result: " + result.get() + ")");
+      ApplicationDependencies.getJobManager().add(new RefreshAttributesJob());
+    } else {
+      Log.w(TAG, "Storage fore push did not finish in the allotted time. It'll finish later.");
+    }
+  }
+
  @WorkerThread
  private static void resetPinRetryCount(@NonNull Context context, @Nullable String pin, @NonNull KbsPinData kbsData) {
    if (pin == null) {
@ -322,34 +340,13 @@ public final class PinState {
  }

  @WorkerThread
-  private static void setPin(@NonNull Context context, @NonNull String pin, @NonNull PinKeyboardType keyboard)
-      throws IOException, UnauthenticatedResponseException
-  {
-    KbsValues                         kbsValues        = SignalStore.kbsValues();
-    MasterKey                         masterKey        = kbsValues.getOrCreateMasterKey();
-    KeyBackupService                  keyBackupService = ApplicationDependencies.getKeyBackupService();
-    KeyBackupService.PinChangeSession pinChangeSession = keyBackupService.newPinChangeSession();
-    HashedPin                         hashedPin        = PinHashing.hashPin(pin, pinChangeSession);
-    KbsPinData                        kbsData          = pinChangeSession.setPin(hashedPin, masterKey);
-
-    kbsValues.setKbsMasterKey(kbsData, pin);
-    TextSecurePreferences.clearRegistrationLockV1(context);
-    SignalStore.pinValues().setKeyboardType(keyboard);
-    SignalStore.pinValues().resetPinReminders();
-    ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.PINS_FOR_ALL);
-  }
-
-  @WorkerThread
-  private static void optOutOfPin(@NonNull Context context)
-      throws IOException, UnauthenticatedResponseException
-  {
-    SignalStore.kbsValues().resetMasterKey();
-
-    setPin(context, Hex.toStringCondensed(Util.getSecretBytes(32)), PinKeyboardType.ALPHA_NUMERIC);
+  private static void optOutOfPin() {
    SignalStore.kbsValues().optOut();

-    ApplicationDependencies.getJobManager().add(new StorageForcePushJob());
+    ApplicationDependencies.getMegaphoneRepository().markFinished(Megaphones.Event.PINS_FOR_ALL);
+
    bestEffortRefreshAttributes();
+    bestEffortForcePushStorage();
  }

  private static @NonNull State assertState(State... allowed) {
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@ -860,10 +860,7 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Kreiraj novi PIN</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Upozorenje</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Ako propustite kreirati PIN, za Vaš će se račun kreirati skriveni bespovratni PIN visoke entropije. Kada se ponovo registrujete na Signal, svi Vaši podaci bit će izbrisani izuzev ako ručno kreirate rezervnu kopiju i koristite je za povrat podataka. Nećete moći aktivirati zaključavanje registracije dok god je PIN isključen.</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skip_pin_creation">Preskoči kreiranje PIN-a</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disable_pin_title">Isključiti PIN?</string> -->
-  <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Ako isključite PIN, za Vaš će se račun kreirati skriveni bespovratni PIN visoke entropije. Kada se ponovo registrujete na Signal, svi Vaši podaci bit će izbrisani izuzev ako ručno kreirate rezervnu kopiju i koristite je za povrat podataka. Nećete moći aktivirati zaključavanje registracije dok god je PIN isključen.</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Ako isključite PIN, za Vaš će se račun kreirati skriveni bespovratni PIN visoke entropije. Kada se ponovo registrujete na Signal, svi Vaši podaci bit će izbrisani izuzev ako ručno kreirate rezervnu kopiju i koristite je za povrat podataka. Nećete moći aktivirati zaključavanje registracije dok god je PIN isključen.</string> -->
  <string name="PinOptOutDialog_disable_pin">Isključi PIN</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Ocijenite ovu aplikaciju</string>
@ -1666,7 +1663,7 @@
  <string name="preferences__theme">Tema</string>
  <string name="preferences__disable_pin">Isključi PIN</string>
  <string name="preferences__enable_pin">Uključi PIN</string>
-  <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Ako isključite PIN, za Vaš će se račun kreirati skriveni bespovratni PIN visoke entropije. Kada se ponovo registrujete na Signal, svi Vaši podaci bit će izbrisani izuzev ako ručno kreirate rezervnu kopiju i koristite je za povrat podataka. Nećete moći aktivirati zaključavanje registracije dok god je PIN isključen.</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Ako isključite PIN, za Vaš će se račun kreirati skriveni bespovratni PIN visoke entropije. Kada se ponovo registrujete na Signal, svi Vaši podaci bit će izbrisani izuzev ako ručno kreirate rezervnu kopiju i koristite je za povrat podataka. Nećete moći aktivirati zaključavanje registracije dok god je PIN isključen.</string> -->
  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">PIN služi za šifriranje informacija na Signalu tako da im samo Vi možete pristupiti. Vaš profil, podešavanja i kontakti bit će sačuvani i učitani kad ponovo instalirate Signal. PIN Vam neće trebati da otvorite aplikaciju.</string>
  <string name="preferences__system_default">Sistemske postavke</string>
  <string name="preferences__default">Standardno</string>
@ -1900,7 +1897,7 @@
  <string name="KbsSplashFragment__update_pin">Ažurirajte PIN</string>
  <string name="KbsSplashFragment__create_your_pin">Kreirajte svoj PIN</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Saznajte više o PIN-ovima</string>
-  <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__skip_pin_creation">Preskoči kreiranje PIN-a</string> -->
+  <string name="KbsSplashFragment__disable_pin">Isključi PIN</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Unesite svoj Signal PIN</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Kako bismo Vam pomogli da upamtite svoj PIN, povremeno ćemo od Vas tražiti da ga ponovo unesete. Vremenom ćemo Vas rjeđe podsjećati.</string>
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@ -821,10 +821,7 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Crea un PIN nou</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Advertiment</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Ometre la creació del PIN crearà un PIN ocult i d’alta entropia associat al compte que no es podrà recuperar. Quan torneu a registrar el Signal, perdreu totes les dades tret que en feu una còpia de seguretat i una restauració manual. No podeu activar el bloqueig de registre mentre el PIN estigui desactivat.</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skip_pin_creation">Omet la creació del PIN</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disable_pin_title">Desactivo el PIN?</string> -->
-  <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Desactivar la creació del PIN crearà un PIN ocult i d’alta entropia associat al compte que no es podrà recuperar. Quan torneu a registrar el Signal, perdreu totes les dades tret que en feu una còpia de seguretat i una restauració manual. No podeu activar el bloqueig de registre mentre el PIN estigui desactivat.</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Desactivar la creació del PIN crearà un PIN ocult i d’alta entropia associat al compte que no es podrà recuperar. Quan torneu a registrar el Signal, perdreu totes les dades tret que en feu una còpia de seguretat i una restauració manual. No podeu activar el bloqueig de registre mentre el PIN estigui desactivat.</string> -->
  <string name="PinOptOutDialog_disable_pin">Desactiva el PIN</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Valoreu l\'aplicació</string>
@ -1611,7 +1608,7 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
  <string name="preferences__theme">Tema</string>
  <string name="preferences__disable_pin">Desactiva el PIN</string>
  <string name="preferences__enable_pin">Activa el PIN</string>
-  <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Desactivar la creació del PIN crearà un PIN ocult i d’alta entropia associat al compte que no es podrà recuperar. Quan torneu a registrar el Signal, perdreu totes les dades tret que en feu una còpia de seguretat i una restauració manual. No podeu activar el bloqueig de registre mentre el PIN estigui desactivat.</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Desactivar la creació del PIN crearà un PIN ocult i d’alta entropia associat al compte que no es podrà recuperar. Quan torneu a registrar el Signal, perdreu totes les dades tret que en feu una còpia de seguretat i una restauració manual. No podeu activar el bloqueig de registre mentre el PIN estigui desactivat.</string> -->
  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">Els PIN mantenen encriptada la informació desada amb el Signal de manera que no hi pugui accedir ningú més. El perfil, la configuració i els contactes es restauraran quan el reinstal·leu. No necessitareu el PIN per obrir l\'aplicació.</string>
  <string name="preferences__system_default">Per defecte del sistema</string>
  <string name="preferences__default">Per defecte</string>
@ -1842,7 +1839,7 @@ S\'ha rebut un missatge d\'intercanvi de claus per a una versió del protocol no
  <string name="KbsSplashFragment__update_pin">Actualitza el PIN</string>
  <string name="KbsSplashFragment__create_your_pin">Creeu el PIN</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Apreneu més coses sobre els PIN</string>
-  <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__skip_pin_creation">Omet la creació del PIN</string> -->
+  <string name="KbsSplashFragment__disable_pin">Desactiva el PIN</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Marqueu el PIN del Signal</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Per ajudar-vos a recordar el PIN, us el demanarem periòdicament. Amb el temps, ho farem menys.</string>
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@ -897,10 +897,7 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Vytvořit nový PIN?</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Varování</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Pokud přeskočíte vytvoření PIN, bude vytvořen skrytý PIN s vysokou entropií, který bude přiřazen k vašemu účtu, jenž je neobnovitelný. Když se pak znovu zaregistrujete u Signalu, budou veškerá vaše data ztracena, pokud si je ručně nezálohujete a neobnovíte. Když je PIN deaktivován, nelze zapnout zámek registrace.</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skip_pin_creation">Přeskočit vytvoření PIN</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disable_pin_title">Deaktivovat PIN?</string> -->
-  <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Deaktivace PIN vytvoří skrytý PIN s vysokou entropií, který bude přiřazen k vašemu účtu, jenž je neobnovitelný. Když se pak znovu zaregistrujete u Signalu, budou veškerá vaše data ztracena, pokud si je ručně nezálohujete a neobnovíte. Když je PIN deaktivován, nelze zapnout zámek registrace.</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Deaktivace PIN vytvoří skrytý PIN s vysokou entropií, který bude přiřazen k vašemu účtu, jenž je neobnovitelný. Když se pak znovu zaregistrujete u Signalu, budou veškerá vaše data ztracena, pokud si je ručně nezálohujete a neobnovíte. Když je PIN deaktivován, nelze zapnout zámek registrace.</string> -->
  <string name="PinOptOutDialog_disable_pin">Deaktivovat PIN</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Ohodnotit tuto aplikaci</string>
@ -1714,7 +1711,7 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.
  <string name="preferences__theme">Motiv</string>
  <string name="preferences__disable_pin">Deaktivovat PIN</string>
  <string name="preferences__enable_pin">Povolit PIN</string>
-  <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Deaktivace PIN vytvoří skrytý PIN s vysokou entropií, který bude přiřazen k vašemu účtu, jenž je neobnovitelný. Když se pak znovu zaregistrujete u Signalu, budou veškerá vaše data ztracena, pokud si je ručně nezálohujete a neobnovíte. Když je PIN deaktivován, nelze zapnout zámek registrace.</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Deaktivace PIN vytvoří skrytý PIN s vysokou entropií, který bude přiřazen k vašemu účtu, jenž je neobnovitelný. Když se pak znovu zaregistrujete u Signalu, budou veškerá vaše data ztracena, pokud si je ručně nezálohujete a neobnovíte. Když je PIN deaktivován, nelze zapnout zámek registrace.</string> -->
  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">PIN uchovává informace uložené u Signalu zašifrované, takže pouze vy k nim můžete přistupovat. Váš profil, nastavení a kontakty budou při reinstalaci obnoveny. Pro spuštění aplikace PIN nebudete potřebovat. </string>
  <string name="preferences__system_default">Podle systému</string>
  <string name="preferences__default">Výchozí</string>
@ -1951,7 +1948,7 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.
  <string name="KbsSplashFragment__update_pin">Aktualizovat PIN</string>
  <string name="KbsSplashFragment__create_your_pin">Vytvořit váš PIN</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Zjistěte víc o PINech</string>
-  <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__skip_pin_creation">Přeskočit vytvoření PIN</string> -->
+  <string name="KbsSplashFragment__disable_pin">Deaktivovat PIN</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Zadejte váš PIN k Signalu</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Abychom vám pomohli zapamatovat si PIN, budeme vás opakovaně žádat o jeho zadání. Postupem času vás budeme žádat méně.</string>
--- a/app/src/main/res/values-cy/strings.xml
+++ b/app/src/main/res/values-cy/strings.xml
@ -900,10 +900,7 @@ Send neges heb ei ddiogelu?</string>
  <string name="PinRestoreLockedFragment_create_new_pin">Creu PIN newydd</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Rhybudd</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Bydd hepgor creu PIN yn creu PIN cudd, entropi uchel sy\'n gysylltiedig â\'ch cyfrif na fydd modd ei adfer. Pan fyddwch yn ailgofrestru Signal byddwch yn colli\'r holl ddata oni bai eich bod yn gwneud copi wrth gefn ac adfer â llaw. Nid oes modd troi Cloi Cofrestru ymlaen tra bod y PIN wedi\'i analluogi.</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skip_pin_creation">Hepgor creu PIN</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disable_pin_title">Analluogi\'r PIN?</string> -->
-  <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Bydd analluogi PIN yn creu PIN cudd, entropi uchel sy\'n gysylltiedig â\'ch cyfrif na fydd modd ei adfer. Pan fyddwch yn ailgofrestru Signal byddwch yn colli\'r holl ddata oni bai eich bod yn gwneud copi wrth gefn ac adfer â llaw. Nid oes modd troi Cloi Cofrestru ymlaen tra bod y PIN wedi\'i analluogi.</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Bydd analluogi PIN yn creu PIN cudd, entropi uchel sy\'n gysylltiedig â\'ch cyfrif na fydd modd ei adfer. Pan fyddwch yn ailgofrestru Signal byddwch yn colli\'r holl ddata oni bai eich bod yn gwneud copi wrth gefn ac adfer â llaw. Nid oes modd troi Cloi Cofrestru ymlaen tra bod y PIN wedi\'i analluogi.</string> -->
  <string name="PinOptOutDialog_disable_pin">Analluogi\'r PIN?</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Graddio\'r ap</string>
@ -1717,7 +1714,7 @@ Send neges heb ei ddiogelu?</string>
  <string name="preferences__theme">Thema</string>
  <string name="preferences__disable_pin">Analluogi\'r PIN</string>
  <string name="preferences__enable_pin">Galluogi\'r PIN</string>
-  <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Bydd analluogi PIN yn creu PIN cudd, entropi uchel sy\'n gysylltiedig â\'ch cyfrif na fydd modd ei adfer. Pan fyddwch yn ailgofrestru Signal byddwch yn colli\'r holl ddata oni bai eich bod yn gwneud copi wrth gefn ac adfer â llaw. Nid oes modd troi Cloi Cofrestru ymlaen tra bod y PIN wedi\'i analluogi.</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Bydd analluogi PIN yn creu PIN cudd, entropi uchel sy\'n gysylltiedig â\'ch cyfrif na fydd modd ei adfer. Pan fyddwch yn ailgofrestru Signal byddwch yn colli\'r holl ddata oni bai eich bod yn gwneud copi wrth gefn ac adfer â llaw. Nid oes modd troi Cloi Cofrestru ymlaen tra bod y PIN wedi\'i analluogi.</string> -->
  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">Mae PINau\'n cadw gwybodaeth wedi\'i storio gyda Signal wedi\'i hamgryptio felly dim ond i chi gael mynediad ati. Bydd eich proffil, gosodiadau, a chysylltiadau yn cael eu hadfer pan fyddwch yn ailosod y rhaglen. Nid oes angen eich PIN arnoch i agor yr ap.</string>
  <string name="preferences__system_default">Rhagosodiad y system</string>
  <string name="preferences__default">Rhagosodiad</string>
@ -1954,7 +1951,7 @@ Send neges heb ei ddiogelu?</string>
  <string name="KbsSplashFragment__update_pin">Diweddaru PIN</string>
  <string name="KbsSplashFragment__create_your_pin">Crëwch eich PIN</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Dysgu mwy am PINiau</string>
-  <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__skip_pin_creation">Hepgor creu PIN</string> -->
+  <string name="KbsSplashFragment__disable_pin">Analluogi\'r PIN?</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Rhowch eich PIN Signal</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">I helpu i chi gofio\'ch PIN, byddwn yn gofyn i chi ei roi o bryd i\'w gilydd. Byddwn yn gofyn yn llai aml dros amser.</string>
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@ -823,10 +823,7 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Opret ny pinkode</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Advarsel</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Ved annullering af oprettelse af pinkode, oprettes der en skjult, høj entropi-pinkode, der er knyttet til din konto, som ikke kan gendannes. Når du omregistrerer Signal, mister du alle data medmindre du manuelt sikkerhedskopierer og gendanner. Du kan ikke aktivere Registreringslås mens pinkoden er deaktiveret</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skip_pin_creation">Annuller oprettelse af PIN</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disable_pin_title">Déaktiver PIN?</string> -->
-  <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Ved deaktivering af pinkode oprettes der en skjult, høj entropi-pinkode, der er knyttet til din konto, som ikke kan gendannes. Når du omregistrerer Signal, mister du alle data, medmindre du manuelt sikkerhedskopierer og gendanner. Du kan ikke slå Registreringslås til, mens pinkoden er deaktiveret.</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Ved deaktivering af pinkode oprettes der en skjult, høj entropi-pinkode, der er knyttet til din konto, som ikke kan gendannes. Når du omregistrerer Signal, mister du alle data, medmindre du manuelt sikkerhedskopierer og gendanner. Du kan ikke aktivere Registreringslås, mens pinkoden er deaktiveret.</string> -->
  <string name="PinOptOutDialog_disable_pin">Déaktiver PIN</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Bedøm app\'en</string>
@ -1617,7 +1614,7 @@ Modtog en nøgle besked, for en ugyldig protokol-version
  <string name="preferences__theme">Tema</string>
  <string name="preferences__disable_pin">Déaktiver PIN</string>
  <string name="preferences__enable_pin">Aktivér PIN</string>
-  <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Ved deaktivering af pinkode oprettes der en skjult, høj entropi-pinkode, der er knyttet til din konto, som ikke kan gendannes. Når du omregistrerer Signal, mister du alle data, medmindre du manuelt sikkerhedskopierer og gendanner. Du kan ikke slå Registreringslås til, mens pinkoden er deaktiveret.</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Ved deaktivering af pinkode oprettes der en skjult, høj entropi-pinkode, der er knyttet til din konto, som ikke kan gendannes. Når du omregistrerer Signal, mister du alle data, medmindre du manuelt sikkerhedskopierer og gendanner. Du kan ikke aktivere Registreringslås, mens pinkoden er deaktiveret.</string> -->
  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">Pinkoder opbevarer krypteret information, lagret med Signal, så kun du kan få adgang til den. Din profil, indstillinger og kontaktpersoner gendannes mens du geninstallerer. Du har ikke brug for din pinkode for at åbne app´en</string>
  <string name="preferences__system_default">System standard</string>
  <string name="preferences__default">Standard</string>
@ -1848,7 +1845,7 @@ Modtog en nøgle besked, for en ugyldig protokol-version
  <string name="KbsSplashFragment__update_pin">Opdatér PIN</string>
  <string name="KbsSplashFragment__create_your_pin">Opret din PIN</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Lær mere om PIN´s</string>
-  <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__skip_pin_creation">Annuller oprettelse af PIN</string> -->
+  <string name="KbsSplashFragment__disable_pin">Deaktivér pinkode</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Skriv din Signal PIN</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">For at hjælpe med at huske din PIN, beder vi dig om at skrive den periodisk. Vi vil bede om den sjældnere over tid</string>
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
--- a/app/src/main/res/values-eo/strings.xml
+++ b/app/src/main/res/values-eo/strings.xml
@ -44,6 +44,10 @@
  <string name="ApplicationPreferencesActivity_privacy_summary">Ekranŝloso %1$s, bloko de registriĝo %2$s</string>
  <string name="ApplicationPreferencesActivity_privacy_summary_screen_lock">Ekranŝloso %1$s</string>
  <string name="ApplicationPreferencesActivity_appearance_summary">Etoso %1$s, lingvo %2$s</string>
+  <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN estas bezonata por la bloko de registriĝo. Por malŝalti la uzon de PIN, unue vi devas malŝati vian blokon de registriĝo.</string>
+  <string name="ApplicationPreferencesActivity_failed_to_disable_pins_try_again_later">Malsukceso malebligi PIN-on. Reprovu poste.</string>
+  <string name="ApplicationPreferencesActivity_pin_created">PIN kreita.</string>
+  <string name="ApplicationPreferencesActivity_pin_disabled">PIN malŝaltita.</string>
  <!--AppProtectionPreferenceFragment-->
  <plurals name="AppProtectionPreferenceFragment_minutes">
    <item quantity="one">%d minuto</item>
@ -817,6 +821,9 @@
  <string name="PinRestoreLockedFragment_youve_run_out_of_pin_guesses">Vi ne plu povas enigi vian PIN, sed vi tamen povas aliri vian Signal-konton por krei novan PIN. Pro via privateco kaj sekureco, via konto restariĝos sen iuj konservitaj profilinformojn aŭ agordojn.</string>
  <string name="PinRestoreLockedFragment_create_new_pin">Krei novan PIN</string>
  <!--PinOptOutDialog-->
+  <string name="PinOptOutDialog_warning">Averto</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">La malŝalto de via PIN kreos novan kaŝitan PIN altentropian, kiu estas ligita al via konto, kaj kiu estas nerestaŭrebla. Kiam vi re-registros kun Signal, vi perdos ĉiujn datumojn, krom tio ke vi permane faras savkopion kaj restaŭras tiun savkopion. Vi ne povas uzi blokon de registriĝo, kiam PIN estas malŝaltita.</string> -->
+  <string name="PinOptOutDialog_disable_pin">Malŝalti PIN-on</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Pritaksi tiun aplikaĵon</string>
  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Se vi ŝatas uzi tiun aplikaĵon, bv. helpi nin per via pritakso.</string>
@ -1091,6 +1098,7 @@ Ricevis mesaĝon pri interŝanĝo de ŝlosiloj por nevalida protokola versio.
  <string name="MediaPreviewActivity_media_delete_confirmation_title">Ĉu forviŝi mesaĝon?</string>
  <string name="MediaPreviewActivity_media_delete_confirmation_message">Tio daŭre forviŝos ĉi tiun mesaĝon.</string>
  <string name="MediaPreviewActivity_s_to_s">%1$s al %2$s</string>
+  <string name="MediaPreviewActivity_media_no_longer_available">Aŭdvidaĵo ne plu disponeblas.</string>
  <!--MessageNotifier-->
  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d novaj mesaĝoj en %2$d interparoloj</string>
  <string name="MessageNotifier_most_recent_from_s">Plej lasta de: %1$s</string>
@ -1603,10 +1611,15 @@ Ricevis mesaĝon pri interŝanĝo de ŝlosiloj por nevalida protokola versio.
  <string name="preferences__dark_theme">Malhela</string>
  <string name="preferences__appearance">Aspekto</string>
  <string name="preferences__theme">Etoso</string>
+  <string name="preferences__disable_pin">Malŝalti PIN-on</string>
+  <string name="preferences__enable_pin">Ŝalti PIN-on</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">La malŝalto de via PIN kreos novan kaŝitan PIN altentropian, kiu estas ligita al via konto, kaj kiu estas nerestaŭrebla. Kiam vi re-registros kun Signal, vi perdos ĉiujn datumojn, krom tio ke vi permane faras savkopion kaj restaŭras tiun savkopion. Vi ne povas uzi blokon de registriĝo, kiam PIN estas malŝaltita.</string> -->
+  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">PIN konservas informojn ĉifritajn ĉe Signal, tiel ke nur vi povas aliri ilin. Via profilo, viaj agordoj kaj kontaktoj revenos, kiam vi reinstalos Signal-on. Vian PIN-on vi ne bezonos por malfermi la aplikaĵon.</string>
  <string name="preferences__system_default">Sistema defaŭlto</string>
  <string name="preferences__default">Defaŭlta</string>
  <string name="preferences__language">Lingvo</string>
  <string name="preferences__signal_messages_and_calls">Signal-aj mesaĝoj kaj alvokoj</string>
+  <string name="preferences__advanced_pin_settings">Speciala PIN-agordo</string>
  <string name="preferences__free_private_messages_and_calls">Senpagaj privataj mesaĝoj kaj alvokoj al Signal-uzantoj</string>
  <string name="preferences__submit_debug_log">Sendi sencimigan protokolon</string>
  <string name="preferences__support_wifi_calling">Kongrua reĝimo kun „Pervifiaj alvokoj“</string>
@ -1811,6 +1824,7 @@ Ricevis mesaĝon pri interŝanĝo de ŝlosiloj por nevalida protokola versio.
  <string name="CreateKbsPinFragment__create_a_new_pin">Krei novan PIN</string>
  <string name="CreateKbsPinFragment__you_can_choose_a_new_pin_as_long_as_this_device_is_registered">Vi povas ŝanĝi vian PIN tiel longe, kiel tiu ĉi aparato estas registrita.</string>
  <string name="CreateKbsPinFragment__create_your_pin">Krei vian PIN</string>
+  <string name="CreateKbsPinFragment__pins_keep_information_stored_with_signal_encrypted">PIN konservas informojn ĉifritajn ĉe Signal, tiel ke nur vi povas aliri ilin. Via profilo, viaj agordoj kaj kontaktoj revenos, kiam vi reinstalos Signal-on. Vian PIN-on vi ne bezonos por malfermi la aplikaĵon.</string>
  <string name="CreateKbsPinFragment__choose_a_stronger_pin">Elektu pli fortikan PIN-on</string>
  <!--ConfirmKbsPinFragment-->
  <string name="ConfirmKbsPinFragment__pins_dont_match">La du PIN-oj malsamas. Re-provu.</string>
@ -1822,12 +1836,15 @@ Ricevis mesaĝon pri interŝanĝo de ŝlosiloj por nevalida protokola versio.
  <string name="ConfirmKbsPinFragment__creating_pin">Kreo de PIN…</string>
  <!--KbsSplashFragment-->
  <string name="KbsSplashFragment__introducing_pins">Jen la „persona identiga numero“ (PIN)</string>
+  <string name="KbsSplashFragment__pins_keep_information_stored_with_signal_encrypted">PIN konservas informojn ĉifritajn ĉe Signal, tiel ke nur vi povas aliri ilin. Via profilo, viaj agordoj kaj kontaktoj revenos, kiam vi reinstalos Signal-on. Vian PIN-on vi ne bezonos por malfermi la aplikaĵon.</string>
  <string name="KbsSplashFragment__learn_more">Scii pli</string>
  <string name="KbsSplashFragment__registration_lock_equals_pin">Bloko de registriĝo = PIN</string>
  <string name="KbsSplashFragment__your_registration_lock_is_now_called_a_pin">„Bloko de registriĝo“ nomiĝas nun „PIN“, kaj ĝi faras pli. Ĝisdatigu ĝin nun.</string>
  <string name="KbsSplashFragment__read_more_about_pins">Legu pli pri PIN.</string>
  <string name="KbsSplashFragment__update_pin">Ĝisdatigi PIN-on</string>
  <string name="KbsSplashFragment__create_your_pin">Krei vian PIN</string>
+  <string name="KbsSplashFragment__learn_more_about_pins">Legu pli pri PIN</string>
+  <string name="KbsSplashFragment__disable_pin">Malŝalti PIN-on</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Entajpu vian Signal-PIN-on</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Por helpi vin memorigi vian PIN, ni petos vin entajpi ĝin tempaltempe. Ni mapli petos vin laŭtempe.</string>
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@ -44,7 +44,7 @@
  <string name="ApplicationPreferencesActivity_privacy_summary">Bloqueo de pantalla %1$s, Bloqueo de registro %2$s</string>
  <string name="ApplicationPreferencesActivity_privacy_summary_screen_lock">Bloqueo de pantalla %1$s</string>
  <string name="ApplicationPreferencesActivity_appearance_summary">Tema %1$s, Idioma %2$s</string>
-  <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">El PIN es necesario para el bloqueo de registro. Desactiva primero el bloqueo de registro y después el PIN.</string>
+  <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">El bloqueo de registro necesita el PIN. Desactiva primero el bloqueo de registro y después el PIN.</string>
  <string name="ApplicationPreferencesActivity_failed_to_disable_pins_try_again_later">Fallo al desactivar tu PIN. Inténtalo más tarde.</string>
  <string name="ApplicationPreferencesActivity_pin_created">PIN creado.</string>
  <string name="ApplicationPreferencesActivity_pin_disabled">PIN desactivado.</string>
@ -822,10 +822,7 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Crear nuevo PIN</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Advertencia</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Al omitir crear el PIN se genererá un PIN de alta entropía asociado con tu cuenta que no se podrá recuperar. Al volver a registrar Signal perderás todos los datos de la cuenta, a menos que hagas una copia de respaldo y la recuperes. No puedes activar el bloqueo de registro con el PIN desactivado.</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skip_pin_creation">Omitir crear PIN</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disable_pin_title">¿Desactivar PIN?</string> -->
-  <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Al omitir crear el PIN se genererá un PIN de alta entropía asociado con tu cuenta que no se podrá recuperar. Al volver a registrar Signal perderás todos los datos de tu cuenta, a menos que hagas una copia de respaldo y la recuperes. No puedes activar el bloqueo de registro con el PIN desactivado.</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Al desactivar el PIN se generará un PIN de alta entropía asociado con tu cuenta que no se podrá recuperar. Al volver a registrarte en Signal perderás todos los datos de tu cuenta, a menos que hagas una copia manual de respaldo y la recuperes tras el registro. No puedes activar el bloqueo de registro con el PIN desactivado.</string> -->
  <string name="PinOptOutDialog_disable_pin">Desactivar PIN</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Valora esta aplicación</string>
@ -1102,7 +1099,7 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
  <string name="MediaPreviewActivity_media_delete_confirmation_title">¿Eliminar mensaje?</string>
  <string name="MediaPreviewActivity_media_delete_confirmation_message">Este mensaje se eliminará permanentemente.</string>
  <string name="MediaPreviewActivity_s_to_s">%1$s de %2$s</string>
-  <string name="MediaPreviewActivity_media_no_longer_available">El archivo original ya no está disponible.</string>
+  <string name="MediaPreviewActivity_media_no_longer_available">El adjunto original ya no está disponible.</string>
  <!--MessageNotifier-->
  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d mensajes nuevos en %2$d chats</string>
  <string name="MessageNotifier_most_recent_from_s">Más recientes desde: %1$s</string>
@ -1617,8 +1614,8 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
  <string name="preferences__theme">Tema</string>
  <string name="preferences__disable_pin">Desactivar PIN</string>
  <string name="preferences__enable_pin">Activar PIN</string>
-  <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Al omitir crear el PIN se genererá un PIN de alta entropía asociado con tu cuenta que no se podrá recuperar. Al volver a registrar Signal perderás todos los datos de tu cuenta, a menos que hagas una copia de respaldo y la recuperes. No puedes activar el bloqueo de registro con el PIN desactivado.</string>
-  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">El PIN protege y almacena tu cuenta en Signal de forma cifrada y sólo tú puedes acceder a ella. Ni siquiera l*s creador*s de Signal tienen acceso. Tu perfil, alias, grupos y personas bloqueadas se recuperarán al reinstalar Signal. No necesitas el PIN para abrir la aplicación.</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Al desactivar el PIN se generará un PIN de alta entropía asociado con tu cuenta que no se podrá recuperar. Al volver a registrarte en Signal perderás todos los datos de tu cuenta, a menos que hagas una copia manual de respaldo y la recuperes tras el registro. No puedes activar el bloqueo de registro con el PIN desactivado.</string> -->
+  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">El PIN permite activar el bloqueo de registro de tu número y almacena tu cuenta cifrada en Signal de forma que sólo tú puedes acceder a ella. Ni siquiera l*s creador*s de Signal tienen acceso. Tu perfil, alias, grupos y personas bloqueadas se recuperarán al reinstalar Signal. No necesitas el PIN para abrir la aplicación.</string>
  <string name="preferences__system_default">Predeterminado del sistema</string>
  <string name="preferences__default">Por defecto</string>
  <string name="preferences__language">Idioma</string>
@ -1849,7 +1846,7 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
  <string name="KbsSplashFragment__update_pin">Actualizar PIN</string>
  <string name="KbsSplashFragment__create_your_pin">Crea tu PIN</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Saber más sobre el PIN</string>
-  <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__skip_pin_creation">Omitir crear PIN</string> -->
+  <string name="KbsSplashFragment__disable_pin">Desactivar PIN</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Introduce tu PIN de Signal</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Para ayudarte a memorizar el PIN, te solicitaremos introducirlo de vez en cuando. Con el tiempo lo solicitaremos con menos frecuencia.</string>
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@ -44,6 +44,8 @@
  <string name="ApplicationPreferencesActivity_privacy_summary">Ekraanilukk %1$s, registreerimislukk %2$s</string>
  <string name="ApplicationPreferencesActivity_privacy_summary_screen_lock">Ekraanilukk %1$s</string>
  <string name="ApplicationPreferencesActivity_appearance_summary">%1$s teema, %2$s keel</string>
+  <string name="ApplicationPreferencesActivity_pin_created">PIN loodud.</string>
+  <string name="ApplicationPreferencesActivity_pin_disabled">PIN keelatud.</string>
  <!--AppProtectionPreferenceFragment-->
  <plurals name="AppProtectionPreferenceFragment_minutes">
    <item quantity="one">%d minut</item>
@ -800,6 +802,7 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Loo uus PIN-kood</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Hoiatus</string>
+  <string name="PinOptOutDialog_disable_pin">Keela PIN</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Hinda seda rakendust</string>
  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Kui sa naudid selle rakenduse kasutamist, palun võta aega ja hinda seda, et meid aidata.</string>
@ -917,6 +920,7 @@
  <string name="SignalPinReminders_well_remind_you_again_in_a_few_days">Me tuletame sulle paari päeva pärast uuesti meelde.</string>
  <string name="SignalPinReminders_well_remind_you_again_in_a_week">Me tuletame sulle nädala pärast uuesti meelde.</string>
  <string name="SignalPinReminders_well_remind_you_again_in_a_couple_weeks">Me tuletame sulle paari nädala pärast uuesti meelde.</string>
+  <string name="SignalPinReminders_well_remind_you_again_in_a_month">Me tuletame sulle kuu aja pärast uuesti meelde.</string>
  <!--Slide-->
  <string name="Slide_image">Pilt</string>
  <string name="Slide_sticker">Kleeps</string>
@ -1074,6 +1078,7 @@
  <string name="MediaPreviewActivity_media_delete_confirmation_title">Kustutad sõnumi?</string>
  <string name="MediaPreviewActivity_media_delete_confirmation_message">See kustutab püsivalt valitud sõnumi.</string>
  <string name="MediaPreviewActivity_s_to_s">%1$s saajale %2$s</string>
+  <string name="MediaPreviewActivity_media_no_longer_available">Meedia ei ole enam saadaval.</string>
  <!--MessageNotifier-->
  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d uut sõnumit %2$d vestluses</string>
  <string name="MessageNotifier_most_recent_from_s">Viimatine kontaktilt %1$s</string>
@ -1217,6 +1222,7 @@
  <string name="ContactSelectionListFragment_s_is_not_a_signal_user">\"%1$s\" ei ole Signali kasutaja. Palun kontrolli kasutajanime ja proovi uuesti.</string>
  <string name="ContactSelectionListFragment_okay">Sobib</string>
  <string name="ContactSelectionListFragment_the_group_is_full">Grupp on täis</string>
+  <string name="ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group">Sa ei pea ennast gruppi lisama</string>
  <!--blocked_contacts_fragment-->
  <string name="blocked_contacts_fragment__no_blocked_contacts">Blokeeritud kontakte pole</string>
  <!--contact_selection_list_fragment-->
@ -1241,6 +1247,7 @@
  <string name="conversation_activity__quick_attachment_drawer_record_and_send_audio_description">Salvesta ja saada helimanus</string>
  <string name="conversation_activity__quick_attachment_drawer_lock_record_description">Lukusta helimanuse salvestamine</string>
  <string name="conversation_activity__enable_signal_for_sms">Luba Signal SMSide jaoks</string>
+  <string name="conversation_activity__message_could_not_be_sent">Sõnumit ei saanud saata. Kontrolli oma ühendust ja proovi uuesti.</string>
  <!--conversation_input_panel-->
  <string name="conversation_input_panel__slide_to_cancel">Libista tühistamiseks</string>
  <string name="conversation_input_panel__cancel">Loobu</string>
@ -1273,6 +1280,7 @@
  <string name="safety_number_change_dialog__send_anyway">Saada siiski</string>
  <string name="safety_number_change_dialog__the_following_people_may_have_reinstalled_or_changed_devices">Need inimised on võibolla rakendust reinstallinud või seadet vahetanud. Privaatsuse kindlustamiseks kontrolli nendega turvanumbrit.</string>
  <string name="safety_number_change_dialog__view">Näita</string>
+  <string name="safety_number_change_dialog__previous_verified">Eelnevalt kinnitatud</string>
  <!--country_selection_fragment-->
  <string name="country_selection_fragment__loading_countries">Riikide laadimine…</string>
  <string name="country_selection_fragment__search">Otsi</string>
@ -1583,10 +1591,13 @@
  <string name="preferences__dark_theme">Tume</string>
  <string name="preferences__appearance">Välimus</string>
  <string name="preferences__theme">Teema</string>
+  <string name="preferences__disable_pin">Keela PIN</string>
+  <string name="preferences__enable_pin">Luba PIN</string>
  <string name="preferences__system_default">Süsteemi vaikeväärtus</string>
  <string name="preferences__default">Vaikimisi</string>
  <string name="preferences__language">Keel</string>
  <string name="preferences__signal_messages_and_calls">Signali sõnumid ja kõned</string>
+  <string name="preferences__advanced_pin_settings">Täpsemad PINi seaded</string>
  <string name="preferences__free_private_messages_and_calls">Tasuta privaatsõnumid ja kõned Signali kasutajatele</string>
  <string name="preferences__submit_debug_log">Saada silumislogi</string>
  <string name="preferences__support_wifi_calling">\"WiFi kõnede\" ühilduvusrežiim</string>
@ -1809,6 +1820,7 @@
  <string name="KbsSplashFragment__update_pin">Uuenda PIN-koodi</string>
  <string name="KbsSplashFragment__create_your_pin">Loo enda PIN-kood</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Uuri lähemalt PIN-koodide kohta</string>
+  <string name="KbsSplashFragment__disable_pin">Keela PIN</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Sisesta Signal-i PIN-kood</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">PIN-koodi meeldejätmise aitamiseks palume sul seda aeg-ajalt sisestada. Aja möödudes küsime seda harvem.</string>
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@ -819,8 +819,6 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Créer un nouveau NIP</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Avertissement</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skip_pin_creation">Ignorer la création du NIP</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disable_pin_title">Désactiver le NIP ?</string> -->
  <string name="PinOptOutDialog_disable_pin">Désactiver le NIP</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Notez cette appli</string>
@ -1601,6 +1599,7 @@
  <string name="preferences__theme">Thème</string>
  <string name="preferences__disable_pin">Désactiver le NIP</string>
  <string name="preferences__enable_pin">Activer le NIP</string>
+  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">Les NIP permettent de chiffrer les renseignements stockés avec Signal afin que vous seul puissiez y accéder. Votre profil, vos paramètres et vos contacts seront restaurés lors de la réinstallation. Vous n’aurez pas besoin de votre NIP pour ouvrir l’application.</string>
  <string name="preferences__system_default">Valeur par défaut du système</string>
  <string name="preferences__default">Valeur par défaut</string>
  <string name="preferences__language">Langue</string>
@ -1828,7 +1827,7 @@
  <string name="KbsSplashFragment__update_pin">Mettre le NIP à jour</string>
  <string name="KbsSplashFragment__create_your_pin">Créer votre NIP</string>
  <string name="KbsSplashFragment__learn_more_about_pins">En apprendre davantage sur les NIP</string>
-  <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__skip_pin_creation">Ignorer la création du NIP</string> -->
+  <string name="KbsSplashFragment__disable_pin">Désactiver le NIP</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Saisissez votre NIP Signal</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Pour vous aider à mémoriser votre NIP, nous vous demanderons de le saisir régulièrement. Nous vous le demanderons de moins en moins souvent.</string>
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@ -822,10 +822,7 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Crea nuovo PIN</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Attenzione</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Saltare la creazione del PIN creerà un PIN nascosto ad alta entropia associato al tuo account che è irrecuperabile. Quando ti registri nuovamente con Signal, perderai tutti i dati a meno che tu non esegua manualmente il backup e il ripristino. Non è possibile attivare il Blocco registrazione mentre il PIN è disabilitato.</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skip_pin_creation">Salta creazione PIN</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disable_pin_title">Disabilitare PIN?</string> -->
-  <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Disabilitare il PIN creerà un PIN nascosto ad alta entropia associato al tuo account che è irrecuperabile. Quando ti registri nuovamente con Signal, perderai tutti i dati a meno che tu non esegua manualmente il backup e il ripristino. Non è possibile attivare il Blocco registrazione mentre il PIN è disabilitato.</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Disabilitare il PIN creerà un PIN nascosto ad alta entropia associato al tuo account che è irrecuperabile. Quando ti registri nuovamente con Signal, perderai tutti i dati a meno che tu non esegua manualmente il backup e il ripristino. Non è possibile attivare il Blocco registrazione mentre il PIN è disabilitato.</string> -->
  <string name="PinOptOutDialog_disable_pin">Disabilita PIN</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Vota questa app!</string>
@ -1617,7 +1614,7 @@
  <string name="preferences__theme">Tema</string>
  <string name="preferences__disable_pin">Disabilita PIN</string>
  <string name="preferences__enable_pin">Abilita PIN</string>
-  <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Disabilitare il PIN creerà un PIN nascosto ad alta entropia associato al tuo account che è irrecuperabile. Quando ti registri nuovamente con Signal, perderai tutti i dati a meno che tu non esegua manualmente il backup e il ripristino. Non è possibile attivare il Blocco registrazione mentre il PIN è disabilitato.</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Disabilitare il PIN creerà un PIN nascosto ad alta entropia associato al tuo account che è irrecuperabile. Quando ti registri nuovamente con Signal, perderai tutti i dati a meno che tu non esegua manualmente il backup e il ripristino. Non è possibile attivare il Blocco registrazione mentre il PIN è disabilitato.</string> -->
  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">I PIN mantengono le informazioni memorizzate con Signal crittografate in modo che solo tu possa accedervi. Il profilo, le impostazioni e i contatti verranno ripristinati quando reinstalli. Non avrai bisogno del tuo PIN per aprire l\'app.</string>
  <string name="preferences__system_default">Predefinito di sistema</string>
  <string name="preferences__default">Predefinito</string>
@ -1848,7 +1845,7 @@
  <string name="KbsSplashFragment__update_pin">Aggiorna PIN</string>
  <string name="KbsSplashFragment__create_your_pin">Crea il tuo PIN</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Scopri di più sui PIN</string>
-  <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__skip_pin_creation">Salta creazione PIN</string> -->
+  <string name="KbsSplashFragment__disable_pin">Disabilita PIN</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Inserisci il tuo PIN di Signal</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Per aiutarti a memorizzare il tuo PIN, ti chiederemo di inserirlo periodicamente. Lo chiederemo di meno nel corso del tempo.</string>
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@ -44,6 +44,10 @@
  <string name="ApplicationPreferencesActivity_privacy_summary">Schermvergrendeling %1$s, Registratievergrendeling %2$s</string>
  <string name="ApplicationPreferencesActivity_privacy_summary_screen_lock">Schermvergrendeling %1$s</string>
  <string name="ApplicationPreferencesActivity_appearance_summary">Thema %1$s, Taal %2$s</string>
+  <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PINs zijn vereist voor registratievergrendeling. Om PINs uit te schakelen moet eerst de registratievergrendeling uitgezet worden.</string>
+  <string name="ApplicationPreferencesActivity_failed_to_disable_pins_try_again_later">Uitzetten PINs is mislukt, probeer het later nog eens.</string>
+  <string name="ApplicationPreferencesActivity_pin_created">Pincode aangemaakt.</string>
+  <string name="ApplicationPreferencesActivity_pin_disabled">Pin uitgeschakeld.</string>
  <!--AppProtectionPreferenceFragment-->
  <plurals name="AppProtectionPreferenceFragment_minutes">
    <item quantity="one">%d minuut</item>
@ -632,6 +636,7 @@
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Dit bericht gebruikt verouderde versleuteling van een Signal-versie die niet langer ondersteund wordt. Vraag de afzender om bij te werken naar de meest recente versie en het bericht opnieuw te verzenden.</string>
  <string name="MessageRecord_left_group">Je hebt de groep verlaten.</string>
  <string name="MessageRecord_you_updated_group">Je hebt de groep aangepast.</string>
+  <string name="MessageRecord_the_group_was_updated">De groep is aangepast.</string>
  <string name="MessageRecord_you_called">Jij hebt gebeld</string>
  <string name="MessageRecord_called_you">Contactpersoon heeft gebeld</string>
  <string name="MessageRecord_missed_call">Gemiste oproep</string>
@ -644,6 +649,7 @@
  <string name="MessageRecord_s_disabled_disappearing_messages">%1$s heeft zelfwissende berichten uitgeschakeld.</string>
  <string name="MessageRecord_you_set_disappearing_message_time_to_s">Je hebt de timer voor zelfwissende berichten op %1$s ingesteld.</string>
  <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s heeft de timer voor zelfwissende berichten op %2$s ingesteld.</string>
+  <string name="MessageRecord_disappearing_message_time_set_to_s">De timer voor zelfwissende berichten is op %1$s ingesteld.</string>
  <!--GV2 specific-->
  <string name="MessageRecord_you_created_the_group">Je hebt de groep aangemaakt.</string>
  <string name="MessageRecord_group_updated">Groep aangepast.</string>
@ -659,6 +665,8 @@
  <string name="MessageRecord_s_removed_you_from_the_group">%1$s heeft je verwijderd van de groep.</string>
  <string name="MessageRecord_you_left_the_group">Je kunt geen berichten verzenden omdat je de groep hebt verlaten.</string>
  <string name="MessageRecord_s_left_the_group">%1$s heeft de groep verlaten.</string>
+  <string name="MessageRecord_you_are_no_longer_in_the_group">Je bent niet langer lid van de groep.</string>
+  <string name="MessageRecord_s_is_no_longer_in_the_group">%1$sis niet langer lid van de groep.</string>
  <!--GV2 role change-->
  <string name="MessageRecord_you_made_s_an_admin">Je hebt %1$s een beheerder gemaakt.</string>
  <string name="MessageRecord_s_made_s_an_admin">%1$s heeft %2$s een beheerder gemaakt.</string>
@ -666,7 +674,10 @@
  <string name="MessageRecord_you_revoked_admin_privileges_from_s">Je hebt de beheerdersbevoegdheden van %1$s ingetrokken.</string>
  <string name="MessageRecord_s_revoked_your_admin_privileges">%1$s heeft je beheerdersbevoegdheden ingetrokken.</string>
  <string name="MessageRecord_s_revoked_admin_privileges_from_s">%1$s heeft de beheerdersbevoegdheden van %2$s ingetrokken.</string>
+  <string name="MessageRecord_s_is_now_an_admin">%1$sis nu een beheerder.</string>
  <string name="MessageRecord_you_are_now_an_admin">Je bent nu een beheerder.</string>
+  <string name="MessageRecord_s_is_no_longer_an_admin">%1$sis niet langer een beheerder.</string>
+  <string name="MessageRecord_you_are_no_longer_an_admin">Je bent niet langer een beheerder.</string>
  <!--GV2 invitations-->
  <string name="MessageRecord_you_invited_s_to_the_group">Je hebt %1$s uitgenodigd voor de groep.</string>
  <string name="MessageRecord_s_invited_you_to_the_group">%1$s heeft je uitgenodigd voor de groep.</string>
@ -675,6 +686,10 @@
    <item quantity="other">%1$s heeft %2$d personen uitgenodigd om lid te worden van de groep.</item>
  </plurals>
  <string name="MessageRecord_you_were_invited_to_the_group">Je bent uitgenodigd voor de groep.</string>
+  <plurals name="MessageRecord_d_people_were_invited_to_the_group">
+    <item quantity="one">Een persoon is uitgenodigd om lid te worden van de groep.</item>
+    <item quantity="other">%1$dpersonen zijn uitgenodigd om lid te worden van de groep.</item>
+  </plurals>
  <!--GV2 invitation revokes-->
  <plurals name="MessageRecord_you_revoked_invites">
    <item quantity="one">Je hebt een uitnodiging voor de groep ingetrokken.</item>
@ -687,6 +702,10 @@
  <string name="MessageRecord_someone_declined_an_invitation_to_the_group">Iemand heeft een uitnodiging om lid te worden van de groep verworpen.</string>
  <string name="MessageRecord_you_declined_the_invitation_to_the_group">Je hebt de uitnodiging om lid te worden van de groep verworpen.</string>
  <string name="MessageRecord_your_invitation_to_the_group_was_revoked">Je uitnodiging om lid de worden van de groep is ingetrokken.</string>
+  <plurals name="MessageRecord_d_invitations_were_revoked">
+    <item quantity="one">Een uitnodiging om lid te worden van de groep is ingetrokken.</item>
+    <item quantity="other">%1$duitnodigingen om lid te worden van de groep zijn ingetrokken.</item>
+  </plurals>
  <!--GV2 invitation acceptance-->
  <string name="MessageRecord_you_accepted_invite">Je hebt een uitnodiging om lid te worden van de groep aanvaard.</string>
  <string name="MessageRecord_s_accepted_invite">%1$s heeft een uitnodiging om lid te worden van de groep aanvaard.</string>
@ -695,15 +714,19 @@
  <!--GV2 title change-->
  <string name="MessageRecord_you_changed_the_group_name_to_s">Je hebt de naam van de groep gewijzigd naar “%1$s”.</string>
  <string name="MessageRecord_s_changed_the_group_name_to_s">%1$s heeft de naam van de groep gewijzigd naar “%2$s”.</string>
+  <string name="MessageRecord_the_group_name_has_changed_to_s">De naam van de groep is gewijzigd in \"%1$s\".</string>
  <!--GV2 avatar change-->
  <string name="MessageRecord_you_changed_the_group_avatar">Je hebt de groepsafbeelding aangepast.</string>
  <string name="MessageRecord_s_changed_the_group_avatar">%1$s heeft de groepsafbeelding aangepast.</string>
+  <string name="MessageRecord_the_group_group_avatar_has_been_changed">De groepsafbeeldig is aangepast.</string>
  <!--GV2 attribute access level change-->
  <string name="MessageRecord_you_changed_who_can_edit_group_info_to_s">Je hebt de instelling voor wie de groepsinformatie kan wijzigen op ‘%1$s’ ingesteld.</string>
  <string name="MessageRecord_s_changed_who_can_edit_group_info_to_s">%1$s heeft de instelling voor wie de groepsinformatie kan wijzigen op ‘%2$s’ ingesteld.</string>
+  <string name="MessageRecord_who_can_edit_group_info_has_been_changed_to_s">De instelling voor wie de groepslidmaatschap kan aanpassen is op ‘%1$s’ ingesteld.</string>
  <!--GV2 membership access level change-->
  <string name="MessageRecord_you_changed_who_can_edit_group_membership_to_s">Je hebt de instelling voor wie de groepslidmaatschap kan aanpassen op ‘%1$s’ ingesteld.</string>
  <string name="MessageRecord_s_changed_who_can_edit_group_membership_to_s">%1$s heeft de instelling voor wie de groepslidmaatschap kan aanpassen op ‘%2$s’ ingesteld.</string>
+  <string name="MessageRecord_who_can_edit_group_membership_has_been_changed_to_s">De instelling voor wie de groepslidmaatschap kan aanpassen is op ‘%1$s’ ingesteld.</string>
  <!--End of GV2 specific update messages-->
  <string name="MessageRecord_your_safety_number_with_s_has_changed">Je veiligheidsnummer met %s is veranderd.</string>
  <string name="MessageRecord_you_marked_your_safety_number_with_s_verified">Je hebt je veiligheidsnummer met %s gemarkeerd als ‘geverifieerd’</string>
@ -799,6 +822,8 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Nieuwe pincode aanmaken</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Waarschuwing</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Het uitschakelen van de PIN maakt een verborgen PIN met  hoge entropie aan met jouw account. Deze is niet herstelbaar: wanneer je Signal opnieuw registreert ben je al je gegevens kwijt tenzij je handmatig backupt en herstelt. Je kunt geen registratievergrendeling gebruiken zolang de PIN uitgeschakeld is.</string> -->
+  <string name="PinOptOutDialog_disable_pin">PIN uitschakelen</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Beoordeel deze app</string>
  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Gebruik je deze app graag? Help ons door anderen te laten weten wat je van de app vindt.</string>
@ -918,6 +943,7 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o
  <string name="SignalPinReminders_well_remind_you_again_in_a_few_days">Signal zal je binnen een paar dagen opnieuw verzoeken om te verifiëren dat je je pincode nog weet.</string>
  <string name="SignalPinReminders_well_remind_you_again_in_a_week">Signal zal je na een week opnieuw verzoeken om te verifiëren dat je je pincode nog weet.</string>
  <string name="SignalPinReminders_well_remind_you_again_in_a_couple_weeks">Signal zal je binnen een aantal weken opnieuw verzoeken om te verifiëren dat je je pincode nog weet.</string>
+  <string name="SignalPinReminders_well_remind_you_again_in_a_month">We herinneren je er opniew aan over een maand.</string>
  <!--Slide-->
  <string name="Slide_image">Afbeelding</string>
  <string name="Slide_sticker">Sticker</string>
@ -1075,6 +1101,7 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o
  <string name="MediaPreviewActivity_media_delete_confirmation_title">Bericht wissen?</string>
  <string name="MediaPreviewActivity_media_delete_confirmation_message">Dit bericht zal alleen voor jou onherroepelijk gewist worden, maar dus niet voor je gesprekspartner(s).</string>
  <string name="MediaPreviewActivity_s_to_s">%1$s naar %2$s</string>
+  <string name="MediaPreviewActivity_media_no_longer_available">Media niet langer beschikbaar.</string>
  <!--MessageNotifier-->
  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nieuwe berichten in %2$d gesprekken</string>
  <string name="MessageNotifier_most_recent_from_s">Meest recente van: %1$s</string>
@ -1218,6 +1245,7 @@ Tot slot moet Signal de telefoonstatus kunnen lezen om te voorkomen dat Signal-o
  <string name="ContactSelectionListFragment_s_is_not_a_signal_user">“%1$s” is geen Signal-gebruiker. Kijk de gebruikersnaam na en probeer het opnieuw.</string>
  <string name="ContactSelectionListFragment_okay">Oké</string>
  <string name="ContactSelectionListFragment_the_group_is_full">De groep is vol</string>
+  <string name="ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group">Het is niet nodig om jezelf toe te voegen aan de groep</string>
  <!--blocked_contacts_fragment-->
  <string name="blocked_contacts_fragment__no_blocked_contacts">Geen geblokkeerde contactpersonen</string>
  <!--contact_selection_list_fragment-->
@ -1588,10 +1616,15 @@ Signal zal nu toestemming vragen om je contactenlijst te lezen, om na te gaan wi
  <string name="preferences__dark_theme">Donker</string>
  <string name="preferences__appearance">Uiterlijk</string>
  <string name="preferences__theme">Thema</string>
+  <string name="preferences__disable_pin">PIN uitschakelen</string>
+  <string name="preferences__enable_pin">PIN inschakelen</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Het uitschakelen van de PIN maakt een verborgen PIN met  hoge entropie aan met jouw account. Deze is niet herstelbaar: wanneer je Signal opnieuw registreert ben je al je gegevens kwijt tenzij je handmatig backupt en herstelt. Je kunt geen registratievergrendeling gebruiken zolang de PIN uitgeschakeld is.</string> -->
+  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">Met een pincode wordt informatie versleuteld opgeslagen op Signal\'s servers zodat alleen jij er toegang toe hebt. Je kunt hierdoor je profielnaam en -foto, instellingen en (geblokkeerde) contacten herstellen wanneer je Signal opnieuw installeert. Je hebt de PIN niet nodig om de app te openen.</string>
  <string name="preferences__system_default">Systeemstandaard</string>
  <string name="preferences__default">Systeemstandaard</string>
  <string name="preferences__language">Taal</string>
  <string name="preferences__signal_messages_and_calls">Signal-berichten en -oproepen</string>
+  <string name="preferences__advanced_pin_settings">Geavanceerde PIN instellingen</string>
  <string name="preferences__free_private_messages_and_calls">Gratis privéberichten en bellen met Signal-gebruikers</string>
  <string name="preferences__submit_debug_log">Foutopsporingslog indienen</string>
  <string name="preferences__support_wifi_calling">‘Bellen via wifi’-compatibiliteitsmodus</string>
@ -1796,6 +1829,7 @@ Signal zal nu toestemming vragen om je contactenlijst te lezen, om na te gaan wi
  <string name="CreateKbsPinFragment__create_a_new_pin">Nieuwe pincode aanmaken</string>
  <string name="CreateKbsPinFragment__you_can_choose_a_new_pin_as_long_as_this_device_is_registered">Zolang je telefoonnummer nog voor dit apparaat geregistreerd staat kun je je pincode nog wijzigen.</string>
  <string name="CreateKbsPinFragment__create_your_pin">Pincode aanmaken</string>
+  <string name="CreateKbsPinFragment__pins_keep_information_stored_with_signal_encrypted">Met een pincode wordt informatie versleuteld opgeslagen op Signal\'s servers zodat alleen jij er toegang toe hebt. Je kunt hierdoor je profielnaam en -foto, instellingen en (geblokkeerde) contacten herstellen wanneer je Signal opnieuw installeert. Je hebt de PIN niet nodig om de app te openen.</string>
  <string name="CreateKbsPinFragment__choose_a_stronger_pin">Verzin een sterkere pincode</string>
  <!--ConfirmKbsPinFragment-->
  <string name="ConfirmKbsPinFragment__pins_dont_match">De pincodes komen niet overeen, probeer het opnieuw.</string>
@ -1807,6 +1841,7 @@ Signal zal nu toestemming vragen om je contactenlijst te lezen, om na te gaan wi
  <string name="ConfirmKbsPinFragment__creating_pin">Pincode aan het aanmaken …</string>
  <!--KbsSplashFragment-->
  <string name="KbsSplashFragment__introducing_pins">We introduceren pincodes</string>
+  <string name="KbsSplashFragment__pins_keep_information_stored_with_signal_encrypted">Met een pincode wordt informatie versleuteld opgeslagen op Signal\'s servers zodat alleen jij er toegang toe hebt. Je kunt hierdoor je profielnaam en -foto, instellingen en (geblokkeerde) contacten herstellen wanneer je Signal opnieuw installeert. Je hebt de PIN niet nodig om de app te openen.</string>
  <string name="KbsSplashFragment__learn_more">Lees meer</string>
  <string name="KbsSplashFragment__registration_lock_equals_pin">Registratievergrendeling = Pincode</string>
  <string name="KbsSplashFragment__your_registration_lock_is_now_called_a_pin">Registratievergrendeling heet vanaf nu ‘pincode’, en je kunt er meer mee doen. Je moet de pincode welke je tot nog toe gebruikte bijwerken.</string>
@ -1814,6 +1849,7 @@ Signal zal nu toestemming vragen om je contactenlijst te lezen, om na te gaan wi
  <string name="KbsSplashFragment__update_pin">Pincode bijwerken</string>
  <string name="KbsSplashFragment__create_your_pin">Pincode aanmaken</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Lees meer over pincodes</string>
+  <string name="KbsSplashFragment__disable_pin">PIN uitschakelen</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Voer je Signal-pincode in</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Om je te helpen je pincode te onthouden vraagt Signal je periodiek om je pincode opnieuw in te voeren. Als je die een aantal keer juist invoert, dan zal Signal dit na verloop van tijd minder vaak vragen.</string>
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@ -897,10 +897,7 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Utwórz nowy PIN</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Uwaga</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Pominięcie tworzenia PINu spowoduje utworzenie ukrytego, powiązanego z Twoim kontem kodu PIN o wysokiej entropii, którego nie można odzyskać. Kiedy ponownie zarejestrujesz się w Signal, stracisz wszystkie dane, chyba, że ręcznie utworzysz i przywrócisz kopię zapasową. Gdy PIN jest wyłączony, nie możesz włączyć blokady rejestracji.</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skip_pin_creation">Pomiń tworzenie PINu</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disable_pin_title">Wyłączyć PIN?</string> -->
-  <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Wyłączenie PINu spowoduje utworzenie ukrytego, powiązanego z Twoim kontem kodu PIN o wysokiej entropii, którego nie można odzyskać. Kiedy ponownie zarejestrujesz się w Signal, stracisz wszystkie dane, chyba, że ręcznie utworzysz i przywrócisz kopię zapasową. Gdy PIN jest wyłączony, nie możesz włączyć blokady rejestracji.</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Wyłączenie PINu spowoduje utworzenie ukrytego, powiązanego z Twoim kontem kodu PIN o wysokiej entropii, którego nie można odzyskać. Kiedy ponownie zarejestrujesz się w Signal, stracisz wszystkie dane, chyba, że ręcznie utworzysz i przywrócisz kopię zapasową. Gdy PIN jest wyłączony, nie możesz włączyć blokady rejestracji.</string> -->
  <string name="PinOptOutDialog_disable_pin">Wyłącz PIN</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Oceń tę aplikację</string>
@ -1707,7 +1704,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
  <string name="preferences__theme">Motyw</string>
  <string name="preferences__disable_pin">Wyłącz PIN</string>
  <string name="preferences__enable_pin">Włącz PIN</string>
-  <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Wyłączenie PINu spowoduje utworzenie ukrytego, powiązanego z Twoim kontem kodu PIN o wysokiej entropii, którego nie można odzyskać. Kiedy ponownie zarejestrujesz się w Signal, stracisz wszystkie dane, chyba, że ręcznie utworzysz i przywrócisz kopię zapasową. Gdy PIN jest wyłączony, nie możesz włączyć blokady rejestracji.</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Wyłączenie PINu spowoduje utworzenie ukrytego, powiązanego z Twoim kontem kodu PIN o wysokiej entropii, którego nie można odzyskać. Kiedy ponownie zarejestrujesz się w Signal, stracisz wszystkie dane, chyba, że ręcznie utworzysz i przywrócisz kopię zapasową. Gdy PIN jest wyłączony, nie możesz włączyć blokady rejestracji.</string> -->
  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">Kody PIN gwarantują, że informacje przechowywane w Signal są zaszyfrowane i tylko Ty masz do nich dostęp. Twój profil, ustawienia i kontakty zostaną przywrócone, gdy ponownie zainstalujesz Signal. Nie będziesz potrzebować swojego kodu PIN do otwarcia aplikacji.</string>
  <string name="preferences__system_default">Domyślny systemu</string>
  <string name="preferences__default">Domyślne</string>
@ -1944,7 +1941,7 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
  <string name="KbsSplashFragment__update_pin">Uaktualnij PIN</string>
  <string name="KbsSplashFragment__create_your_pin">Utwórz swój PIN</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Dowiedz się więcej o kodach PIN</string>
-  <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__skip_pin_creation">Pomiń tworzenie PINu</string> -->
+  <string name="KbsSplashFragment__disable_pin">Wyłącz PIN</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Wpisz swój PIN Signal</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Aby pomóc Ci zapamiętać Twój kod PIN, będziemy co jakiś czas o niego pytać. Z czasem pytania będą coraz rzadsze.</string>
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@ -46,6 +46,10 @@
  <string name="ApplicationPreferencesActivity_privacy_summary">Blocare ecran %1$s, Blocare înregistrare %2$s</string>
  <string name="ApplicationPreferencesActivity_privacy_summary_screen_lock">Blocare ecran %1$s</string>
  <string name="ApplicationPreferencesActivity_appearance_summary">Tema %1$s, Limba %2$s</string>
+  <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">Codurile PIN sunt necesare pentru blocarea înregistrării. Pentru a dezactiva codurile PIN, vă rugăm mai întâi să dezactivați blocarea înregistrării.</string>
+  <string name="ApplicationPreferencesActivity_failed_to_disable_pins_try_again_later">Dezactivarea codurilor PIN nu a reușit. Încercați mai târziu.</string>
+  <string name="ApplicationPreferencesActivity_pin_created">Pin creat.</string>
+  <string name="ApplicationPreferencesActivity_pin_disabled">Pin dezactivat.</string>
  <!--AppProtectionPreferenceFragment-->
  <plurals name="AppProtectionPreferenceFragment_minutes">
    <item quantity="one">%d minut</item>
@ -661,6 +665,7 @@
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Ai primit un mesaj care a fost criptat cu o versiune mai veche de Signal care nu mai este suportată. Roagă-l pe expeditor să-și actualizeze aplicația la ultima versiune și să retrimită mesajul.</string>
  <string name="MessageRecord_left_group">Ați părăsit grupul.</string>
  <string name="MessageRecord_you_updated_group">Ați actualizat grupul.</string>
+  <string name="MessageRecord_the_group_was_updated">Grupul a fost actualizat.</string>
  <string name="MessageRecord_you_called">Ați apelat</string>
  <string name="MessageRecord_called_you">Contactul te-a sunat</string>
  <string name="MessageRecord_missed_call">Apel nepreluat</string>
@ -673,6 +678,7 @@
  <string name="MessageRecord_s_disabled_disappearing_messages">%1$s a dezactivat dispariția mesajelor.</string>
  <string name="MessageRecord_you_set_disappearing_message_time_to_s">Ați setat timpul pentru dispariția mesajelor la %1$s.</string>
  <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s a setat timpul pentru dispariția mesajelor la %2$s.</string>
+  <string name="MessageRecord_disappearing_message_time_set_to_s">Timpul setat pentru dispariția mesajele a fost setat la %1$s.</string>
  <!--GV2 specific-->
  <string name="MessageRecord_you_created_the_group">Ați creat grupul.</string>
  <string name="MessageRecord_group_updated">Grupul a fost actualizat.</string>
@ -688,6 +694,8 @@
  <string name="MessageRecord_s_removed_you_from_the_group">%1$s v-a scos din grup.</string>
  <string name="MessageRecord_you_left_the_group">Ați părăsit grupul.</string>
  <string name="MessageRecord_s_left_the_group">%1$s a părăsit grupul.</string>
+  <string name="MessageRecord_you_are_no_longer_in_the_group">Nu mai faci parte din grup.</string>
+  <string name="MessageRecord_s_is_no_longer_in_the_group">%1$s nu mai face parte din grup.</string>
  <!--GV2 role change-->
  <string name="MessageRecord_you_made_s_an_admin">L-ați făcut pe %1$s admin.</string>
  <string name="MessageRecord_s_made_s_an_admin">%1$s l-a făcut pe %2$s admin.</string>
@ -695,7 +703,10 @@
  <string name="MessageRecord_you_revoked_admin_privileges_from_s">Ați revocat privilegiile admin de la %1$s.</string>
  <string name="MessageRecord_s_revoked_your_admin_privileges">%1$s a revocat privilegiile dvs. de admin.\"</string>
  <string name="MessageRecord_s_revoked_admin_privileges_from_s">%1$s a revocat privilegiile de admin pentru %2$s.</string>
+  <string name="MessageRecord_s_is_now_an_admin">%1$s este acum admin.</string>
  <string name="MessageRecord_you_are_now_an_admin">Sunteți acum admin.</string>
+  <string name="MessageRecord_s_is_no_longer_an_admin">%1$s nu mai este admin.</string>
+  <string name="MessageRecord_you_are_no_longer_an_admin">Nu mai ești admin.</string>
  <!--GV2 invitations-->
  <string name="MessageRecord_you_invited_s_to_the_group">Ai invitat pe %1$s la grup.</string>
  <string name="MessageRecord_s_invited_you_to_the_group">%1$s v-a invitat la grup.</string>
@ -705,6 +716,11 @@
    <item quantity="other">%1$s a invitat %2$d persoane la grup.</item>
  </plurals>
  <string name="MessageRecord_you_were_invited_to_the_group">Ai fost invitat la grup.</string>
+  <plurals name="MessageRecord_d_people_were_invited_to_the_group">
+    <item quantity="one">O persoană a fost invitată la grup.</item>
+    <item quantity="few">%1$d persoane au fost invitate la grup.</item>
+    <item quantity="other">%1$d persoane au fost invitate la grup.</item>
+  </plurals>
  <!--GV2 invitation revokes-->
  <plurals name="MessageRecord_you_revoked_invites">
    <item quantity="one">Ați revocat o invitație la grup.</item>
@ -719,6 +735,11 @@
  <string name="MessageRecord_someone_declined_an_invitation_to_the_group">Cineva a refuzat o invitație la grup.</string>
  <string name="MessageRecord_you_declined_the_invitation_to_the_group">Ați refuzat invitația la grup.</string>
  <string name="MessageRecord_your_invitation_to_the_group_was_revoked">Invitația dvs. la grup a fost revocată.</string>
+  <plurals name="MessageRecord_d_invitations_were_revoked">
+    <item quantity="one">O invitație la grup a fost revocată.</item>
+    <item quantity="few">%1$d  invitații la grup au fost revocate.</item>
+    <item quantity="other">%1$d invitații la grup au fost revocate.</item>
+  </plurals>
  <!--GV2 invitation acceptance-->
  <string name="MessageRecord_you_accepted_invite">Ați acceptat invitația la grup.</string>
  <string name="MessageRecord_s_accepted_invite">%1$s a acceptat o invitație la grup.</string>
@ -727,15 +748,19 @@
  <!--GV2 title change-->
  <string name="MessageRecord_you_changed_the_group_name_to_s">Ai schimbat numele grupului în \"%1$s\".</string>
  <string name="MessageRecord_s_changed_the_group_name_to_s">%1$s a schimbat numele grupului în \"%2$s\".</string>
+  <string name="MessageRecord_the_group_name_has_changed_to_s">Numele grupului a fost schimbat în \"%1$s\".</string>
  <!--GV2 avatar change-->
  <string name="MessageRecord_you_changed_the_group_avatar">Ai schimbat avatarul grupului.</string>
  <string name="MessageRecord_s_changed_the_group_avatar">%1$s a schimbat avatarul grupului.</string>
+  <string name="MessageRecord_the_group_group_avatar_has_been_changed">Avatarul grupului a fost schimbat.</string>
  <!--GV2 attribute access level change-->
  <string name="MessageRecord_you_changed_who_can_edit_group_info_to_s">Ați modificat cine poate edita detaliile grupului la \"%1$s\".</string>
  <string name="MessageRecord_s_changed_who_can_edit_group_info_to_s">%1$s a modificat cine poate edita detaliile grupului la \"%2$s\".</string>
+  <string name="MessageRecord_who_can_edit_group_info_has_been_changed_to_s">Persoana care poate edita detaliile grupului este acum \"%1$s\".</string>
  <!--GV2 membership access level change-->
  <string name="MessageRecord_you_changed_who_can_edit_group_membership_to_s">Ați modificat cine poate edita apartenența la grup la \"%1$s\".</string>
  <string name="MessageRecord_s_changed_who_can_edit_group_membership_to_s">%1$s a modificat cine poate edita apartenența la grup la \"%2$s\".</string>
+  <string name="MessageRecord_who_can_edit_group_membership_has_been_changed_to_s">Persoana care poate edita apartenența la grup este acum \"%1$s\".</string>
  <!--End of GV2 specific update messages-->
  <string name="MessageRecord_your_safety_number_with_s_has_changed">Numărul dvs. de siguranță pentru %s s-a schimbat.</string>
  <string name="MessageRecord_you_marked_your_safety_number_with_s_verified">Ați marcat numărul tău de siguranță cu %s ca și verificat</string>
@ -835,6 +860,8 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Creați un PIN nou</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Avertizare</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Dezactivarea codului PIN va crea un cod PIN ascuns, de mare entropie, asociat contului dvs. care nu poate fi recuperat. Când vă înregistrați din nou la Signal, veți pierde toate datele cu excepția cazului când faceți backup și restaurați manual. Nu puteți activa Blocarea înregistrării dacă codul PIN este dezactivat.</string> -->
+  <string name="PinOptOutDialog_disable_pin">Dezactivare PIN</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Evaluați aplicaţia</string>
  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Dacă vă place aplicaţia, vă rog ajutați-ne cu o evaluare.</string>
@ -950,6 +977,7 @@ furnizat (%s) este invalid.</string>
  <string name="SignalPinReminders_well_remind_you_again_in_a_few_days">Vă reamintim în câteva zile.</string>
  <string name="SignalPinReminders_well_remind_you_again_in_a_week">Vă reamintim într-o săptămână.</string>
  <string name="SignalPinReminders_well_remind_you_again_in_a_couple_weeks">Vă reamintim în câteva săptămâni.</string>
+  <string name="SignalPinReminders_well_remind_you_again_in_a_month">Vă reamintim într-o lună.</string>
  <!--Slide-->
  <string name="Slide_image">Imagine</string>
  <string name="Slide_sticker">Autocolant</string>
@ -1106,6 +1134,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
  <string name="MediaPreviewActivity_media_delete_confirmation_title">Șterg mesajul?</string>
  <string name="MediaPreviewActivity_media_delete_confirmation_message">Această acțiune va șterge permanent mesajul.</string>
  <string name="MediaPreviewActivity_s_to_s">%1$s la %2$s</string>
+  <string name="MediaPreviewActivity_media_no_longer_available">Media nu mai este disponibilă.</string>
  <!--MessageNotifier-->
  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d mesaje noi în %2$d conversaţii</string>
  <string name="MessageNotifier_most_recent_from_s">Cel mai recent de la: %1$s</string>
@ -1250,6 +1279,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
  <string name="ContactSelectionListFragment_s_is_not_a_signal_user">\"%1$s\" nu este un utilizator de Signal. Verificați numele de utilizator și încercați din nou.</string>
  <string name="ContactSelectionListFragment_okay">Okay</string>
  <string name="ContactSelectionListFragment_the_group_is_full">Grupul este plin</string>
+  <string name="ContactSelectionListFragment_you_do_not_need_to_add_yourself_to_the_group">Nu trebuie să vă adăugați pe sine la grup</string>
  <!--blocked_contacts_fragment-->
  <string name="blocked_contacts_fragment__no_blocked_contacts">Nu aveți contacte blocate</string>
  <!--contact_selection_list_fragment-->
@ -1627,10 +1657,15 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
  <string name="preferences__dark_theme">Întunecată</string>
  <string name="preferences__appearance">Aspect</string>
  <string name="preferences__theme">Tema</string>
+  <string name="preferences__disable_pin">Dezactivare PIN</string>
+  <string name="preferences__enable_pin">Activare PIN</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Dezactivarea codului PIN va crea un cod PIN ascuns, de mare entropie, asociat contului dvs. care nu poate fi recuperat. Când vă înregistrați din nou la Signal, veți pierde toate datele cu excepția cazului când faceți backup și restaurați manual. Nu puteți activa Blocarea înregistrării dacă codul PIN este dezactivat.</string> -->
+  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">PIN-urile păstrează informațiile stocate în Signal criptate, astfel încât numai tu să le poți accesa. Profilul, setările și contactele se vor restabili atunci când reinstalați Signal. Nu aveți nevoie de PIN pentru a deschide aplicația.</string>
  <string name="preferences__system_default">Setarea telefonului</string>
  <string name="preferences__default">Implicit</string>
  <string name="preferences__language">Limba</string>
  <string name="preferences__signal_messages_and_calls">Mesaje și apeluri Signal</string>
+  <string name="preferences__advanced_pin_settings">Setări PIN avansate</string>
  <string name="preferences__free_private_messages_and_calls">Mesaje și apeluri, private şi gratuite cu utilizatorii Signal
    </string>
  <string name="preferences__submit_debug_log">Trimiteți jurnalul de depanare</string>
@ -1839,6 +1874,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
  <string name="CreateKbsPinFragment__create_a_new_pin">Creați un nou PIN</string>
  <string name="CreateKbsPinFragment__you_can_choose_a_new_pin_as_long_as_this_device_is_registered">Puteți schimba codul PIN atât timp cât acest dispozitiv este înregistrat.</string>
  <string name="CreateKbsPinFragment__create_your_pin">Creați-vă PIN-ul</string>
+  <string name="CreateKbsPinFragment__pins_keep_information_stored_with_signal_encrypted">PIN-urile păstrează informațiile stocate în Signal criptate, astfel încât numai tu să le poți accesa. Profilul, setările și contactele se vor restabili atunci când reinstalați Signal.</string>
  <string name="CreateKbsPinFragment__choose_a_stronger_pin">Alegeți un PIN mai puternic</string>
  <!--ConfirmKbsPinFragment-->
  <string name="ConfirmKbsPinFragment__pins_dont_match">PIN-urile nu se potrivesc. Încercați din nou.</string>
@ -1850,6 +1886,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
  <string name="ConfirmKbsPinFragment__creating_pin">Se creează PIN-ul…</string>
  <!--KbsSplashFragment-->
  <string name="KbsSplashFragment__introducing_pins">Vă prezentăm PIN-uri</string>
+  <string name="KbsSplashFragment__pins_keep_information_stored_with_signal_encrypted">PIN-urile păstrează informațiile stocate în Signal criptate, astfel încât numai tu să le poți accesa. Profilul, setările și contactele se vor restabili atunci când reinstalați Signal.</string>
  <string name="KbsSplashFragment__learn_more">Află mai multe</string>
  <string name="KbsSplashFragment__registration_lock_equals_pin">Blocarea Înregistrării = PIN</string>
  <string name="KbsSplashFragment__your_registration_lock_is_now_called_a_pin">Blocarea înregistrării este numită acum PIN și face mai multe. Actualizați-l acum.</string>
@ -1857,6 +1894,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
  <string name="KbsSplashFragment__update_pin">Actualizați PIN</string>
  <string name="KbsSplashFragment__create_your_pin">Creați-vă PIN-ul</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Aflați mai multe despre PIN-uri</string>
+  <string name="KbsSplashFragment__disable_pin">Dezactivare PIN</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Introduceți PIN-ul dvs. Signal</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Pentru a vă ajuta să memorați codul PIN, vă vom rugă să îl introduceți periodic. În timp, o să-l cerem mai rar.</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@ -798,7 +798,6 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Vytvoriť nový PIN</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Varovanie</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">PIN creation will create a hidden, high-entropy PIN associated with your account that is unrecoverable. When you re-register Signal you will lose all data unless you manually back up and restore. You can not turn on Registration Lock while the PIN is disabled.</string> -->
  <string name="PinOptOutDialog_disable_pin">Vypnúť PIN</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Ohodnotiť túto aplikáciu</string>
@ -1797,6 +1796,7 @@ Bola prijatá správa výmeny kľúčov s neplatnou verziou protokolu.
  <string name="KbsSplashFragment__update_pin">Aktualizovať PIN kód</string>
  <string name="KbsSplashFragment__create_your_pin">Vytvorte si PIN</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Dozvedieť sa viac o PINoch</string>
+  <string name="KbsSplashFragment__disable_pin">Vypnúť PIN</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Zadajte váš PIN pre Signal</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Aby sme vám pomohli zapamätať si váš PIN kód, budeme vás opakovanie žiadať o jeho zadanie. Postupom času vás o to budeme žiadať menej často.</string>
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@ -821,10 +821,7 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Krijoni PIN të ri</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Paralajmërim</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Anashkalimi i krijimit të PIN-it do të krijojë një PIN të fshehur, me entropi të lartë, përshoqëruar llogarisë tuaj, i cili është i pakthyeshëm. Kur të riregjistroni Signal-in, do të humbni krejt të dhënat, veç në i kopjeruajtshi dhe rikthefshi dorazi. S’mund të aktivizoni Kyçje Regjistrimi, teksa PIN-i është i çaktivizuar.</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skip_pin_creation">Anashkalo krijim PIN-i</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disable_pin_title">Të çaktivizohet PIN-i?</string> -->
-  <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Çaktivizimi i PIN-it do të krijojë një PIN të fshehur, me entropi të lartë, përshoqëruar llogarisë tuaj, i cili është i pakthyeshëm. Kur të riregjistroni Signal-in, do të humbni krejt të dhënat, veç në i kopjeruajtshi dhe rikthefshi dorazi. S’mund të aktivizoni Kyçje Regjistrimi, teksa PIN-i është i çaktivizuar.</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Çaktivizimi i PIN-it do të krijojë një PIN të fshehur, me entropi të lartë, përshoqëruar llogarisë tuaj, i cili është i pakthyeshëm. Kur të riregjistroni Signal-in, do të humbni krejt të dhënat, veç në i kopjeruajtshi dhe rikthefshi dorazi. S’mund të aktivizoni Kyçje Regjistrimi, teksa PIN-i është i çaktivizuar.</string> -->
  <string name="PinOptOutDialog_disable_pin">Çaktivizoje PIN-in</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Vlerësojeni këtë aplikacion</string>
@ -1613,7 +1610,7 @@
  <string name="preferences__theme">Temë</string>
  <string name="preferences__disable_pin">Çaktivizoje PIN-in</string>
  <string name="preferences__enable_pin">Aktivizoje PIN-in</string>
-  <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Çaktivizimi i PIN-it do të krijojë një PIN të fshehur, me entropi të lartë, përshoqëruar llogarisë tuaj, i cili është i pakthyeshëm. Kur të riregjistroni Signal-in, do të humbni krejt të dhënat, veç në i kopjeruajtshi dhe rikthefshi dorazi. S’mund të aktivizoni Kyçje Regjistrimi, teksa PIN-i është i çaktivizuar.</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Çaktivizimi i PIN-it do të krijojë një PIN të fshehur, me entropi të lartë, përshoqëruar llogarisë tuaj, i cili është i pakthyeshëm. Kur të riregjistroni Signal-in, do të humbni krejt të dhënat, veç në i kopjeruajtshi dhe rikthefshi dorazi. S’mund të aktivizoni Kyçje Regjistrimi, teksa PIN-i është i çaktivizuar.</string> -->
  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">PIN-et i mbajnë të fshehtëzuara të dhëna e depozituara me Signal, që kështu të mund t’i përdorni. Profili, rregullimet dhe kontaktet tuaja do të rikthehen, kur të riinstaloni Signal-in. S’do t’ju duhet PIN-i për të hapur aplikacionin.</string>
  <string name="preferences__system_default">Parazgjedhje sistemi</string>
  <string name="preferences__default">Parazgjedhje</string>
@ -1844,7 +1841,7 @@
  <string name="KbsSplashFragment__update_pin">Përditësoni PIN-in</string>
  <string name="KbsSplashFragment__create_your_pin">Krijoni PIN-in tuaj</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Mësoni më tepër rreth PIN-ësh</string>
-  <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__skip_pin_creation">Anashkalo krijim PIN-i</string> -->
+  <string name="KbsSplashFragment__disable_pin">Çaktivizoje PIN-in</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Jepni PIN-in tuaj për Signal-in</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">Për t’ju ndihmuar të fiksoni në kujtesë PIN,-in tuaj, do t’ju kërkojmë në mënyrë periodike ta jepni. Me kalimin e kohës do t’jua kërkojmë më rrallë.</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@ -821,10 +821,7 @@
  <string name="PinRestoreLockedFragment_create_new_pin">Skapa ny PIN-kod</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">Varning</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">Överhoppning av PIN-kod skapar en dold PIN-kod med hög entropi som är kopplad till ditt konto som inte kan återvinnas. När du registrerar Signal om igen förlorar du all data om du inte säkerhetskopierar och återställer manuellt. Du kan inte sätta på registreringslåset medan PIN-koden är inaktiverad.</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skip_pin_creation">Hoppa över skapande av PIN-kod</string> -->
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disable_pin_title">Inaktivera PIN-koden?</string> -->
-  <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Om du inaktiverar PIN-koden skapas en dold PIN-kod med hög entropi som är kopplad till ditt konto som inte kan återvinnas. När du registrerar Signal om igen förlorar du all data om du inte säkerhetskopierar och återställer manuellt. Du kan inte sätta på registreringslås medan PIN-koden är inaktiverad.</string>
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Om du inaktiverar PIN-koden skapas en dold PIN-kod med hög entropi som är kopplad till ditt konto som inte kan återvinnas. När du registrerar Signal om igen förlorar du all data om du inte säkerhetskopierar och återställer manuellt. Du kan inte sätta på registreringslås medan PIN-koden är inaktiverad.</string> -->
  <string name="PinOptOutDialog_disable_pin">Inaktivera PIN-koden</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Betygsätt denna app</string>
@ -1611,7 +1608,7 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
  <string name="preferences__theme">Tema</string>
  <string name="preferences__disable_pin">Inaktivera PIN-koden</string>
  <string name="preferences__enable_pin">Aktivera PIN-koden</string>
-  <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Om du inaktiverar PIN-koden skapas en dold PIN-kod med hög entropi som är kopplad till ditt konto som inte kan återvinnas. När du registrerar Signal om igen förlorar du all data om du inte säkerhetskopierar och återställer manuellt. Du kan inte sätta på registreringslås medan PIN-koden är inaktiverad.</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Om du inaktiverar PIN-koden skapas en dold PIN-kod med hög entropi som är kopplad till ditt konto som inte kan återvinnas. När du registrerar Signal om igen förlorar du all data om du inte säkerhetskopierar och återställer manuellt. Du kan inte sätta på registreringslås medan PIN-koden är inaktiverad.</string> -->
  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">PIN-koden håller information lagrad med Signal krypterad så att du bara kan komma åt den. Din profil, inställningar och kontakter kommer att återställas när du installerar om. Du behöver inte din PIN-kod för att öppna appen.</string>
  <string name="preferences__system_default">Systemets standardinställning</string>
  <string name="preferences__default">Standard</string>
@ -1842,7 +1839,7 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
  <string name="KbsSplashFragment__update_pin">Uppdatera PIN-kod</string>
  <string name="KbsSplashFragment__create_your_pin">Skapa din PIN-kod</string>
  <string name="KbsSplashFragment__learn_more_about_pins">Läs mer om PIN-koder</string>
-  <!-- Removed by excludeNonTranslatables <string name="KbsSplashFragment__skip_pin_creation">Hoppa över skapande av PIN-kod</string> -->
+  <string name="KbsSplashFragment__disable_pin">Inaktivera PIN-koden</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">Ange din Signal PIN-kod</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">För att hjälpa dig att memorera din PIN-kod ber vi dig att skriva in den regelbundet. Vi ber dig färre gånger med tiden.</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -42,6 +42,10 @@
  <string name="ApplicationPreferencesActivity_privacy_summary">螢幕鎖定 %1$s，註冊鎖定 %2$s</string>
  <string name="ApplicationPreferencesActivity_privacy_summary_screen_lock">螢幕鎖%1$s</string>
  <string name="ApplicationPreferencesActivity_appearance_summary">主題 %1$s，語言 %2$s</string>
+  <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PIN碼是註冊鎖定所必需的。 要停用PIN碼，請先關閉註冊鎖功能。</string>
+  <string name="ApplicationPreferencesActivity_failed_to_disable_pins_try_again_later">關閉 PIN碼失敗，稍後再試。</string>
+  <string name="ApplicationPreferencesActivity_pin_created">PIN碼已被建立。</string>
+  <string name="ApplicationPreferencesActivity_pin_disabled">PIN碼已被停用。</string>
  <!--AppProtectionPreferenceFragment-->
  <plurals name="AppProtectionPreferenceFragment_minutes">
    <item quantity="other">%d 分鐘</item>
@ -779,7 +783,7 @@
  <string name="PinRestoreLockedFragment_create_new_pin">建立新的PIN碼</string>
  <!--PinOptOutDialog-->
  <string name="PinOptOutDialog_warning">警告</string>
-  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_skipping_pin_creation_will_create_a_hidden_high_entropy_pin">跳過PIN碼建立將建立與你的帳號相關隱藏的、高機密性的PIN碼且不可回復。 重新註冊Signal時，除非手動備份和還原，否則所有資料都會遺失。 停用PIN碼時無法開啟註冊鎖定。</string> -->
+  <!-- Removed by excludeNonTranslatables <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">停用PIN碼將建立與你的帳號相關聯的隱藏的，高隱密的PIN碼，該PIN碼無法回復。 重新註冊Signal時，除非手動備份和還原，否則所有資料都會遺失。 停用PIN碼時無法開啟註冊鎖。</string> -->
  <string name="PinOptOutDialog_disable_pin">停用PIN碼</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">評分這個應用程式</string>
@ -1053,6 +1057,7 @@
  <string name="MediaPreviewActivity_media_delete_confirmation_title">刪除訊息？</string>
  <string name="MediaPreviewActivity_media_delete_confirmation_message">這將永久刪除此訊息。</string>
  <string name="MediaPreviewActivity_s_to_s">%1$s到%2$s</string>
+  <string name="MediaPreviewActivity_media_no_longer_available">媒體不可再使用。</string>
  <!--MessageNotifier-->
  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d 則新訊息在 %2$d 的對話中</string>
  <string name="MessageNotifier_most_recent_from_s">最新來自：%1$s</string>
@ -1557,11 +1562,13 @@
  <string name="preferences__theme">主題</string>
  <string name="preferences__disable_pin">停用PIN碼</string>
  <string name="preferences__enable_pin">啟用PIN碼</string>
+  <!-- Removed by excludeNonTranslatables <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">停用PIN碼將建立與你的帳號相關聯的隱藏的，高隱密的PIN碼，該PIN碼無法回復。 重新註冊Signal時，除非手動備份和還原，否則所有資料都會遺失。 停用PIN碼時無法開啟註冊鎖。</string> -->
  <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">PIN碼會以Signal加密方式儲存訊息，因此只有你可以讀取。 重新安裝後，你的個人資料，設定和聯絡人將回復。 你不需要PIN碼即可開啟應用程式。</string>
  <string name="preferences__system_default">系統預設</string>
  <string name="preferences__default">預設</string>
  <string name="preferences__language">語言選項</string>
  <string name="preferences__signal_messages_and_calls">Signal 訊息與通話</string>
+  <string name="preferences__advanced_pin_settings">進階PIN碼設定</string>
  <string name="preferences__free_private_messages_and_calls">免費加密訊息與通話至 Signal 使用者</string>
  <string name="preferences__submit_debug_log">送出偵錯日誌</string>
  <string name="preferences__support_wifi_calling">\"WiFi 呼叫\"相容模式</string>
@ -1763,6 +1770,7 @@
  <string name="CreateKbsPinFragment__create_a_new_pin">建立一個新 PIN 碼</string>
  <string name="CreateKbsPinFragment__you_can_choose_a_new_pin_as_long_as_this_device_is_registered">只要註冊了此裝置，你就可以變更PIN碼。</string>
  <string name="CreateKbsPinFragment__create_your_pin">建立你的 PIN 碼</string>
+  <string name="CreateKbsPinFragment__pins_keep_information_stored_with_signal_encrypted">PIN碼會以Signal加密方式儲存訊息，因此只有你可以讀取。 重新安裝後，你的個人資料，設定和聯絡人將回復。 你不需要PIN碼即可開啟應用程式。</string>
  <string name="CreateKbsPinFragment__choose_a_stronger_pin">請選擇強度較強的PIN碼</string>
  <!--ConfirmKbsPinFragment-->
  <string name="ConfirmKbsPinFragment__pins_dont_match">PIN碼不符合。請重試一次。</string>
@ -1774,6 +1782,7 @@
  <string name="ConfirmKbsPinFragment__creating_pin">建立PIN碼中…</string>
  <!--KbsSplashFragment-->
  <string name="KbsSplashFragment__introducing_pins">介紹 PIN 碼</string>
+  <string name="KbsSplashFragment__pins_keep_information_stored_with_signal_encrypted">PIN碼會以Signal加密方式儲存訊息，因此只有你可以讀取。 重新安裝後，你的個人資料，設定和聯絡人將回復。 你不需要PIN碼即可開啟應用程式。</string>
  <string name="KbsSplashFragment__learn_more">了解更多</string>
  <string name="KbsSplashFragment__registration_lock_equals_pin">註冊鎖 = PIN 碼</string>
  <string name="KbsSplashFragment__your_registration_lock_is_now_called_a_pin">你的註冊鎖現在稱為PIN碼，並且功能更多。 請立即更新。</string>
@ -1781,6 +1790,7 @@
  <string name="KbsSplashFragment__update_pin">升級PIN碼</string>
  <string name="KbsSplashFragment__create_your_pin">建立你的 PIN 碼</string>
  <string name="KbsSplashFragment__learn_more_about_pins">了解更多有關 PIN 碼</string>
+  <string name="KbsSplashFragment__disable_pin">停用PIN碼</string>
  <!--KBS Reminder Dialog-->
  <string name="KbsReminderDialog__enter_your_signal_pin">輸入你的 Signal PIN 碼</string>
  <string name="KbsReminderDialog__to_help_you_memorize_your_pin">為了幫助你記住PIN碼，我們會要求你定期輸入。 我們會漸漸地減少要求。</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -55,8 +55,8 @@
    <string name="ApplicationPreferencesActivity_appearance_summary">Theme %1$s, Language %2$s</string>
    <string name="ApplicationPreferencesActivity_pins_are_required_for_registration_lock">PINs are required for registration lock. To disable PINs, please first disable registration lock.</string>
    <string name="ApplicationPreferencesActivity_failed_to_disable_pins_try_again_later">Failed to disable PINs. Try again later.</string>
-    <string name="ApplicationPreferencesActivity_pin_created">Pin created.</string>
-    <string name="ApplicationPreferencesActivity_pin_disabled">Pin disabled.</string>
+    <string name="ApplicationPreferencesActivity_pin_created">PIN created.</string>
+    <string name="ApplicationPreferencesActivity_pin_disabled">PIN disabled.</string>

    <!-- AppProtectionPreferenceFragment -->
    <plurals name="AppProtectionPreferenceFragment_minutes">
@ -959,7 +959,7 @@

    <!-- PinOptOutDialog -->
    <string name="PinOptOutDialog_warning">Warning</string>
-    <string name="PinOptOutDialog_disabling_pins_will_create_a_hidden_high_entropy_pin">Disabling PIN will create a hidden, high-entropy PIN associated with your account that is unrecoverable. When you re-register Signal you will lose all data unless you manually back up and restore. You can not turn on Registration Lock while the PIN is disabled.</string>
+    <string name="PinOptOutDialog_if_you_disable_the_pin_you_will_lose_all_data">If you disable the PIN, you will lose all data when you re-register Signal unless you manually back up and restore. You can not turn on Registration Lock while the PIN is disabled.</string>
    <string name="PinOptOutDialog_disable_pin">Disable PIN</string>

    <!-- RatingManager -->
@ -1903,7 +1903,7 @@
    <string name="preferences__theme">Theme</string>
    <string name="preferences__disable_pin">Disable PIN</string>
    <string name="preferences__enable_pin">Enable PIN</string>
-    <string name="preferences__disabling_pins_will_create_a_hidden_high_entropy_pin">Disabling PIN will create a hidden, high-entropy PIN associated with your account that is unrecoverable. When you re-register Signal you will lose all data unless you manually back up and restore. You can not turn on Registration Lock while the PIN is disabled.</string>
+    <string name="preferences__if_you_disable_the_pin_you_will_lose_all_data">If you disable the PIN, you will lose all data when you re-register Signal unless you manually back up and restore. You can not turn on Registration Lock while the PIN is disabled.</string>
    <string name="preferences__pins_keep_information_stored_with_signal_encrypted_so_only_you_can_access_it">PINs keep information stored with Signal encrypted so only you can access it. Your profile, settings, and contacts will restore when you reinstall. You won’t need your PIN to open the app.</string>
    <string name="preferences__system_default">System default</string>
    <string name="preferences__default">Default</string>
--- a/app/src/main/res/xml/preferences_advanced_pin.xml
+++ b/app/src/main/res/xml/preferences_advanced_pin.xml
@ -8,7 +8,7 @@
  <Preference
      android:key="pref_pin_disable"
      android:title="@string/preferences__disable_pin"
-      android:summary="@string/preferences__disabling_pins_will_create_a_hidden_high_entropy_pin"
+      android:summary="@string/preferences__if_you_disable_the_pin_you_will_lose_all_data"
      app:isPreferenceVisible="false"
      tools:isPreferenceVisible="true"/>