Bump version to 4.32.6

Updated language translations.
Use orientation in media picker to determine width and height.
2026-04-14 05:53:19 +01:00 · 2019-01-17 12:33:41 -08:00 · 2019-01-17 12:33:41 -08:00 · 2019-01-17 12:33:41 -08:00 · 2019-01-17 11:42:01 -08:00 · 2019-01-16 14:34:36 -08:00
79 changed files with 1961 additions and 876 deletions
--- a/build.gradle
+++ b/build.gradle
@@ -73,7 +73,7 @@ dependencies {
    compile 'com.android.support:multidex:1.0.3'
    compile 'android.arch.lifecycle:extensions:1.1.1'
    compile 'android.arch.lifecycle:common-java8:1.1.1'
-    compile 'android.arch.work:work-runtime:1.0.0-beta01'
+    compile 'android.arch.work:work-runtime:1.0.0-beta02'

    compile 'com.google.android.gms:play-services-gcm:16.0.0'
    compile 'com.google.android.gms:play-services-maps:16.0.0'
@@ -170,7 +170,7 @@ dependencyVerification {
        'com.android.support:gridlayout-v7:5029529f7db66f8773426bf7318645f0840fc50d74f66355cd60c5e58d2da087',
        'com.android.support:exifinterface:bbf44e519edd6333a24a3285aa21fd00181b920b81ca8aa89a8899f03ab4d6b0',
        'com.android.support:multidex:ecf6098572e23b5155bab3b9a82b2fd1530eda6c6c157745e0f5287c66eec60c',
-        'android.arch.work:work-runtime:810fba0ee8fc58560664b58c6dba532eae05e3d196e9ee5ae78c1f22bdb292bb',
+        'android.arch.work:work-runtime:a865eaf55179bb800f04b04f2fa35c3c4d1108c550bc6b447bca168dac16b56e',
        'android.arch.lifecycle:extensions:429426b2feec2245ffc5e75b3b5309bedb36159cf06dc71843ae43526ac289b6',
        'android.arch.lifecycle:common-java8:7078b5c8ccb94203df9cc2a463c69cf0021596e6cf966d78fbfd697aaafe0630',
        'com.google.android.gms:play-services-gcm:921b4651a2f4d108753f8b4c5d3844b5f8c1f3c31b740c80f69765082713d004',
@@ -223,7 +223,7 @@ dependencyVerification {
        'com.android.support:customview:98db03845f994e08248bf701c1ff0ccaa12e70f94251ec9272900f0f694e072b',
        'com.android.support:swiperefreshlayout:a3b41f7f6730866b49865e86e49f988d4858699765f534300fb2ff5f9325e712',
        'com.android.support:asynclayoutinflater:115bde87721f7334579b0c735f60dd7c98af1bb7f34010c5b0553b95dc351aa2',
-        'android.arch.persistence.room:runtime:c21810eaafce370f1c9df1365393f55f962370a0d8b0b38b4771052c7021b737',
+        'android.arch.persistence.room:runtime:d05c78d494dc700fd6dbc0e873451aebb2510ffbb070c82179055cb10bdd8822',
        'com.android.support:support-core-utils:c81e1e98ca3cb2edae002c69cf35b22aec364b8cb2f1042c97e206eb5790ac41',
        'com.android.support:loader:920b85efd72dc33e915b0f88a883fe73b88483c6df8751a741e17611f2460341',
        'com.android.support:support-vector-drawable:f658986d968172bccfed28578471c96050780fe5e133861e4d331069cc373f4d',
@@ -238,9 +238,9 @@ dependencyVerification {
        'com.github.bumptech.glide:gifdecoder:59ccf3bb0cec11dab4b857382cbe0b171111b6fc62bf141adce4e1180889af15',
        'com.android.support:interpolator:7bc7ee86a0db39a4b51956f3e89842d2bd962118d57d779eb6ed6b34ba0677ea',
        'com.android.support:cursoradapter:87feffe742b8d62ca8a9833abe564838bf6a672e31c7ad1306ec4006adf90d21',
-        'android.arch.persistence.room:common:7cf36bcd5f59ddc4876f887e36511bfd7b111f1eb717c0e9b6e2bcc710305ae6',
-        'android.arch.persistence:db-framework:bd665448330acb90a6f551a87b0ba69169da2b8ec168b92f387997339cc14311',
-        'android.arch.persistence:db:504e8c4307bfd53084924776ba3d49fed11b6f76d82dd80d5121c2d907fdfef6',
+        'android.arch.persistence.room:common:fa506873be8a7de9685389b6539ad5849b39731328454b6db151bcab8a9577c3',
+        'android.arch.persistence:db-framework:f9d1629574008e815a494390857f2125cb3e2cfc291aef8b63625bb3fdc5f360',
+        'android.arch.persistence:db:4ed3c473a2da0944203a66a9e84f4c2fb3bca9854c5d4a263a56b1aec4a52e74',
        'android.arch.core:runtime:c3215aa5873311b3f88a6f4e4a3c25ad89971bc127de8c3e1291c57f93a05c39',
        'android.arch.core:common:3a616a32f433e9e23f556b38575c31b013613d3ae85206263b7625fe1f4c151a',
        'android.arch.lifecycle:viewmodel:7de29cfaba77d6b5d5be234c57f6812d0150d087e63941af22ba1d1f8e2bc96a',
@@ -288,8 +288,8 @@ android {
    }

    defaultConfig {
-        versionCode 440
-        versionName "4.32.0"
+        versionCode 446
+        versionName "4.32.6"

        minSdkVersion 14
        targetSdkVersion 26
--- a/res/layout/album_thumbnail_2.xml
+++ b/res/layout/album_thumbnail_2.xml
@@ -4,19 +4,19 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/album_thumbnail_root"
    android:orientation="horizontal"
-    android:layout_width="300dp"
-    android:layout_height="150dp">
+    android:layout_width="@dimen/album_total_width"
+    android:layout_height="@dimen/album_2_total_height">

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_1"
-        android:layout_height="150dp"
-        android:layout_width="149dp"
+        android:layout_width="@dimen/album_2_cell_width"
+        android:layout_height="@dimen/album_2_total_height"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_2"
-        android:layout_height="150dp"
-        android:layout_width="149dp"
+        android:layout_width="@dimen/album_2_cell_width"
+        android:layout_height="@dimen/album_2_total_height"
        android:layout_gravity="right|end"
        app:thumbnail_radius="0dp"/>

--- a/res/layout/album_thumbnail_3.xml
+++ b/res/layout/album_thumbnail_3.xml
@@ -3,26 +3,26 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/album_thumbnail_root"
-    android:layout_width="300dp"
-    android:layout_height="200dp">
+    android:layout_width="@dimen/album_total_width"
+    android:layout_height="@dimen/album_3_total_height">

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_1"
-        android:layout_height="200dp"
-        android:layout_width="199dp"
+        android:layout_width="@dimen/album_3_cell_width_big"
+        android:layout_height="@dimen/album_3_total_height"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_2"
-        android:layout_height="99dp"
-        android:layout_width="99dp"
+        android:layout_width="@dimen/album_3_cell_size_small"
+        android:layout_height="@dimen/album_3_cell_size_small"
        android:layout_gravity="right|end|top"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_3"
-        android:layout_height="99dp"
-        android:layout_width="99dp"
+        android:layout_width="@dimen/album_3_cell_size_small"
+        android:layout_height="@dimen/album_3_cell_size_small"
        android:layout_gravity="right|end|bottom"
        app:thumbnail_radius="0dp"/>

--- a/res/layout/album_thumbnail_4.xml
+++ b/res/layout/album_thumbnail_4.xml
@@ -3,33 +3,33 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/album_thumbnail_root"
-    android:layout_width="300dp"
-    android:layout_height="300dp">
+    android:layout_width="@dimen/album_total_width"
+    android:layout_height="@dimen/album_4_total_height">

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_1"
-        android:layout_height="149dp"
-        android:layout_width="149dp"
+        android:layout_width="@dimen/album_4_cell_size"
+        android:layout_height="@dimen/album_4_cell_size"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_2"
-        android:layout_height="149dp"
-        android:layout_width="149dp"
+        android:layout_width="@dimen/album_4_cell_size"
+        android:layout_height="@dimen/album_4_cell_size"
        android:layout_gravity="right|end|top"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_3"
-        android:layout_height="149dp"
-        android:layout_width="149dp"
+        android:layout_width="@dimen/album_4_cell_size"
+        android:layout_height="@dimen/album_4_cell_size"
        android:layout_gravity="left|start|bottom"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_4"
-        android:layout_height="149dp"
-        android:layout_width="149dp"
+        android:layout_width="@dimen/album_4_cell_size"
+        android:layout_height="@dimen/album_4_cell_size"
        android:layout_gravity="right|end|bottom"
        app:thumbnail_radius="0dp"/>

--- a/res/layout/album_thumbnail_5.xml
+++ b/res/layout/album_thumbnail_5.xml
@@ -3,40 +3,40 @@
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    android:id="@+id/album_thumbnail_root"
-    android:layout_width="300dp"
-    android:layout_height="250dp">
+    android:layout_width="@dimen/album_total_width"
+    android:layout_height="@dimen/album_5_total_height">

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_1"
-        android:layout_height="149dp"
-        android:layout_width="149dp"
+        android:layout_width="@dimen/album_5_cell_size_big"
+        android:layout_height="@dimen/album_5_cell_size_big"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_2"
-        android:layout_height="149dp"
-        android:layout_width="149dp"
+        android:layout_width="@dimen/album_5_cell_size_big"
+        android:layout_height="@dimen/album_5_cell_size_big"
        android:layout_gravity="right|end|top"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_3"
-        android:layout_height="99dp"
-        android:layout_width="99dp"
+        android:layout_width="@dimen/album_5_cell_size_small"
+        android:layout_height="@dimen/album_5_cell_size_small"
        android:layout_gravity="left|start|bottom"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_4"
-        android:layout_height="99dp"
-        android:layout_width="99dp"
+        android:layout_width="@dimen/album_5_cell_size_small"
+        android:layout_height="@dimen/album_5_cell_size_small"
        android:layout_gravity="center_horizontal|bottom"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_5"
-        android:layout_height="99dp"
-        android:layout_width="99dp"
+        android:layout_width="@dimen/album_5_cell_size_small"
+        android:layout_height="@dimen/album_5_cell_size_small"
        android:layout_gravity="right|end|bottom"
        app:thumbnail_radius="0dp"/>

--- a/res/layout/album_thumbnail_many.xml
+++ b/res/layout/album_thumbnail_many.xml
@@ -4,39 +4,39 @@
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:id="@+id/album_thumbnail_root"
-    android:layout_width="300dp"
-    android:layout_height="250dp">
+    android:layout_width="@dimen/album_total_width"
+    android:layout_height="@dimen/album_5_total_height">

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_1"
-        android:layout_height="149dp"
-        android:layout_width="149dp"
+        android:layout_width="@dimen/album_5_cell_size_big"
+        android:layout_height="@dimen/album_5_cell_size_big"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_2"
-        android:layout_height="149dp"
-        android:layout_width="149dp"
+        android:layout_width="@dimen/album_5_cell_size_big"
+        android:layout_height="@dimen/album_5_cell_size_big"
        android:layout_gravity="right|end|top"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_3"
-        android:layout_height="99dp"
-        android:layout_width="99dp"
+        android:layout_width="@dimen/album_5_cell_size_small"
+        android:layout_height="@dimen/album_5_cell_size_small"
        android:layout_gravity="left|start|bottom"
        app:thumbnail_radius="0dp"/>

    <org.thoughtcrime.securesms.components.ThumbnailView
        android:id="@+id/album_cell_4"
-        android:layout_height="99dp"
-        android:layout_width="99dp"
+        android:layout_width="@dimen/album_5_cell_size_small"
+        android:layout_height="@dimen/album_5_cell_size_small"
        android:layout_gravity="center_horizontal|bottom"
        app:thumbnail_radius="0dp"/>

    <FrameLayout
-        android:layout_width="99dp"
-        android:layout_height="99dp"
+        android:layout_width="@dimen/album_5_cell_size_small"
+        android:layout_height="@dimen/album_5_cell_size_small"
        android:layout_gravity="right|end|bottom">

        <org.thoughtcrime.securesms.components.ThumbnailView
--- a/res/layout/mediapicker_media_item.xml
+++ b/res/layout/mediapicker_media_item.xml
@@ -46,7 +46,7 @@
        android:id="@+id/mediapicker_selected"
        android:layout_width="match_parent"
        android:layout_height="match_parent"
-        android:background="@color/transparent_black_70"
+        android:background="@color/transparent_black_90"
        android:visibility="gone">

        <ImageView
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -159,6 +159,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">يحتاج Signal إلى إذن الكاميرا من أجل التقاط صور وفيديو  ولكن تم إيقاف الإذن على نحو دائم، رجاء زيارة إعدادات التطبيق ثم \"الأذونات\"، ثم تفعيل \"الكاميرا\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">يحتاج Signal إلي إذن الكاميرا لالتقاط صور أو فيديو</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_yes">نعم</string>
+  <string name="ConversationActivity_no">لا</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="zero">رسالة %d غير مقرؤة</item>
@@ -420,6 +422,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">رسالة وسائط متعددة</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">تنزيل رسالة الوسائط المتعددة</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">خطأ في تنزيل رسالة الوسائط المتعددة، انقر لاعادة المحاولة</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">جميع الوسائط</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">لقد استلمت رسالة مشفرة من إصدارة Signal قديمة وتوقف دعمها. من فضلك اطلب من الراسل الترقية إلي أحدث إصدار وإعادة إرسال الرسالة.</string>
  <string name="MessageRecord_left_group">لقد تركت المجموعة.</string>
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -154,6 +154,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal се нуждае от достъп до камерта Ви, за да може да прави снимки или видеота, но той му е отказан. Моля, отидете в настройки в менюто и изберете \"Разрешения\" и \"Камера\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal се нуждае от достъп до камерата, за да прави снимки и видеота</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Да</string>
+  <string name="ConversationActivity_no">Не</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d непрочетено съобщение</item>
@@ -371,6 +373,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Мултимедийно съобщение</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Изтегляне на MMS съобщение</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Грешка при изтегляне на MMS съобщение, натиснете за да опитате повторно</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Всички прикачените файлове</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Получихте съобщение криптирано със стара версия на Signal, която вече не се поддържа. Моля, помолете изпращача да обнови версията си и да препрати съобщението.</string>
  <string name="MessageRecord_left_group">Напуснахте групата.</string>
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -154,6 +154,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">El Signal necessita el permís de la càmera per tal de fer fotografies i vídeos, però s\'ha denegat permanentment. Si us plau, continueu cap al menú de configuració de l\'aplicació, seleccioneu Permisos i habiliteu-hi la càmera.</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">El Signal necessita el permís de la càmera per fer fotografies i vídeos.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">El Signal no pot enviar missatges SMS / MMS perquè no és la vostra aplicació d\'SMS predeterminada. Voleu canviar-ho a la configuració d\'Android?</string>
+  <string name="ConversationActivity_yes">Sí</string>
+  <string name="ConversationActivity_no">No</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d missatge sense llegir</item>
@@ -371,6 +374,14 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Missatge multimèdia</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">S\'està baixant el missatge MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">S\'ha produït un error en baixar el missatge MMS. Toqueu per tornar a intentar-ho</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Envia-ho a %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Feu un toc per seleccionar-ho</string>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Afegiu-hi un títol...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Tot el contingut</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">S\'ha rebut un missatge encriptat amb una versió antiga del Signal que ja no s\'admet. Digueu-li a l\'emissor que l\'actualitzi a la versió més recent i torni a enviar el missatge.</string>
  <string name="MessageRecord_left_group">Heu abandonat el grup.</string>
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -160,6 +160,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signál potřebuje oprávnění pro přístup k fotoaparátu aby mohl pořizovat fotografie nebo video, ale toto oprávnění je nyní zakázáno. Prosím pokračujte do menu nastavení aplikací, vyberte \"Oprávnění\" a povolte \"Fotoaparát\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signál potřebuje přístup k fotoaparátu aby mohl pořizovat fotografie nebo videa.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Ano</string>
+  <string name="ConversationActivity_no">Ne</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d nepřečtená zpráva</item>
@@ -407,6 +409,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimediální zpráva</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Stahuji MMS zprávu</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Chyba při stahování MMS zprávy, ťukněte pro opakování</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Všechna media</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Přijata zpráva šifrovaná starou verzí Signal, která již není podporována. Prosím požádejte odesílatele, aby si zaktualizoval aplikaci na nejnovější verzi a poté poslal zprávu znovu.</string>
  <string name="MessageRecord_left_group">Opustil(a) jste skupinu</string>
--- a/res/values-cy/strings.xml
+++ b/res/values-cy/strings.xml
@@ -162,6 +162,8 @@ Send neges heb ei ddiogelu?</string>
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Mae Signal angen caniatâd Camera er mwyn atodi tynnu lluniau neu fideos, ond fe\'i rwystrwyd yn barhaol. Ewch i ddewislen gosodiadau\'r ap, dewis "Caniatâd", a galluogi "Camera".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Angen Signal angen caniatâd camera i dynnu lluniau neu fideo</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Iawn</string>
+  <string name="ConversationActivity_no">Na</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d neges heb ei ddarllen</item>
@@ -409,6 +411,11 @@ Send neges heb ei ddiogelu?</string>
  <string name="NotificationMmsMessageRecord_multimedia_message">Neges amlgyfrwng</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Lawrlwytho neges MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Gwall wrth lawrlwytho neges MMS, tapio i geisio eto</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Pob cyfrwng</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Wedi derbyn neges wedi\'i hamgryptio gan ddefnyddio hen fersiwn o Signal nad yw bellach yn cael ei gefnogi. Gofynnwch i\'r anfonwr ddiweddaru i\'r fersiwn ddiweddaraf ac ail-anfon y neges.</string>
  <string name="MessageRecord_left_group">Rydych wedi gadael y grŵp.</string>
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -27,9 +27,9 @@
  <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Dette vil permanent låse op for Signal og besked notifikationer</string>
  <string name="ApplicationPreferencesActivity_disable">Deaktivér</string>
  <string name="ApplicationPreferencesActivity_unregistering">Afregistrerer</string>
-  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Afmeld Signal beskeder og - opkald...</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Deaktivér Signal beskeder og - opkald?</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Deaktivér Signal beskeder og - opkald ved at afregistrere serveren. Du er nødt til at genregistrere dit telefonnummer for at bruge det igen i fremtiden</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Afmeld Signal beskeder og opkald...</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Deaktivér Signal beskeder og opkald?</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Deaktivér Signal beskeder og opkald ved at afregistrere på serveren. Du er nødt til igen at registrere dit telefonnummer, for at bruge det igen i fremtiden</string>
  <string name="ApplicationPreferencesActivity_error_connecting_to_server">Kan ikke oprette forbindelse til serveren</string>
  <string name="ApplicationPreferencesActivity_sms_enabled">SMS slået til</string>
  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Brug som standard SMS-program</string>
@@ -126,7 +126,7 @@
  <string name="ConversationActivity_message_is_empty_exclamation">Beskeden er tom!</string>
  <string name="ConversationActivity_group_members">Gruppemedlemmer</string>
  <string name="ConversationActivity_invalid_recipient">Ugyldig modtager!</string>
-  <string name="ConversationActivity_added_to_home_screen">Føjet til hjemmeskærm</string>
+  <string name="ConversationActivity_added_to_home_screen">Føjet til startskærm</string>
  <string name="ConversationActivity_calls_not_supported">Opkald er ikke understøttet</string>
  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Din enhed understøtter ikke initieret opkald.</string>
  <string name="ConversationActivity_leave_group">Forlad gruppe?</string>
@@ -155,6 +155,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal kræver tilladelse til at tilgå dit kamera, for at kunne tage billeder eller optage video, hvilket det er blevet nægtet. Gå venligst via appens menu til Indstillinger, vælg \"Tilladelser\" og tilvælg \"Kamera\"</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal kræver tilladelse til at tilgå kameraet, for at tage billeder og video</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signal kan ikke sende SMS/MMS beskeder, fordi det ikke er din standard besked app. Vil du ændre dette under Android indstillinger?</string>
+  <string name="ConversationActivity_yes">Ja</string>
+  <string name="ConversationActivity_no">Nej</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d ulæst besked</item>
@@ -167,7 +170,7 @@
  </plurals>
  <plurals name="ConversationFragment_this_will_permanently_delete_all_n_selected_messages">
    <item quantity="one">Dette vil slette den valgte besked permanent.</item>
-    <item quantity="other">Dette vil slette alle %1$d valgte beskeder permanent.</item>
+    <item quantity="other">Dette sletter de %1$d valgte beskeder permanent</item>
  </plurals>
  <string name="ConversationFragment_save_to_sd_card">Gem på lager?</string>
  <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
@@ -205,7 +208,7 @@
  </plurals>
  <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
    <item quantity="one">Dette vil slette den valgte samtale permanent.</item>
-    <item quantity="other">Dette vil slette alle %1$d valgte samtaler permanent</item>
+    <item quantity="other">Dette sletter de %1$d valgte samtaler permanent</item>
  </plurals>
  <string name="ConversationListFragment_deleting">Sletter</string>
  <string name="ConversationListFragment_deleting_selected_conversations">Sletter valgte samtaler...</string>
@@ -275,18 +278,18 @@
  <string name="ExperienceUpgradeActivity_ready_for_your_closeup">Er du klar til et nærbilled?</string>
  <string name="ExperienceUpgradeActivity_now_you_can_share_a_profile_photo_and_name_with_friends_on_signal">Nu kan du dele dit profilbillede og navn med dine venner på Signal</string>
  <string name="ExperienceUpgradeActivity_signal_profiles_are_here">Nu er der Signal profiler</string>
-  <string name="ExperienceUpgradeActivity_introducing_typing_indicators">Introducerer skriveindikatorer</string>
+  <string name="ExperienceUpgradeActivity_introducing_typing_indicators">Introducerer skrive indikatorer</string>
  <string name="ExperienceUpgradeActivity_now_you_can_optionally_see_and_share_when_messages_are_being_typed">Nu kan du vælge at se og vise, når beskeder skrives</string>
  <string name="ExperienceUpgradeActivity_would_you_like_to_enable_them_now">Vil du aktivere det nu?</string>
-  <string name="ExperienceUpgradeActivity_typing_ui_title">Skriveindikatorer er her</string>
-  <string name="ExperienceUpgradeActivity_enable_typing_indicators">Aktiver skriveindikatorer</string>
-  <string name="ExperienceUpgradeActivity_turn_on_typing_indicators">Aktiver skriveindikatorer</string>
+  <string name="ExperienceUpgradeActivity_typing_ui_title">Skrive indikatorer er her</string>
+  <string name="ExperienceUpgradeActivity_enable_typing_indicators">Aktivér skrive indikatorer</string>
+  <string name="ExperienceUpgradeActivity_turn_on_typing_indicators">Aktivér skrive indikatorer</string>
  <string name="ExperienceUpgradeActivity_no_thanks">Nej tak</string>
  <!--GcmBroadcastReceiver-->
  <string name="GcmBroadcastReceiver_retrieving_a_message">Modtager en meddelelse...</string>
  <!--GcmRefreshJob-->
  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent fejl i Signal-kommunikationen!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal var ude af stand til at registrere med Google Play Services. Signal beskeder og opkald blev deaktiveret, prøv venligst at registrere igen i Indstillinger &gt; Advanceret</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal var ude af stand til at registrere med Google Play Services. Signal beskeder og opkald blev deaktiverét, prøv venligst at registrere igen i Indstillinger &gt; Advanceret</string>
  <!--GiphyActivity-->
  <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Der opstod en fejl ved hentning af GIF i fuld opløsning</string>
  <!--GiphyFragmentPageAdapter-->
@@ -353,7 +356,7 @@
  </plurals>
  <plurals name="MediaOverviewActivity_Media_delete_confirm_message">
    <item quantity="one">d</item>
-    <item quantity="other">Dette vil slette alle %1$d beskeder permanent</item>
+    <item quantity="other">Dette sletter de %1$d beskeder permanent</item>
  </plurals>
  <string name="MediaOverviewActivity_Media_delete_progress_title">Sletter</string>
  <string name="MediaOverviewActivity_Media_delete_progress_message">Sletter beskeder...</string>
@@ -372,6 +375,18 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimediebesked</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Henter MMS...</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Kunne ikke hente MMS besked, tap for at prøve igen</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Send til %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Tap for at vælge</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="one">Du kan ikke dele flere end %d filer</item>
+    <item quantity="other">Du kan ikke dele flere end %d filer</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Tilføj en billedtekst...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Alle mediefiler</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Modtog en besked krypteret med en ældre version af Signal, der ikke længere understøttes. Bed venligst afsenderen om at opgradere til den nyeste version og sende beskeden igen</string>
  <string name="MessageRecord_left_group">Du har forladt gruppen.</string>
@@ -452,7 +467,7 @@
  <string name="RecipientPreferenceActivity_error_leaving_group">Der skete en fejl da du forlod gruppen</string>
  <string name="RecipientPreferenceActivity_unblock">Fjern blokering</string>
  <string name="RecipientPreferenceActivity_enabled">Aktiveret</string>
-  <string name="RecipientPreferenceActivity_disabled">Deaktiveret</string>
+  <string name="RecipientPreferenceActivity_disabled">Deaktiverét</string>
  <string name="RecipientPreferenceActivity_available_once_a_message_has_been_sent_or_received">Tilgengængelig når en besked er sendt eller modtaget</string>
  <!--RecipientProvider-->
  <string name="RecipientProvider_unnamed_group">Unavngivet gruppe</string>
@@ -539,7 +554,7 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
  <string name="ThreadRecord_missed_call">Mistet opkald</string>
  <string name="ThreadRecord_media_message">Mediebesked</string>
  <string name="ThreadRecord_s_is_on_signal">%s er på Signal!</string>
-  <string name="ThreadRecord_disappearing_messages_disabled">Beskeder med tidsudløb deaktiveret</string>
+  <string name="ThreadRecord_disappearing_messages_disabled">Beskeder med tidsudløb deaktiverét</string>
  <string name="ThreadRecord_disappearing_message_time_updated_to_s">Beskeder sat til at udløbe efter %s</string>
  <string name="ThreadRecord_safety_number_changed">Sikkerhedsnummer ændret</string>
  <string name="ThreadRecord_your_safety_number_with_s_has_changed">Dit identitestsnøgle med %s er ændret</string>
@@ -598,7 +613,7 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
  <string name="MediaPreviewActivity_signal_needs_the_storage_permission_in_order_to_write_to_external_storage_but_it_has_been_permanently_denied">Signal kræver tilladelse til at tilgå din hukommelse, for at kunne gemme til ekstern placering, hvilket det er blevet nægtet. Gå venligst via appens menu til Indstillinger, vælg \"Tilladelser\" og tilvælg \"Hukommelse\"</string>
  <string name="MediaPreviewActivity_unable_to_write_to_external_storage_without_permission">Ikke muligt at gemme til ekstern placering, uden tilladelse</string>
  <string name="MediaPreviewActivity_media_delete_confirmation_title">Slet besked?</string>
-  <string name="MediaPreviewActivity_media_delete_confirmation_message">Dette vil slette beskeden permanent</string>
+  <string name="MediaPreviewActivity_media_delete_confirmation_message">Dette sletter beskeden permanent</string>
  <!--MessageNotifier-->
  <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d nye beskeder i %2$d samtaler</string>
  <string name="MessageNotifier_most_recent_from_s">Seneste fra: %1$s</string>
@@ -681,7 +696,7 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
  <string name="change_passphrase_activity__new_passphrase">Nyt kodeord</string>
  <string name="change_passphrase_activity__repeat_new_passphrase">Gentag nyt kodeord</string>
  <!--contact_selection_activity-->
-  <string name="contact_selection_activity__enter_name_or_number">Indtast navn eller nummer</string>
+  <string name="contact_selection_activity__enter_name_or_number">Søg navn eller nummer</string>
  <!--contact_selection_group_activity-->
  <string name="contact_selection_group_activity__no_contacts">Ingen kontakter.</string>
  <string name="contact_selection_group_activity__finding_contacts">Indlæser kontakter...</string>
@@ -827,7 +842,7 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
  <string name="load_more_header__see_full_conversation">Se fuld samtale</string>
  <string name="load_more_header__loading">Henter</string>
  <!--media_overview_activity-->
-  <string name="media_overview_activity__no_media">Ingen mediefiler</string>
+  <string name="media_overview_activity__no_media">Ingen medie</string>
  <!--message_recipients_list_item-->
  <string name="message_recipients_list_item__view">VIS</string>
  <string name="message_recipients_list_item__resend">SEND IGEN</string>
@@ -924,7 +939,7 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
  <string name="arrays__mute_for_one_year">Dæmp 1 år</string>
  <string name="arrays__settings_default">Standardindstillinger</string>
  <string name="arrays__enabled">Aktiveret</string>
-  <string name="arrays__disabled">Deaktiveret</string>
+  <string name="arrays__disabled">Deaktiverét</string>
  <string name="arrays__name_and_message">Navn og besked</string>
  <string name="arrays__name_only">Kun navn</string>
  <string name="arrays__no_name_or_message">Hverken navn eller besked</string>
@@ -999,7 +1014,7 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
  <string name="preferences__mmsc_username">MMSC-brugernavn</string>
  <string name="preferences__mmsc_password">MMSC-kodeord</string>
  <string name="preferences__sms_delivery_reports">Leveringsrapport for SMS</string>
-  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Bed om en leveringsrapport for hver SMS-besked, du sender</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Modtag leveringsrapporter for SMS beskeder du sender</string>
  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Slet automatisk ældre beskeder når samtalen overstiger en specificeret længde</string>
  <string name="preferences__delete_old_messages">Slet gamle beskeder</string>
  <string name="preferences__chats">Chat og medier</string>
@@ -1020,10 +1035,10 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Aktivér hvis din enhed sender SMS/MMS via WiFI (aktivér kun, hvis WiFI-opkald er aktiveret på din enhed)</string>
  <string name="preferences__incognito_keyboard">Inkognito tastatur</string>
  <string name="preferences__read_receipts">Læst af modtager</string>
-  <string name="preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts">Hvis læst af modtager er deaktiveret, vil du ikke kunne se status for nogen overhovedet</string>
+  <string name="preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts">Hvis læst af modtager er deaktiverét, vil du ikke kunne se status for andre</string>
  <string name="preferences__typing_indicators">Skrive indikator</string>
-  <string name="preferences__if_typing_indicators_are_disabled_you_wont_be_able_to_see_typing_indicators">Hvis skrive indikator er deaktiveret, vil du ikke kunne se skrive indikator for andre</string>
-  <string name="preferences__request_keyboard_to_disable_personalized_learning">Bed tastatur om at slå personaliseret læring fra</string>
+  <string name="preferences__if_typing_indicators_are_disabled_you_wont_be_able_to_see_typing_indicators">Hvis skrive indikator er deaktiverét, vil du heller ikke kunne se når andre skriver</string>
+  <string name="preferences__request_keyboard_to_disable_personalized_learning">Deaktivér personaliseret læring fra tastaturet</string>
  <string name="preferences_app_protection__blocked_contacts">Blokerede kontakter</string>
  <string name="preferences_chats__when_using_mobile_data">Når der anvendes mobildata</string>
  <string name="preferences_chats__when_using_wifi">Når der anvendes WiFi</string>
@@ -1104,7 +1119,7 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
  <string name="conversation__menu_leave_group">Forlad gruppe</string>
  <string name="conversation__menu_view_all_media">Alle mediefiler</string>
  <string name="conversation__menu_conversation_settings">Samtaleindstillinger</string>
-  <string name="conversation__menu_add_shortcut">Føj til hjemmeskærm</string>
+  <string name="conversation__menu_add_shortcut">Føj til startskærm</string>
  <!--conversation_popup-->
  <string name="conversation_popup__menu_expand_popup">Udvid popup</string>
  <!--conversation_callable_insecure-->
@@ -1197,7 +1212,7 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
  <string name="BackupDialog_enable_backups">Aktiver backups</string>
  <string name="BackupDialog_please_acknowledge_your_understanding_by_marking_the_confirmation_check_box">Tilkendegiv venligst din forståelse, ved at sætte et flueben i feltet</string>
  <string name="BackupDialog_delete_backups">Slet backups?</string>
-  <string name="BackupDialog_disable_and_delete_all_local_backups">Deaktiver og slet alle lokale backups?</string>
+  <string name="BackupDialog_disable_and_delete_all_local_backups">Deaktivér og slet alle lokale backups?</string>
  <string name="BackupDialog_delete_backups_statement">Slet backups</string>
  <string name="BackupDialog_copied_to_clipboard">Kopieret til udklipsholder</string>
  <string name="ChatsPreferenceFragment_signal_requires_external_storage_permission_in_order_to_create_backups">Signal kræver tilladelse til at tilgå ekstern placering for at oprette backup´s, hvilket det er blevet nægtet. Gå venligst via appens menu til Indstillinger, vælg \"Tilladelser\" og tilvælg \"Hukommelse\"</string>
@@ -1214,7 +1229,7 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
  <string name="BackupUtil_unknown">Ukendt</string>
  <string name="preferences_app_protection__screen_lock">Skærmlås</string>
  <string name="preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint">Lås adgang til Signal med Android skærmlås eller fingeraftryk</string>
-  <string name="preferences_app_protection__screen_lock_inactivity_timeout">Skærmlås inaktivitets-timeout</string>
+  <string name="preferences_app_protection__screen_lock_inactivity_timeout">Timeout for inaktiv skærmlås</string>
  <string name="AppProtectionPreferenceFragment_none">Ingen</string>
  <string name="registration_activity__the_registration_lock_pin_is_not_the_same_as_the_sms_verification_code_you_just_received_please_enter_the_pin_you_previously_configured_in_the_application">Registreringskoden er ikke den samme som den kode du netop har modtaget på SMS. Indtast venligst den kode du tidligere har indtastet i applikationen</string>
  <string name="registration_activity__registration_lock_pin">Registreringslås-pinkode</string>
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -154,6 +154,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal benötigt die Berechtigung »Kamera« für die Aufnahme von Fotos oder Videos, diese wurde jedoch dauerhaft abgelehnt. Bitte öffne die App-Einstellungen, wähle »Berechtigungen« und aktiviere »Kamera«.</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal benötigt die Berechtigung »Kamera«, um Fotos oder Videos aufzunehmen.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signal kann keine SMS/MMS versenden, da es nicht als Standard-App für SMS festgelegt ist. Möchtest du dies in Androids Einstellungen ändern?</string>
+  <string name="ConversationActivity_yes">Ja</string>
+  <string name="ConversationActivity_no">Nein</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d ungelesene Nachricht</item>
@@ -371,6 +374,18 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">MMS</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS wird heruntergeladen …</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fehler beim Herunterladen der MMS. Für erneuten Versuch antippen.</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">An %s senden</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Zum Auswählen antippen</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="one">Du kannst nicht mehr als %d Element teilen.</item>
+    <item quantity="other">Du kannst nicht mehr als %d Elemente teilen.</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Beschriftung hinzufügen …</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Alle Medieninhalte</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Die empfangene Nachricht wurde mit einer veralteten Version von Signal verschlüsselt, die nicht mehr unterstützt wird. Bitte den Absender, Signal zu aktualisieren und die Nachricht erneut zu senden.</string>
  <string name="MessageRecord_left_group">Du hast die Gruppe verlassen</string>
@@ -430,7 +445,7 @@
  <string name="PushNotificationReceiveJob_retrieving_a_message">Nachricht wird abgerufen …</string>
  <!--RatingManager-->
  <string name="RatingManager_rate_this_app">Bewerte diese App</string>
-  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Hilf uns durch deine Bewertung, wenn dir die App gefällt.</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Hilf uns durch deine Bewertung, falls dir die App gefällt.</string>
  <string name="RatingManager_rate_now">Jetzt bewerten!</string>
  <string name="RatingManager_no_thanks">Nein danke</string>
  <string name="RatingManager_later">Später</string>
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -153,6 +153,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Το Signal χρειάζεται τα δικαιώματα Κάμερας για να μπορούμε να τραβήξουμε φωτογραφίες και βίντεο, αλλά αυτά δεν έχουν δοθεί μόνιμα. Παρακαλώ πήγαινε στις ρυθμίσεις εφαρμογών, επέλεξε τα \"Δικαιώματα\", και ενεργοποίησε την \"Κάμερα\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Το Signal χρειάζεται τα δικαιώματα Κάμερας για να τραβήξει φωτογραφίες ή βίντεο</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Ναι</string>
+  <string name="ConversationActivity_no">Όχι</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d μη αναγνωσμένο μήνυμα</item>
@@ -363,6 +365,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Μήνυμα πολυμέσων</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Το μήνυμα MMS λαμβάνεται</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Πρόβλημα κατά τη λήψη μηνύματος MMS, πάτα για να ξαναδοκιμάσουμε</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Όλα τα πολυμέσα</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Λήφθηκε ένα μήνυμα που είναι κρυπτογραφημένο με μια παλιά έκδοση του Signal που πλέον δεν υποστηρίζεται. Παρακαλώ ζήτησε από τον αποστολέα να αναβαθμίσει στην πιο πρόσφατη έκδοση και να ξαναστείλει το μήνυμα.</string>
  <string name="MessageRecord_left_group">Αποχώρησες από την ομάδα.</string>
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -154,6 +154,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal necesita acceso a la cámara para tomar fotos o vídeos. Por favor, ve al menú de configuración de la aplicación, selecciona «Permisos» y habilita «Cámara».</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal necesita acceder a la cámara para tomar fotos o vídeo.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signal no puede enviar SMS/MMS ya que no es la aplicación configurada por defecto. ¿Deseas cambiar la configuración de Android para que Signal sea la aplicación por defecto para SMS?</string>
+  <string name="ConversationActivity_yes">Sí</string>
+  <string name="ConversationActivity_no">No</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d mensaje no leído</item>
@@ -371,6 +374,18 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Mensaje multimedia</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Descargando mensaje MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fallo al descargar mensaje MMS, toca para reintentar</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Enviar a %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Toca para seleccionar</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="one">No se pueden compartir más de %d objetos.</item>
+    <item quantity="other">No se pueden compartir más de %d objetos.</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Añadir explicación ...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Archivos multimedia</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Se ha recibido un mensaje cifrado usando una versión de Signal antigua que ya no está disponible. Por favor, avisa al quien te lo ha enviado para que actualice a la versión más reciente y reenvíe el mensaje.</string>
  <string name="MessageRecord_left_group">Has abandonado el grupo.</string>
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -154,6 +154,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal vajab ligipääsu kaamerale, et salvestada fotosid ja videosid, kuid see on püsivalt keelatud. Palun ava rakenduse sätete menüü, vali \"Õigused\" ja luba \"Kaamera\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal vajab fotode ja videote salvestamiseks ligipääsu kaamerale</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Jah</string>
+  <string name="ConversationActivity_no">Ei</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d lugemata sõnum</item>
@@ -371,6 +373,12 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimeediasõnum</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Laadin alla MMS-sõnumit</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS-sõnumi allalaadimisel tekkis viga, koputa uuesti proovimiseks</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Lisa pealkiri...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Kogu meedia</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Vastuvõetud sõnum, mis on krüptitud kasutades vana, mittetoetatud Signali versiooni. Palun palu saatjal uuendada uusimale versioonile ja siis sõnum uuesti saata.</string>
  <string name="MessageRecord_left_group">Sa lahkusid grupist.</string>
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -154,6 +154,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signalek Kamera baimena behar du argazkiak eta bideoak egiteko, baina ukatu egin diozu. Joan aplikazioaren ezarpenetara, aukeratu \"Baimenak\" eta aktibatu \"Kamera\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signalek Kamera baimena behar du argazkiak eta bideoak egiteko</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_yes">Bai</string>
+  <string name="ConversationActivity_no">Ez</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d mezu irakurri gabe</item>
@@ -372,6 +374,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimedia mezua</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS mezu berria deskargatzen</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Errorea MMS mezua jaisterakoan, ukitu berriro saiatzeko</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Euskarri guztiak</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Signal bertsio zaharregitik jaso da mezu zifratua.  Eskatu igorleari birbidaltzeko mesedez bere Signal egiaztatu ondoren.</string>
  <string name="MessageRecord_left_group">Taldea utzi duzu.</string>
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -151,6 +151,8 @@
  <string name="ConversationActivity_signal_requires_the_microphone_permission_in_order_to_send_audio_messages">Signal برای ارسال صدا، نیازمند دسترسی به میکروفن دارد ولی این دسترسی قطع شده است. لطفا برای ادامه دادن، به بخش منوی تنظیمات برنامه رفته، \"اجازه ها\" را انتخاب کرده و گزینه ی \"میکروفن\" را فعال نمایید.</string>
  <string name="ConversationActivity_to_call_s_signal_needs_access_to_your_microphone_and_camera">برای تماس به %s Signal به دسترسی به میکروفن و دوربین شما نیاز دارد.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">بله</string>
+  <string name="ConversationActivity_no">خیر</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d پیام ناخوانده</item>
@@ -344,6 +346,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">پیام های چند رسانه ای</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">در حال بارگیری پیام چندرسانه‌ای...</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">بروز مشکل در دانلود پیام MMS، جهت تلاش دوباره تپ کنید</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">تمام رسانه ها</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">یک پیام رمزنگاری شده با استفاده از نسخه‌ای قدیمی از Signal که دیگر پشتیبانی نمی‌شود برایتان ارسال شده است، لطفاً از فرستنده بخواهید نرم‌افزار Signal خود را به آخرین نسخه بروزرسانی کرده و مجدداً پیام را برای شما ارسال کند.</string>
  <string name="MessageRecord_left_group">شما گروه را ترک کرده اید.</string>
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -154,6 +154,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal tarvitsee lupaa käyttää laitteesi kameraa kuvien ja videoiden ottamista varten, mutta tämä käyttöoikeus on pysyvästi evätty Signalilta. Voit muuttaa tätä menemällä sovellusten asetuksiin, valitsemalla \"Sovelluksen käyttöoikeudet\" ja laittamalla päälle \"Kamera\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal tarvitsee kameran käyttöoikeutta kuvien ja videoiden ottamista varten.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signal ei voi lähettää SMS/MMS-viestejä, koska se ei ole oletus tekstiviestisovellus. Haluatko muuttaa tätä Android-asetuksissa?</string>
+  <string name="ConversationActivity_yes">Kyllä</string>
+  <string name="ConversationActivity_no">Ei</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d lukematon viesti</item>
@@ -371,6 +374,18 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimediaviesti</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Ladataan MMS-viestiä</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Virhe ladattaessa MMS-viestiä. Yritä uudelleen napauttamalla.</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Lähetä yhteystiedolle %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Valitse napauttamalla</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="one">Et voi jakaa useampaa kuin %d kappale.</item>
+    <item quantity="other">Et voi jakaa useampaa kuin %d kappaletta.</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Lisää kuvateksti...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Kaikki media</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Vastaanotettiin viesti, joka on salattu Signalin vanhalla versiolla, jota ei enää tueta. Pyydä lähettäjää päivittämään uusimpaan versioon ja lähettämään viesti uudelleen.</string>
  <string name="MessageRecord_left_group">Olet lähtenyt ryhmästä.</string>
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -154,6 +154,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal a besoin de l’autorisation Appareil photo afin de prendre des photos ou des vidéos, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner Autorisations et activer Appareil photo.</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal a besoin de l’autorisation Appareil photo pour prendre des photos ou des vidéos</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Oui</string>
+  <string name="ConversationActivity_no">Non</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d message non lu</item>
@@ -371,6 +373,12 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Message multimédia</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Téléchargement du message multimédia</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Erreur de téléchargement du message multimédia. Touchez pour ressayer</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Ajouter un légende…</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Tous les médias</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Vous avez reçu un message chiffré avec une ancienne version de Signal qui n’est plus prise en charge. Veuillez demander à l’expéditeur de mettre Signal à jour vers la version la plus récente et de renvoyer son message.</string>
  <string name="MessageRecord_left_group">Vous avez quitté le groupe</string>
@@ -414,9 +422,9 @@
  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Désolé, trop d’appareils sont déjà reliés. Essayez d’en supprimer</string>
  <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Désolé, ceci n’est pas un code QR valide de liaison d’appareil</string>
  <string name="DeviceProvisioningActivity_link_a_signal_device">Relier un appareil Signal ?</string>
-  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Il semble que vous tentiez de relier un appareil Signal en utilisant un lecteur tiers. Pour votre protection, veuillez lire le code de nouveau à partir Signal.</string>
-  <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal a besoin de l’autorisation Appareil photo afin de lire un code QR, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner Autorisations et activer Appareil photo.</string>
-  <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Impossible de lire un code QR sans l’autorisation Appareil photo</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Il semble que vous tentiez de relier un appareil Signal en utilisant un lecteur tiers. Pour votre protection, veuillez balayer le code de nouveau à partir Signal.</string>
+  <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal a besoin de l’autorisation Appareil photo afin de balayer un code QR, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner Autorisations et activer Appareil photo.</string>
+  <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Impossible de balayer un code QR sans l’autorisation Appareil photo</string>
  <!--ExpirationDialog-->
  <string name="ExpirationDialog_disappearing_messages">Messages éphémères</string>
  <string name="ExpirationDialog_your_messages_will_not_expire">Vos messages n’expireront pas.</string>
@@ -557,13 +565,13 @@ Vous avez reçu un message d’échange de clés pour une version de protocole i
  <!--VerifyIdentityActivity-->
  <string name="VerifyIdentityActivity_your_contact_is_running_an_old_version_of_signal">Votre contact utilise une ancienne version de Signal. Veuillez lui demander de la mettre à jour avant de vérifier votre numéro de sécurité.</string>
  <string name="VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal">Votre contact utilise une version plus récente de Signal dont le format de code QR est incompatible. Veuillez mettre Signal à jour pour comparer.</string>
-  <string name="VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_safety_number">Le code QR lu n’est pas un code de vérification du numéro de sécurité correctement formaté. Veuillez essayer de le lire de nouveau.</string>
+  <string name="VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_safety_number">Le code QR balayé n’est pas un code de vérification du numéro de sécurité correctement formaté. Veuillez essayer de le balayer de nouveau.</string>
  <string name="VerifyIdentityActivity_share_safety_number_via">Partager le numéro de sécurité avec…</string>
  <string name="VerifyIdentityActivity_our_signal_safety_number">Notre numéro de sécurité Signal :</string>
  <string name="VerifyIdentityActivity_no_app_to_share_to">Vous semblez n’avoir aucune appli vers laquelle partager.</string>
  <string name="VerifyIdentityActivity_no_safety_number_to_compare_was_found_in_the_clipboard">Aucun numéro de sécurité à comparer n’a été trouvé dans le presse-papiers</string>
-  <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal a besoin de l’autorisation Appareil photo afin de lire un code QR, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner Autorisations et activer Appareil photo.</string>
-  <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Impossible de lire le code QR sans l’autorisation Appareil photo</string>
+  <string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal a besoin de l’autorisation Appareil photo afin de balayer un code QR, mais elle a été refusée définitivement. Veuillez accéder au menu des paramètres des applis, sélectionner Autorisations et activer Appareil photo.</string>
+  <string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Impossible de balayer le code QR sans l’autorisation Appareil photo</string>
  <!--MessageDisplayHelper-->
  <string name="MessageDisplayHelper_bad_encrypted_message">Mauvais message chiffré</string>
  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Message chiffré pour une session non existante</string>
@@ -729,7 +737,7 @@ Vous avez reçu un message d’échange de clés pour une version de protocole i
  <string name="country_selection_fragment__loading_countries">Chargement des pays…</string>
  <string name="country_selection_fragment__search">Chercher</string>
  <!--device_add_fragment-->
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Lire le code QR affiché sur l’appareil pour le relier</string>
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Balayez le code QR affiché sur l’appareil pour le relier</string>
  <!--device_link_fragment-->
  <string name="device_link_fragment__link_device">Relier l’appareil</string>
  <!--device_list_fragment-->
@@ -876,8 +884,8 @@ Vous avez reçu un message d’échange de clés pour une version de protocole i
  <string name="unknown_sender_view__add_to_contacts">AJOUTER AUX CONTACTS</string>
  <string name="unknown_sender_view__don_t_add_but_make_my_profile_visible">NE PAS AJOUTER, MAIS RENDRE MON PROFIL VISIBLE</string>
  <!--verify_display_fragment-->
-  <string name="verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Si vous souhaitez vérifier la sécurité de votre chiffrement avec %s, comparez le numéro ci-dessus avec le numéro sur son appareil. Vous pouvez également lire le code sur son téléphone ou lui demander de lire votre code. <a href="https://signal.org/redirect/safety-numbers">En savoir plus</a>.]]></string>
-  <string name="verify_display_fragment__tap_to_scan">Touchez pour lire</string>
+  <string name="verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Si vous souhaitez vérifier la sécurité de votre chiffrement avec %s, comparez le numéro ci-dessus avec le numéro sur son appareil. Vous pouvez également balayer le code sur son téléphone ou lui demander de balayer votre code. <a href="https://signal.org/redirect/safety-numbers">En savoir plus</a>.]]></string>
+  <string name="verify_display_fragment__tap_to_scan">Touchez pour balayer</string>
  <string name="verify_display_fragment__loading">Chargement…</string>
  <string name="verify_display_fragment__verified">Vérifié</string>
  <!--verify_identity-->
@@ -998,7 +1006,7 @@ Vous avez reçu un message d’échange de clés pour une version de protocole i
  <string name="preferences__chats">Conversations et média</string>
  <string name="preferences__conversation_length_limit">Limite de taille des conversations</string>
  <string name="preferences__trim_all_conversations_now">Réduire toutes les conversations maintenant</string>
-  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Passer en revue toutes les conversations et imposer des limites de longueur de conversation</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Analyser toutes les conversations et imposer des limites de longueur de conversation</string>
  <string name="preferences__linked_devices">Appareils reliés</string>
  <string name="preferences__light_theme">Clair</string>
  <string name="preferences__dark_theme">Sombre</string>
--- a/res/values-ga/strings.xml
+++ b/res/values-ga/strings.xml
@@ -152,6 +152,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Tá gá ag Signal le cead cheamara chun griangraif a thógáil nó físéan a dhéanamh, ach ní ceadaítear é go deo. Lean ar aghaidh, le do thoil, go socruithe aipe, roghnaigh \"Ceadanna\", agus cumasaigh \"Ceamara\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Tá gá ag Signal le ceadanna cheamara chun griangraif a thógáil nó físéan a dhéanamh.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Tá</string>
+  <string name="ConversationActivity_no">Níl</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d teachtaireacht neamhléite</item>
@@ -325,6 +327,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Teachtaireacht ilmheánach</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Ag íosluchtú teachtaireacht MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Tharla botún ag íosluchtú teachtaireacht MMS, cnag chun ath-íosluchtú.</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Gach meán</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Fuair teachtaireacht cripithe ón seanleagan Signal nach bhfuil taca go bhfóill. Fiafraigh an seoltóir an leagan is déanaí a úsáid agus an teachtaireacht a athsheoladh.</string>
  <string name="MessageRecord_left_group">D\'fhág tú an bhaicle.</string>
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -153,6 +153,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal necesita permiso para acceder á cámara e poder tirar fotografías, pero foi denegado de forma permanente. Vai aos axustes da aplicación, selecciona \"Permisos\" e activa \"Cámara\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal necesita permiso para acceder á cámara e tirar fotografías ou facer vídeos.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Si</string>
+  <string name="ConversationActivity_no">Non</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d mensaxe sen ler</item>
@@ -362,6 +364,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Mensaxe multimedia</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Descargando mensaxe MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Erro ao descargar a mensaxe MMS, toca para volver tentar</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Ficheiros multimedia</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Recibiuse unha mensaxe cifrada a través dunha versión antiga de Signal que xa non ten soporte. Por favor, pídelle ao remitente que actualice a súa versión e volva enviar a mensaxe.</string>
  <string name="MessageRecord_left_group">Abandonaches o grupo.</string>
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -148,6 +148,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal को फ़ोटो या वीडियो लेने के लिए कैमरा अनुमति की आवश्यकता होती है, लेकिन इसे स्थायी रूप से अस्वीकार कर दिया गया है। कृपया ऐप सेटिंग्स जारी रखें, \"अनुमतियां\" चुनें, और \"कैमरा\" सक्षम करें।</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal को फ़ोटो या वीडियो लेने के लिए कैमरा अनुमतियां चाहिए</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_yes">हाँ </string>
+  <string name="ConversationActivity_no">नहीं</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d अपठित संदेश</item>
@@ -356,6 +358,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">मल्टीमीडिया संदेश</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">एमएमएस संदेश डाउनलोड किया जा रहा है</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">एमएमएस संदेश डाउनलोड करने में त्रुटि, पुनः प्रयास करने के लिए टैप करें</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">सभी मीडिया</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Signal के पुराने संस्करण का उपयोग करके एन्क्रिप्ट किया गया एक संदेश प्राप्त हुआ जो अब समर्थित नहीं है। कृपया प्रेषक से नवीनतम संस्करण में अपडेट करने और संदेश भेजने के लिए कहें।</string>
  <string name="MessageRecord_left_group">आपने समूह छोड़ दिया है</string>
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -150,6 +150,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal zahtijeva dozvolu Kameri za fotografiranje ili snimanje videa, ali pristup biva odbijen. Molim nastavite s postavkama aplikacije, odaberite \"Dozvole\" i omogućite \"Kamera\". </string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal treba pristup kameri kako bi snimio slike ili video.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_yes">Da</string>
+  <string name="ConversationActivity_no">Ne</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d nepročitana poruka</item>
@@ -371,6 +373,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimedijalna poruka</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Preuzimanje MMS poruke</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Greška pri preuzimanju MMS poruke, pritisnite za ponovni pokušaj</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Svi mediji</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Primljena je poruka kriptirana starom inačicom Signal aplikacije koja više nije podržana. Molimo zapitajte pošiljatelja da ažurira na najnoviju inačicu aplikacije i ponovno pošalje poruku.</string>
  <string name="MessageRecord_left_group">Napustili ste grupu.</string>
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -155,6 +155,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">A Signal-nak szüksége van a Kamera engedélyre, hogy fotót vagy videót készíthessen, de ez jelenleg nincs megadva. Kérlek menj az alkalmazásbeállításokhoz, válaszd az \"Engedélyek\"-et és engedélyezd a \"Kamera\"-t.</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">A Signal-nak szüksége van Kamera engedélyekre fotók és videók készítéséhez</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">A Signal nem tud SMS/MMS üzeneteket küldeni, mert nem az alapértelmezett SMS alkalmazásod. Szeretnél változtatni ezen az Android beállításaidban?</string>
+  <string name="ConversationActivity_yes">Igen</string>
+  <string name="ConversationActivity_no">Nem</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d olvasatlan üzenet</item>
@@ -276,9 +279,9 @@
  <string name="ExperienceUpgradeActivity_now_you_can_share_a_profile_photo_and_name_with_friends_on_signal">Mostantól megoszthatod barátaiddal profilképedet és egyéni nevedet Signal-on</string>
  <string name="ExperienceUpgradeActivity_signal_profiles_are_here">A Signal profilok megérkeztek</string>
  <string name="ExperienceUpgradeActivity_introducing_typing_indicators">Bemutatjuk a gépelés-indikátorokat.</string>
-  <string name="ExperienceUpgradeActivity_now_you_can_optionally_see_and_share_when_messages_are_being_typed">Mostantól lehetőséged van megtekinteni és megosztani azt, hogy éppen gépelsz.</string>
+  <string name="ExperienceUpgradeActivity_now_you_can_optionally_see_and_share_when_messages_are_being_typed">Mostantól lehetőséged van megtekinteni és megosztani azt, hogy éppen gépel-e valaki.</string>
  <string name="ExperienceUpgradeActivity_would_you_like_to_enable_them_now">Szeretnéd most bekapcsolni?</string>
-  <string name="ExperienceUpgradeActivity_typing_ui_title">A gépelésindikátor megérkezett</string>
+  <string name="ExperienceUpgradeActivity_typing_ui_title">A gépelésindikátorok megérkeztek</string>
  <string name="ExperienceUpgradeActivity_enable_typing_indicators">Gépelésindikátor engedélyezése</string>
  <string name="ExperienceUpgradeActivity_turn_on_typing_indicators">Gépelésindikátor bekapcsolása</string>
  <string name="ExperienceUpgradeActivity_no_thanks">Nem, köszönöm</string>
@@ -372,6 +375,18 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimédia üzenet</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS üzenet letöltése</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Hiba történt az MMS üzenet letöltése során, koppints az újrapróbálkozáshoz</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Küldés neki: %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Koppints a kiválasztáshoz</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="one">Nem oszthatsz meg többet, mint %d db elem.</item>
+    <item quantity="other">Nem oszthatsz meg többet, mint %d db elem.</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Felirat hozzáadása...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Összes médiafájl</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Egy olyan üzenet érkezett, amely a Signal egy régebbi, már nem támogatott verziójával lett titkosítva. Kérd meg a feladót, hogy frissítsen a legfrissebb verzióra, majd küldje el újra az üzenetet!</string>
  <string name="MessageRecord_left_group">Kiléptél a csoportból.</string>
@@ -642,8 +657,8 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
  <string name="SingleRecipientNotificationBuilder_new_message">Új üzenet</string>
  <!--TransferControlView-->
  <plurals name="TransferControlView_n_items">
-    <item quantity="one">1%d Elem</item>
-    <item quantity="other">%d elem</item>
+    <item quantity="one">%d db elem</item>
+    <item quantity="other">%d db elem</item>
  </plurals>
  <!--UnauthorizedReminder-->
  <string name="UnauthorizedReminder_device_no_longer_registered">Az eszköz már nincs regisztrálva</string>
@@ -1023,7 +1038,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
  <string name="preferences__incognito_keyboard">Inkognitó billentyűzet</string>
  <string name="preferences__read_receipts">Olvasási nyugták</string>
  <string name="preferences__if_read_receipts_are_disabled_you_wont_be_able_to_see_read_receipts">Ha az olvasási nyugták le vannak tiltva, te sem fogod látni mások olvasási nyugtáit.</string>
-  <string name="preferences__typing_indicators">Gépelésindikátor</string>
+  <string name="preferences__typing_indicators">Gépelésindikátorok</string>
  <string name="preferences__if_typing_indicators_are_disabled_you_wont_be_able_to_see_typing_indicators">Ha a gépelés-indikátorod ki van kapcsolva, nem fogod látni mások gépelés-indikátorát sem.</string>
  <string name="preferences__request_keyboard_to_disable_personalized_learning">Tanulás letiltásának kérése a billentyűzettől (személyre szabás kikapcsolása)</string>
  <string name="preferences_app_protection__blocked_contacts">Blokkolt kontaktok</string>
@@ -1218,7 +1233,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
  <string name="preferences_app_protection__lock_signal_access_with_android_screen_lock_or_fingerprint">Signal-hoz való hozzáférés védelme Android képernyőzárral vagy ujjlenyomattal</string>
  <string name="preferences_app_protection__screen_lock_inactivity_timeout">Képernyő lezárása ennyi tétlenséget követően</string>
  <string name="AppProtectionPreferenceFragment_none">Egyik sem</string>
-  <string name="registration_activity__the_registration_lock_pin_is_not_the_same_as_the_sms_verification_code_you_just_received_please_enter_the_pin_you_previously_configured_in_the_application">A regisztrációs zár PIN nem ugyanaz mint az SMS ellenőrző kód, amit az imént kaptál. Kérlek add meg a PIN kódot, amelyet korábban az alkalmazásban állítottál be!</string>
+  <string name="registration_activity__the_registration_lock_pin_is_not_the_same_as_the_sms_verification_code_you_just_received_please_enter_the_pin_you_previously_configured_in_the_application">A regisztrációs zár PIN nem ugyanaz, mint az SMS ellenőrző kód, amit az imént kaptál. Kérlek add meg a PIN kódot, amelyet korábban az alkalmazásban állítottál be!</string>
  <string name="registration_activity__registration_lock_pin">Regisztrációs zár PIN</string>
  <string name="registration_activity__forgot_pin">Elfelejtetted PIN kódodat?</string>
  <string name="registration_lock_dialog_view__the_pin_can_consist_of_four_or_more_digits_if_you_forget_your_pin_you_could_be_locked_out_of_your_account_for_up_to_seven_days">A PIN kód négy vagy több számjegyből állhat. Ha elfelejted PIN kódodat, előfordulhat, hogy a rendszer maximum hét napra kizár fiókodból.</string>
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -151,6 +151,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal memerlukan izin Kamera untuk mengambil foto dan video, tetapi telah ditolak secara permanen. Silakan lanjut ke pengaturan aplikasi, pilih \"Perizinan\" dan aktifkan \"Kamera\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal memerlukan izin Kamera untuk mengambil foto atau video.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_yes">Ya</string>
+  <string name="ConversationActivity_no">Tidak</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="other">%d pesan belum dibaca</item>
@@ -353,6 +355,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Pesan multimedia</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Mengunduh pesan MMS.</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Gagal saat mengunduh pesan MMS, ketuk untuk mencoba lagi</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Semua media</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Menerima pesan terenkripsi menggunakan Signal versi lama tidak lagi didukung, Harap beri tahu pengirim untuk memutakhirkan ke versi terbaru dan kirim ulang pesannya.</string>
  <string name="MessageRecord_left_group">Anda telah keluar dari grup.</string>
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -154,6 +154,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal richiede l\'autorizzazione all\'uso della fotocamera per scattare foto o registrare video, ma è stata negata in modo permanente. Si prega di continuare al menu delle impostazioni dell\'app, selezionare \"Autorizzazioni\" e abilitare \"Fotocamera\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal richiede l\'autorizzazione all\'uso della fotocamera per scattare foto o registrare video</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Sì</string>
+  <string name="ConversationActivity_no">No</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d messaggio non letto</item>
@@ -372,6 +374,12 @@ I suoi messaggi e le chiamate sono state disabilitate, si prega di provare e ri-
  <string name="NotificationMmsMessageRecord_multimedia_message">Messaggio multimediale</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Scarico MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Errore nello scaricare MMS, premi per riprovare</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Aggiungi una didascalia...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Tutti i file multimediali</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Hai ricevuto un messaggio cifrato usando una vecchia versione di Signal che non è più supportata. Ti preghiamo di chiedere al mittente di aggiornare l\'app e rimandare il messaggio.</string>
  <string name="MessageRecord_left_group">Hai lasciato il gruppo.</string>
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -160,6 +160,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal צריך את הרשאת המצלמה כדי לצלם תצלומים או וידיאו, אבל היא נדחתה לצמיתות. אנא המשך אל הגדרות היישום, בחר \"הרשאות\" ואפשר את \"מצלמה\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal צריך הרשאות מצלמה כדי לצלם תצלומים או להקליט וידיאו</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_yes">כן</string>
+  <string name="ConversationActivity_no">לא</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">הודעה %d לא נקראה</item>
@@ -407,6 +409,12 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">הודעת מולטימדיה</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">מוריד הודעת MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">שגיאה בהורדת הודעת MMS, הקש כדי לנסות שוב</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">הוסף כיתוב...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">כל המדיה</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">התקבלה הודעה מוצפנת ע\"י שימוש בגרסה ישנה של Signal שאינה נתמכת יותר. אנא בקש מהשולח לעדכן אל הגרסה העדכנית ביותר ולשלוח מחדש את ההודעה.</string>
  <string name="MessageRecord_left_group">עזבת את הקבוצה.</string>
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -151,6 +151,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signalで写真や動画を撮るには、カメラへのアクセスを許可する必要がありますが、無効になっています。アプリ設定メニューから、『アプリの権限』を選び、『カメラ』へのアクセス許可を有効にしてください。</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signalで写真や動画を撮るには、カメラへのアクセス許可が必要です。</string>
  <string name="ConversationActivity_quoted_contact_message">%2$s%1$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signalは現在、デフォルトのショートメッセージアプリになっていないため、メッセージが送信できません。設定を変更しますか？</string>
+  <string name="ConversationActivity_yes">はい</string>
+  <string name="ConversationActivity_no">いいえ</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="other">%d通の未読メッセージ</item>
@@ -353,6 +356,14 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">マルチメディアメッセージ</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">MMSメッセージをダウンロード中</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMSメッセージのダウンロード中にエラーが発生しました。タップして再試行してください。</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">%sに送信</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">タップで選択</string>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">キャプション追加...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">すべてのメディア</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">受信したメッセージは古いSignalで暗号化されているので解読不能です。Signalをアップデートして再送するよう送信者にお願いしてください。</string>
  <string name="MessageRecord_left_group">グループを抜けました</string>
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -151,6 +151,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signalត្រូវការសិទ្ធិប្រើប្រាស់កាមេរ៉ាដើម្បីថតរូប ឬវីដេអូ ប៉ុន្តែវាត្រូវបានបដិសេធរហូត។ សូមបន្តទៅការកំណត់ជ្រើសរើស \"អនុញ្ញាត\" ហើយបើក \"កាមេរ៉ា\"។</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal សុំសិទ្ធិប្រើប្រាស់កាមេរ៉ា ដើម្បីថតរូបភាព ឬវីដេអូ</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">មែន</string>
+  <string name="ConversationActivity_no">ទេ</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="other">%d សារមិនទាន់អាន</item>
@@ -353,6 +355,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">សារចម្រុះ</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">កំពុងទាញយកសារ MMS </string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">មានបញ្ហាទាញយកសារMMS សូមចុច ដើម្បីព្យាយាមម្តងទៀត</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">ព័ត៌មានទាំងអស់</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">ទទួលបានសារដែលមានកាណាល់កូដសម្ងាត់ តែជាជំនាន់ចាស់របស់Signal ដែលគេលែងប្រើហើយ។ សូមប្រាប់អ្នកផ្ញើ ឲ្យធ្វើបច្ចុប្បន្នភាពទៅជំនាន់ចុងក្រោយបង្អស់ និងផ្ញើសារម្តងទៀត។</string>
  <string name="MessageRecord_left_group">អ្នកបានចាកចេញពីក្រុម។</string>
--- a/res/values-ku/strings.xml
+++ b/res/values-ku/strings.xml
@@ -146,6 +146,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Ji bo wêne û vidyo bikişînin, Signal destûra kamera dixwaze, lê ew hat herdemî rakirin. Li \'Settings\' &gt; \'Destûr\' &gt; \'Kamera\' dîsa destûr bide.</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Ji bo kişandina wêne û vidyo, Signal destûra kamera dixwaze</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Belê</string>
+  <string name="ConversationActivity_no">Na</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d peyam nahat xwendin</item>
@@ -352,6 +354,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Peyama medya</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Peyama MMS tê daxistin</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Peyama MMS nehat daxistin, ji bo dîsa hewldan lêxe</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Hemû medya</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Peyama bişifre hat, ji versiyona Singal a kevin ku niha kar nake. Ji şandiyar re bêje, Signala xwe rojane bibe versiyona nû û peyam dîsa bişîne.</string>
  <string name="MessageRecord_left_group">Ji kom derketî</string>
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -160,6 +160,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Norint fotografuoti, Signal reikia kameros leidimo, tačiau jis buvo visam laikui uždraustas. Pereikite į programėlės nustatymų meniu, pasirinkite \"Leidimai\" ir įjunkite \"Kamerą\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Norint fotografuoti ar filmuoti, Signal reikalinga prieiga prie kameros</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signal negali siųsti SMS/MMS žinučių, nes ji nėra jūsų numatytoji SMS programėlė. Ar norėtumėte tai pakeisti savo Android nustatymuose?</string>
+  <string name="ConversationActivity_yes">Taip</string>
+  <string name="ConversationActivity_no">Ne</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d neskaityta žinutė</item>
@@ -407,6 +410,20 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimedijos žinutė</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Atsiunčiama MMS žinutė</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Klaida, atsiunčiant MMS žinutę, bakstelėkite, norėdami bandyti dar kartą</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Siųsti kontaktui %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Bakstelėkite, norėdami pasirinkti</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="one">Jūs negalite dalintis daugiau nei %d elementu.</item>
+    <item quantity="few">Jūs negalite dalintis daugiau nei %d elementais.</item>
+    <item quantity="many">Jūs negalite dalintis daugiau nei %d elementų.</item>
+    <item quantity="other">Jūs negalite dalintis daugiau nei %d elementu.</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Pridėti paaiškinimą...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Visa medija</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Gauta žinutė buvo užšifruota, naudojant seną Signal versiją, kuri daugiau nebepalaikoma. Paprašykite siuntėjo atnaujinti savo programėlę į naujausią versiją ir iš naujo išsiųsti žinutę.</string>
  <string name="MessageRecord_left_group">Jūs išėjote iš grupės.</string>
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -142,6 +142,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Signal မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးထားရန်လိုသည်။  သို့သော် လုံးဝခွင့်မပြုပါ ဟုရွေးထားပြီး ဖြစ်နေသဖြင့် အပ်ပလီကေးရှင်း အပြင်အဆင်သို့ သွား၍ ခွင့်ပြုချက်များကို ရွေးချယ်ကာ ကင်မရာကို အသုံးပြုနိုင်အောင် ပြုလုပ်ပါ။</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ဓါတ်ပုံနှင့် ဗီဒီယိုရိုက်နိုင်ရန် Signal မှ မိမိကင်မရာကို အသုံးပြုခွင့်ပေးထားရန်လိုသည်</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">ဟုတ်ကဲ့</string>
+  <string name="ConversationActivity_no">မလုပ်ပါ</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="other">မဖတ်ရသေးသည့် စာတို %d </item>
@@ -331,6 +333,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">ရုပ်၊သံပါ အချက်အလက်များ</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS များအား ဒေါင်းလုပ်ဆွဲမည်</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS များအားဒေါင်းလုပ်ဆွဲနေစဉ် ရပ်တန့်သွားသည်၊ ပြန်စရန် နှိပ်ပါ</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">ရုပ်/သံ/ပုံ စာများအားလုံး</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">ထပ်မံပံ့ပိုးမှုမရှိတော့သော Signal ဗားရှင်းအဟောင်းဖြင့် encrypt လုပ်ထားသော စာကိုလက်ခံရရှိသည်။ စာပို့သူအား signal နောက်ဆုံးဗားရှင်းကိုမြှင့်ပြီး စာအားပြန်ပို့ခုိင်းပါ။</string>
  <string name="MessageRecord_left_group">အဖွဲ့မှ သင်ထွက်လိုက်သည်။</string>
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -154,6 +154,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal krever tillatelse fra systemet for å kunne ta bilder eller filme, men du har valgt å avslå dette permanent. Gå til «Apper»-menyen på systemet og slå på tillatelsen «Kamera».</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Du må gi Signal «Kamera»-tillatelse på systemet for å kunne filme og ta bilder.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signal kan ikke sende SMS/MMS-meldinger fordi det ikke er standard SMS-appen din. Vil du endre dette i Android-innstillingene dine?</string>
+  <string name="ConversationActivity_yes">Ja</string>
+  <string name="ConversationActivity_no">Nei</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d ulest melding</item>
@@ -371,6 +374,12 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimediemelding</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Laster ned MMS-melding</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Feil under nedlasting av MMS-melding. Trykk for å prøve igjen</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Send til %s</string>
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Alle medier</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Mottatt en melding som er kryptert med en gammel versjon av Signal som ikke lenger støttes. Be avsenderen om å oppdatere til nyeste versjon og sende meldinga på nytt.</string>
  <string name="MessageRecord_left_group">Du har forlatt gruppa.</string>
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -136,10 +136,10 @@
  <string name="ConversationActivity_lets_switch_to_signal">Laten we wisselen naar Signal %1$s</string>
  <string name="ConversationActivity_lets_use_this_to_chat">Laten we chatten met %1$s</string>
  <string name="ConversationActivity_error_leaving_group">Fout bij het verlaten van de groep</string>
-  <string name="ConversationActivity_specify_recipient">Kies een contact</string>
-  <string name="ConversationActivity_unblock_this_contact_question">Contact deblokkeren?</string>
+  <string name="ConversationActivity_specify_recipient">Kies een gesprekspartner</string>
+  <string name="ConversationActivity_unblock_this_contact_question">Gesprekspartner deblokkeren?</string>
  <string name="ConversationActivity_unblock_this_group_question">Deze groep deblokkeren?</string>
-  <string name="ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Je kan weer berichten en oproepen van dit contact ontvangen.</string>
+  <string name="ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Je kan weer berichten en oproepen van deze gesprekspartner ontvangen.</string>
  <string name="ConversationActivity_unblock_this_group_description">Bestaande leden kunnen je weer aan de groep toevoegen.</string>
  <string name="ConversationActivity_unblock">Deblokkeren</string>
  <string name="ConversationActivity_attachment_exceeds_size_limits">Bijlage overschrijdt de maximale grootte voor het type bericht dat je wilt verzenden.</string>
@@ -154,6 +154,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal heeft toegang tot de camera nodig om foto\'s en video\'s te kunnen opnemen, maar deze is permanent geweigerd. Ga naar de instellingen voor deze app, selecteer \"Machtigingen\" en schakel \"Camera\" in.</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal heeft toegang tot de camera nodig om foto\'s en video\'s te kunnen opnemen</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signal kan geen Sms/Mms bericht verzenden omdat Signal niet je standaard Sms app is. Wil je dit veranderen in je Android instellingen?</string>
+  <string name="ConversationActivity_yes">Ja</string>
+  <string name="ConversationActivity_no">Nee</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d ongelezen bericht</item>
@@ -296,10 +299,10 @@
  <string name="GroupCreateActivity_actionbar_edit_title">Groep bijwerken</string>
  <string name="GroupCreateActivity_group_name_hint">Groepsnaam</string>
  <string name="GroupCreateActivity_actionbar_mms_title">Nieuwe mms-groep</string>
-  <string name="GroupCreateActivity_contacts_dont_support_push">Je hebt een contactpersoon geselecteerd die geen Signal-groepen ondersteunt, dus deze groep zal gebruik maken van mms.</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Je hebt een contactpersoon geselecteerd wie geen Signal-groepen ondersteunt, dus deze groep zal gebruik maken van mms.</string>
  <string name="GroupCreateActivity_youre_not_registered_for_signal">Je bent niet geregistreerd voor Signal-berichten en -oproepen, dus Signal-groepen zijn uitgeschakeld. Registreren kan via Instellingen &gt; Geavanceerd.</string>
  <string name="GroupCreateActivity_contacts_no_members">Je groep moet minstens één persoon bevatten!</string>
-  <string name="GroupCreateActivity_contacts_invalid_number">Het nummer van een van de leden van je groep kan niet goed worden gelezen. Corrigeer dit of verwijder deze persoon, en probeer het opnieuw.</string>
+  <string name="GroupCreateActivity_contacts_invalid_number">Het nummer van één van de leden van je groep kan niet goed worden gelezen. Corrigeer dit of verwijder deze contactpersoon en probeer het opnieuw.</string>
  <string name="GroupCreateActivity_avatar_content_description">Groepsafbeelding</string>
  <string name="GroupCreateActivity_menu_apply_button">Toepassen</string>
  <string name="GroupCreateActivity_creating_group">%1$s aanmaken...</string>
@@ -317,7 +320,7 @@
  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Tik en hou vast om audio op te nemen, laat los om te verzenden</string>
  <!--InviteActivity-->
  <string name="InviteActivity_share">Delen</string>
-  <string name="InviteActivity_choose_contacts">Kies contacten</string>
+  <string name="InviteActivity_choose_contacts">Kies contactpersonen</string>
  <string name="InviteActivity_cancel">Annuleren</string>
  <string name="InviteActivity_sending">Aan het verzenden...</string>
  <string name="InviteActivity_heart_content_description">Hartje</string>
@@ -371,6 +374,18 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimediabericht</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Mms-bericht aan het downloaden</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fout bij downloaden van mms-bericht, tik om opnieuw te proberen</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Verzenden naar %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Tik om te selecteren</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="one">Je kunt niet meer dan %d item delen.</item>
+    <item quantity="other">Je kunt niet meer dan %d items delen.</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Voeg een bijschrift toe...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Alle media</string>
  <!--MessageRecord-->
  <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 meer 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>
@@ -383,10 +398,10 @@
  <string name="MessageRecord_called_s">%s gebeld</string>
  <string name="MessageRecord_missed_call_from">Gemiste oproep van %s</string>
  <string name="MessageRecord_s_joined_signal">%s zit op Signal!</string>
-  <string name="MessageRecord_you_disabled_disappearing_messages">Je hebt verdwijnende berichten uitgezet.</string>
-  <string name="MessageRecord_s_disabled_disappearing_messages">%1$s heeft verdwijnende berichten uitgeschakeld.</string>
-  <string name="MessageRecord_you_set_disappearing_message_time_to_s">Je hebt de timer voor verdwijnende berichten op %1$s ingesteld.</string>
-  <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s heeft de timer voor verdwijnende berichten op %2$s ingesteld.</string>
+  <string name="MessageRecord_you_disabled_disappearing_messages">Je hebt zelf-wissende berichten uitgezet.</string>
+  <string name="MessageRecord_s_disabled_disappearing_messages">%1$s heeft zelf-wissende berichten uitgeschakeld.</string>
+  <string name="MessageRecord_you_set_disappearing_message_time_to_s">Je hebt de timer voor zelf-wissende berichten op %1$s ingesteld.</string>
+  <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s heeft de timer voor zelf-wissende berichten op %2$s ingesteld.</string>
  <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>
  <string name="MessageRecord_you_marked_your_safety_number_with_s_verified_from_another_device">Je hebt je veiligheidsnummer met %s gemarkeerd als \'geverifieerd\' vanaf een ander apparaat</string>
@@ -418,9 +433,9 @@
  <string name="DeviceActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code">Signal heeft toegang tot de camera nodig om een QR-code te scannen, maar deze is permanent geweigerd. Ga naar de instellingen voor deze app, selecteer \"Machtigingen\" en schakel \"Camera\" in.</string>
  <string name="DeviceActivity_unable_to_scan_a_qr_code_without_the_camera_permission">Kan geen QR-code scannen zonder toegang tot camera</string>
  <!--ExpirationDialog-->
-  <string name="ExpirationDialog_disappearing_messages">Verdwijnende berichten</string>
+  <string name="ExpirationDialog_disappearing_messages">Zelf-wissende berichten</string>
  <string name="ExpirationDialog_your_messages_will_not_expire">De berichten zullen zichzelf niet verwijderen.</string>
-  <string name="ExpirationDialog_your_messages_will_disappear_s_after_they_have_been_seen">Berichten die in dit gesprek verzonden en ontvangen worden zullen %s nadat ze gelezen zijn verdwijnen.</string>
+  <string name="ExpirationDialog_your_messages_will_disappear_s_after_they_have_been_seen">Nieuwe berichten die in dit gesprek verzonden en ontvangen worden zullen %s nadat ze gelezen zijn zich zelf wissen.</string>
  <!--PassphrasePromptActivity-->
  <string name="PassphrasePromptActivity_enter_passphrase">Voer wachtwoord in</string>
  <string name="PassphrasePromptActivity_watermark_content_description">Signal-pictogram</string>
@@ -438,14 +453,14 @@
  <string name="RatingManager_later">Later</string>
  <string name="RatingManager_whoops_the_play_store_app_does_not_appear_to_be_installed">Oeps, het lijkt er op dat de Play Store-app niet geïnstalleerd is op dit apparaat.</string>
  <!--RecipientPreferencesActivity-->
-  <string name="RecipientPreferenceActivity_block_this_contact_question">Contact blokkeren?</string>
+  <string name="RecipientPreferenceActivity_block_this_contact_question">Gesprekspartner blokkeren?</string>
  <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact">Je kan niet langer berichten en oproepen van dit contact ontvangen.</string>
  <string name="RecipientPreferenceActivity_block_and_leave_group">Deze groep blokkeren en verlaten?</string>
  <string name="RecipientPreferenceActivity_block_group">Deze groep blokkeren?</string>
  <string name="RecipientPreferenceActivity_block_and_leave_group_description">Je zult niet langer berichten of meldingen van deze groep ontvangen.</string>
  <string name="RecipientPreferenceActivity_block">Blokkeer deze gesprekspartner</string>
-  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Contact deblokkeren?</string>
-  <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Je kan weer berichten en oproepen van dit contact ontvangen.</string>
+  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Gesprekspartner deblokkeren?</string>
+  <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Je kan weer berichten en oproepen van deze gesprekspartner ontvangen.</string>
  <string name="RecipientPreferenceActivity_unblock_this_group_question">Deze groep deblokkeren?</string>
  <string name="RecipientPreferenceActivity_unblock_this_group_description">Bestaande leden kunnen je weer aan de groep toevoegen.</string>
  <string name="RecipientPreferenceActivity_error_leaving_group">Fout bij het verlaten van de groep</string>
@@ -538,8 +553,8 @@
  <string name="ThreadRecord_missed_call">Gemiste oproep</string>
  <string name="ThreadRecord_media_message">Mediabericht</string>
  <string name="ThreadRecord_s_is_on_signal">%s zit op Signal!</string>
-  <string name="ThreadRecord_disappearing_messages_disabled">Verdwijnende berichten uitgeschakeld</string>
-  <string name="ThreadRecord_disappearing_message_time_updated_to_s">Berichten zullen verdwijnen na %s</string>
+  <string name="ThreadRecord_disappearing_messages_disabled">Zelf-wissende berichten uitgeschakeld</string>
+  <string name="ThreadRecord_disappearing_message_time_updated_to_s">Berichten zullen zichzelf wissen na %s</string>
  <string name="ThreadRecord_safety_number_changed">Veiligheidsnummer veranderd</string>
  <string name="ThreadRecord_your_safety_number_with_s_has_changed">Je veiligheidsnummer met %s is veranderd.</string>
  <string name="ThreadRecord_you_marked_verified">Gemarkeerd als geverifieerd</string>
@@ -549,7 +564,7 @@
  <string name="UpdateApkReadyListener_a_new_version_of_signal_is_available_tap_to_update">Er is een nieuwe versie van Signal beschikbaar, tik om bij te werken</string>
  <!--UnknownSenderView-->
  <string name="UnknownSenderView_block_s">%s blokkeren?</string>
-  <string name="UnknownSenderView_blocked_contacts_will_no_longer_be_able_to_send_you_messages_or_call_you">Geblokkeerde contacten zullen je geen berichten meer kunnen sturen en zullen jou niet meer kunnen bellen.</string>
+  <string name="UnknownSenderView_blocked_contacts_will_no_longer_be_able_to_send_you_messages_or_call_you">Geblokkeerde contactenpersonen zullen je geen berichten meer kunnen sturen en zullen jou niet meer kunnen bellen.</string>
  <string name="UnknownSenderView_block">Blokkeer deze gesprekspartner</string>
  <string name="UnknownSenderView_share_profile_with_s">Je profiel delen met %s?</string>
  <string name="UnknownSenderView_the_easiest_way_to_share_your_profile_information_is_to_add_the_sender_to_your_contacts">De eenvoudigste manier om je profielinformatie te delen is door de afzender aan je contacten toe te voegen. Als je dit niet wilt, kun je jouw profielinformatie nog steeds langs deze weg delen.</string>
@@ -561,8 +576,8 @@
  <string name="UnverifiedSendDialog_send_message">Bericht verzenden?</string>
  <string name="UnverifiedSendDialog_send">Verzenden</string>
  <!--VerifyIdentityActivity-->
-  <string name="VerifyIdentityActivity_your_contact_is_running_an_old_version_of_signal">Dit contact gebruikt een oude versie van Signal. Vraag hen om eerst Signal bij te werken, alvorens je het veiligheidsnummer verifieert.</string>
-  <string name="VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal">Je contact gebruikt een nieuwere versie van Signal met een incompatibel QR-codeformaat. Werk Signal bij om te vergelijken.</string>
+  <string name="VerifyIdentityActivity_your_contact_is_running_an_old_version_of_signal">Deze contactpersoon gebruikt een oude versie van Signal. Vraag hem om eerst Signal bij te werken, alvorens je het veiligheidsnummer verifieert.</string>
+  <string name="VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal">Deze contactpersoon gebruikt een nieuwere versie van Signal met een incompatibel QR-codeformaat. Werk Signal bij om te vergelijken.</string>
  <string name="VerifyIdentityActivity_the_scanned_qr_code_is_not_a_correctly_formatted_safety_number">De gescande QR-code is geen goed geformatteerd veiligheidsnummer verificatie code. Probeer de code opnieuw te scannen.</string>
  <string name="VerifyIdentityActivity_share_safety_number_via">Veiligheidsnummer delen via...</string>
  <string name="VerifyIdentityActivity_our_signal_safety_number">Ons Signal-veiligheidsnummer:</string>
@@ -632,7 +647,7 @@
  <string name="SaveAttachmentTask_saved">Opgeslagen</string>
  <!--SearchToolbar-->
  <string name="SearchToolbar_search">Zoeken</string>
-  <string name="SearchToolbar_search_for_conversations_contacts_and_messages">Zoek naar gesprekken, contacten, en berichten.</string>
+  <string name="SearchToolbar_search_for_conversations_contacts_and_messages">Zoek naar gesprekken, contactpersonen en berichten.</string>
  <!--ShortcutLauncherActivity-->
  <string name="ShortcutLauncherActivity_invalid_shortcut">Ongeldige snelkoppeling</string>
  <!--SingleRecipientNotificationBuilder-->
@@ -682,18 +697,18 @@
  <!--contact_selection_activity-->
  <string name="contact_selection_activity__enter_name_or_number">Typ naam of nummer</string>
  <!--contact_selection_group_activity-->
-  <string name="contact_selection_group_activity__no_contacts">Geen contacten.</string>
-  <string name="contact_selection_group_activity__finding_contacts">Contacten laden...</string>
+  <string name="contact_selection_group_activity__no_contacts">Geen contactpersonen.</string>
+  <string name="contact_selection_group_activity__finding_contacts">Contactpersonen laden...</string>
  <!--single_contact_selection_activity-->
-  <string name="SingleContactSelectionActivity_contact_photo">Contactfoto</string>
+  <string name="SingleContactSelectionActivity_contact_photo">Foto van contactpersoon</string>
  <!--ContactSelectionListFragment-->
  <string name="ContactSelectionListFragment_signal_requires_the_contacts_permission_in_order_to_display_your_contacts">Signal heeft toegang tot je lijst met contacten nodig om je contacten weer te kunnen geven, maar toestemming om contacten in te zien is permanent geweigerd. Ga naar de instellingen voor deze app, selecteer \"Machtigingen\" en schakel \"Contacten\" in.</string>
-  <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Fout bij ophalen van contacten, controleer je netwerkverbinding</string>
+  <string name="ContactSelectionListFragment_error_retrieving_contacts_check_your_network_connection">Fout bij ophalen van contactpersonen, controleer je netwerkverbinding</string>
  <!--blocked_contacts_fragment-->
-  <string name="blocked_contacts_fragment__no_blocked_contacts">Geen geblokkeerde contacten</string>
+  <string name="blocked_contacts_fragment__no_blocked_contacts">Geen geblokkeerde contactpersonen</string>
  <!--contact_selection_list_fragment-->
-  <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal heeft toegang nodig tot je contacten om ze weer te kunnen geven.</string>
-  <string name="contact_selection_list_fragment__show_contacts">Contacten tonen</string>
+  <string name="contact_selection_list_fragment__signal_needs_access_to_your_contacts_in_order_to_display_them">Signal heeft toegang nodig tot je contacten om contactpersonen weer te kunnen geven.</string>
+  <string name="contact_selection_list_fragment__show_contacts">Contactpersonen tonen</string>
  <!--conversation_activity-->
  <string name="conversation_activity__type_message_push">Signal-bericht</string>
  <string name="conversation_activity__type_message_sms_insecure">Onbeveiligde sms</string>
@@ -717,7 +732,7 @@
  <string name="conversation_item_sent__delivered_description">Bezorgd </string>
  <string name="conversation_item_sent__message_read">Bericht gelezen</string>
  <!--conversation_item_received-->
-  <string name="conversation_item_received__contact_photo_description">Contactfoto</string>
+  <string name="conversation_item_received__contact_photo_description">Foto van contactpersoon</string>
  <!--audio_view-->
  <string name="audio_view__play_accessibility_description">Afspelen</string>
  <string name="audio_view__pause_accessibility_description">Pauzeren</string>
@@ -870,14 +885,14 @@
  <string name="redphone_call_controls__flip_camera_rear">Andere camera</string>
  <!--registration_activity-->
  <string name="registration_activity__phone_number">TELEFOONNUMMER</string>
-  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Signal maakt het eenvoudig om met je bestaande telefoonnummer en adresboek te communiceren. Vrienden en contacten die jou al via je telefoon kunnen contacteren zullen eenvoudig contact met jou kunnen opnemen via Signal.\n\nRegistreren deelt enige informatie met de server. Die informatie wordt niet bewaard.</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Signal maakt het eenvoudig om met je bestaande telefoonnummer en adresboek te communiceren. Vrienden en contactpersonen die jou al via je telefoon kunnen bereiken zullen eenvoudig contact met jou kunnen opnemen via Signal.\n\nRegistreren deelt enige informatie met de server. Die informatie wordt niet bewaard.</string>
  <string name="registration_activity__verify_your_number">Verifieer je nummer</string>
  <string name="registration_activity__please_enter_your_mobile_number_to_receive_a_verification_code_carrier_rates_may_apply">Voer je telefoonnummer in om een verificatiecode te ontvangen. Extra providerkosten zijn mogelijk van toepassing.</string>
  <!--recipients_panel-->
  <string name="recipients_panel__to"><small>Typ een naam of nummer</small></string>
  <string name="recipients_panel__add_members">Leden toevoegen</string>
  <!--unknown_sender_view-->
-  <string name="unknown_sender_view__the_sender_is_not_in_your_contact_list">De afzender staat niet in je contacten</string>
+  <string name="unknown_sender_view__the_sender_is_not_in_your_contact_list">De afzender staat niet in je lijst met contacten</string>
  <string name="unknown_sender_view__block">BLOKKEREN</string>
  <string name="unknown_sender_view__add_to_contacts">TOEVOEGEN AAN CONTACTEN</string>
  <string name="unknown_sender_view__don_t_add_but_make_my_profile_visible">NIET TOEVOEGEN, MAAR MIJN PROFIEL WEL ZICHTBAAR MAKEN</string>
@@ -902,7 +917,7 @@
  <string name="message_details_header__with">Met:</string>
  <!--AndroidManifest.xml-->
  <string name="AndroidManifest__create_passphrase">Wachtwoord aanmaken</string>
-  <string name="AndroidManifest__select_contacts">Contacten selecteren</string>
+  <string name="AndroidManifest__select_contacts">Contactpersonen selecteren</string>
  <string name="AndroidManifest__change_passphrase">Wachtwoord wijzigen</string>
  <string name="AndroidManifest__verify_safety_number">Veiligheidsnummer verifiëren</string>
  <string name="AndroidManifest__log_submit">Foutopsporingslogboek indienen</string>
@@ -1023,7 +1038,7 @@
  <string name="preferences__typing_indicators">Typindicatoren</string>
  <string name="preferences__if_typing_indicators_are_disabled_you_wont_be_able_to_see_typing_indicators">Als typindicatoren zijn uitgeschakeld, kunnen anderen niet zien of je aan het typen bent, maar je kunt ook niet zien wanneer anderen aan het typen zijn.</string>
  <string name="preferences__request_keyboard_to_disable_personalized_learning">Schakel gepersonaliseerd leren van toetsenbord uit</string>
-  <string name="preferences_app_protection__blocked_contacts">Geblokkeerde contacten</string>
+  <string name="preferences_app_protection__blocked_contacts">Geblokkeerde contactpersonen</string>
  <string name="preferences_chats__when_using_mobile_data">Wanneer mobiele gegevensoverdracht gebruikt wordt</string>
  <string name="preferences_chats__when_using_wifi">Wanneer wifi gebruikt wordt</string>
  <string name="preferences_chats__when_roaming">Bij roaming</string>
@@ -1031,7 +1046,7 @@
  <string name="preferences_chats__message_trimming">Bericht inkorten</string>
  <string name="preferences_advanced__use_system_emoji">Gebruik systeem-emoji</string>
  <string name="preferences_advanced__disable_signal_built_in_emoji_support">De ingebouwde emoji-ondersteuning van Signal uitschakelen</string>
-  <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Stuur oproepen door de Signal server om te voorkomen dat je contact je IP-adres kan achterhalen. Dit zorgt wel voor een verminderde geluidskwaliteit.</string>
+  <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Breng oproepen tot stand via de Signal server om te voorkomen dat je gesprekspartner jouw IP-adres kan achterhalen. Dit zorgt wel voor een verminderde geluidskwaliteit.</string>
  <string name="preferences_advanced__always_relay_calls">Alle oproepen doorsturen</string>
  <string name="preferences_app_protection__app_access">Toegang tot app</string>
  <string name="preferences_app_protection__communication">Communicatie</string>
@@ -1039,19 +1054,19 @@
  <string name="preferences_notifications__messages">Berichten</string>
  <string name="preferences_notifications__events">Gebeurtenissen</string>
  <string name="preferences_notifications__in_chat_sounds">Geluiden in gesprek</string>
-  <string name="preferences_notifications__show">Tonen</string>
+  <string name="preferences_notifications__show">Laat zien</string>
  <string name="preferences_notifications__calls">Oproepen</string>
  <string name="preferences_notifications__ringtone">Beltoon</string>
  <string name="preferences_chats__show_invitation_prompts">Uitnodigingsvragen tonen</string>
-  <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Toon een vraag of contacten zonder Signal uitgenodigd moeten worden</string>
+  <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Laat uitnodigingsberichten zien aan contactpersonen wie Signal niet gebruiken</string>
  <string name="preferences_chats__message_text_size">Tekstgrootte voor berichten</string>
-  <string name="preferences_events__contact_joined_signal">Contact gebruikt nu Signal</string>
-  <string name="preferences_notifications__priority">Prioriteit</string>
+  <string name="preferences_events__contact_joined_signal">Contactpersoon gebruikt nu Signal</string>
+  <string name="preferences_notifications__priority">Urgentie instellen</string>
  <string name="preferences_communication__category_sealed_sender">Verzegelde afzender</string>
  <string name="preferences_communication__sealed_sender_display_indicators">Toon of verzegelde afzender is gebruikt</string>
  <string name="preferences_communication__sealed_sender_display_indicators_description">Laat een statusicoon zien als je drukt op \"Berichtdetails\" bij berichten die zijn afgeleverd met een verzegelde afzender.</string>
  <string name="preferences_communication__sealed_sender_allow_from_anyone">Van iedereen toestaan</string>
-  <string name="preferences_communication__sealed_sender_allow_from_anyone_description">Verzegelde afzender inschakelen voor berichten van niet-contacten en mensen waarmee je je profiel niet hebt gedeeld.</string>
+  <string name="preferences_communication__sealed_sender_allow_from_anyone_description">Verzegelde afzender inschakelen voor berichten van niet-contactpersonen en mensen waarmee je jouw profiel niet hebt gedeeld.</string>
  <string name="preferences_communication__sealed_sender_learn_more">Meer leren</string>
  <!--****************************************-->
  <!--menus-->
@@ -1072,7 +1087,7 @@
  <!--conversation_context_image-->
  <string name="conversation_context_image__save_attachment">Bijlage opslaan</string>
  <!--conversation_expiring_off-->
-  <string name="conversation_expiring_off__disappearing_messages">Verdwijnende berichten</string>
+  <string name="conversation_expiring_off__disappearing_messages">Zelf wissende berichten</string>
  <!--conversation_expiring_on-->
  <string name="menu_conversation_expiring_on__messages_expiring">Zichzelf vernietigende berichten</string>
  <!--conversation_insecure-->
@@ -1084,7 +1099,7 @@
  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Selectie dearchiveren</string>
  <!--conversation_list-->
  <!--conversation_list_item_view-->
-  <string name="conversation_list_item_view__contact_photo_image">Contactfoto</string>
+  <string name="conversation_list_item_view__contact_photo_image">Afbeelding van contactpersoon</string>
  <string name="conversation_list_item_view__archived">Gearchiveerd</string>
  <string name="conversation_list_item_inbox_zero__inbox_zeeerrro">Postvak IN helemaal leeg</string>
  <string name="conversation_list_item_inbox_zero__zip_zilch_zero_nada_nyou_re_all_caught_up">Niks, nada, noppes.\nJe bent helemaal mee!</string>
@@ -1166,7 +1181,7 @@
  <string name="ConversationActivity_signal_needs_sms_permission_in_order_to_send_an_sms">Signal heeft toestemming nodig om sms-berichten te sturen, maar deze toestemming is permanent geweigerd. Ga naar de instellingen voor deze app, selecteer \"Machtigingen\" en schakel \"Sms\" in.</string>
  <string name="Permissions_continue">Doorgaan</string>
  <string name="Permissions_not_now">Niet nu</string>
-  <string name="ConversationListActivity_signal_needs_contacts_permission_in_order_to_search_your_contacts_but_it_has_been_permanently_denied">Signal heeft toegang nodig tot je lijst met contacten om contacten te zoeken, maar toestemming om contacten in te zien is permanent geweigerd. Ga naar de instellingen voor deze app, selecteer \"Machtigingen\" en schakel \"Contacten\" in.</string>
+  <string name="ConversationListActivity_signal_needs_contacts_permission_in_order_to_search_your_contacts_but_it_has_been_permanently_denied">Signal heeft toegang nodig tot je lijst met contacten om contactpersonen te zoeken, maar toestemming om de contactenlijst in te zien is permanent geweigerd. Ga naar de instellingen voor deze app, selecteer \"Machtigingen\" en schakel \"Contacten\" in.</string>
  <string name="conversation_activity__enable_signal_messages">SIGNAL-BERICHTEN INSCHAKELEN</string>
  <string name="SQLCipherMigrationHelper_migrating_signal_database">Signal-database wordt gemigreerd</string>
  <string name="PushDecryptJob_new_locked_message">Nieuw vergrendeld bericht</string>
--- a/res/values-nn/strings.xml
+++ b/res/values-nn/strings.xml
@@ -154,6 +154,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal treng tilgang til kameraet for å ta bilete eller videoar, men tilgangen er permanent avslått. Opna app-innstillingsmenyen og vel «Tilgang» – eventuelt «Tillatelser» – og skru på «Kamera».</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal treng tilgang til kameraet for å ta bilete eller videoopptak</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_yes">Ja</string>
+  <string name="ConversationActivity_no">Nei</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d ulesen melding</item>
@@ -368,6 +370,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimediemelding</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Lastar ned MMS-melding</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Klarte ikkje lasta ned MMS-melding, trykk for å prøva igjen</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">All media</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Mottok ei melding som er kryptert med ein gammal versjon av Signal som ikkje lenger vert støtta. Be avsendaren om å oppdatera til nyaste versjon og senda meldinga på nytt.</string>
  <string name="MessageRecord_left_group">Du har forlate gruppa.</string>
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -160,6 +160,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal wymaga pozwolenia na dostęp do aparatu w celu umożliwienia robienia zdjęć i nagrywania filmów, ale zostało one na stałe odrzucone. Przejdź do ustawień aplikacji, wybierz \"Uprawnienia\" i włącz \"Aparat\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal wymaga pozwolenia na dostęp do aparatu w celu umożliwienia robienia zdjęć i nagrywania filmów</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signal nie może wysyłać wiadomości SMS/MMS, ponieważ nie jest to Twoją domyślną aplikacją do obsługi SMS-ów. Czy chcesz to zmienić w ustawieniach Androida?</string>
+  <string name="ConversationActivity_yes">Tak</string>
+  <string name="ConversationActivity_no">Nie</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d nieprzeczytana wiadomość</item>
@@ -407,6 +410,20 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Wiadomość multimedialna</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Pobieranie wiadomości MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Błąd podczas pobierania wiadomości MMS. Dotknij, aby spróbować ponownie.</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Wyślij do %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Dotknij, aby zaznaczyć</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="one">Nie można udostępnić więcej niż %d element multimediów.</item>
+    <item quantity="few">Nie można udostępnić więcej niż %d multimediów.</item>
+    <item quantity="many">Nie można udostępnić więcej niż %d multimediów.</item>
+    <item quantity="other">Nie można udostępnić więcej niż %d multimediów.</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Dodaj podpis...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Wszystkie multimedia</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Otrzymano szyfrowaną wiadomość wysłaną przy użyciu starej wersji Signal, która nie jest już wspierana. Poproś nadawcę tej wiadomości o zaktualizowanie aplikacji do najnowszej wersji i przesłanie wiadomości ponownie.</string>
  <string name="MessageRecord_left_group">Opuściłeś(aś) grupę.</string>
@@ -415,7 +432,7 @@
  <string name="MessageRecord_called_you">Dzwonił(a)</string>
  <string name="MessageRecord_missed_call">Nieodebrane połączenie</string>
  <string name="MessageRecord_s_updated_group">%s zaktualizował(a) grupę.</string>
-  <string name="MessageRecord_s_called_you">%s dzwonił do Ciebie</string>
+  <string name="MessageRecord_s_called_you">%s dzwonił(a) do Ciebie</string>
  <string name="MessageRecord_called_s">Zadzwoniono do %s</string>
  <string name="MessageRecord_missed_call_from">Nieodebrane połączenie od %s</string>
  <string name="MessageRecord_s_joined_signal">%s jest w Signal!</string>
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -154,6 +154,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">O Signal precisa da permissão Câmera para tirar fotos e fazer vídeos, mas ela foi permanentemente negada. Favor ir no menu de configurações de aplicativos, selecionar \"Permissões\", e habilitar \"Câmera\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">O Signal precisa da permissão Câmera para tirar fotos ou fazer vídeos</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_yes">Sim</string>
+  <string name="ConversationActivity_no">Não</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d mensagem não lida</item>
@@ -371,6 +373,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Mensagem multimídia</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Baixando mensagem MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Erro ao baixar mensagem MMS, clique para tentar novamente</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Todas as mídias</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Foi recebida uma mensagem que foi criptografada usando uma versão antiga do Signal que não é mais suportada. Favor pedir ao remetente que atualize para a versão mais recente e reenvie a mensagem.</string>
  <string name="MessageRecord_left_group">Você saiu do grupo.</string>
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -154,6 +154,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">O Signal requer permissão de acesso à Câmara para tirar fotos ou vídeo, mas esta foi negada permanentemente. Por favor aceda a permissões da aplicação, seleccione \"Permissões\" e active \"Câmara\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">O Signal requer permissão de acesso à Câmara para tirar fotos ou vídeo</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">O Signal não consegue enviar mensagens SMS/MMS porque não é o seu programa padrão de SMS. Quer alterar isto nas configurações do Android?</string>
+  <string name="ConversationActivity_yes">Sim</string>
+  <string name="ConversationActivity_no">Não</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d mensagem não lida</item>
@@ -371,6 +374,18 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Mensagem multimédia</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">A descarregar MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Erro a descarregar MMS, toque para repetir</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Enviar para %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Tocar para selecionar</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="one">Não pode partilhar mais do que %d item.</item>
+    <item quantity="other">Não pode partilhar mais do que %d itens.</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Adicionar uma legenda...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Toda a multimédia</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Recebeu uma mensagem encriptada com uma versão anterior do Signal, que já não é suportada. Por favor peça ao remetente para actualizar para a versão mais recente e reenviar a mensagem.</string>
  <string name="MessageRecord_left_group">Abandonou o grupo.</string>
--- a/res/values-qu-rEC/strings.xml
+++ b/res/values-qu-rEC/strings.xml
@@ -148,6 +148,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal ari nichun munanmi kikinpa shuyullukchikman yaykunkapak, shuyukunata, shuyukuyurikkunatapash llukchinkapak, shinapash mana arinirishkachu. \"Menú de configuración\" ukuman yaykushpa \"Permisos\" nikukta llapipay, \"Cámara\" paskarichun.</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal ari nichun munanmi shuyullukchikman yaykunkapak, shuyuta shinallata shuyukurikta llukchinkapak.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_yes">Ari</string>
+  <string name="ConversationActivity_no">Mana</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d chaski mana killkakatishka</item>
@@ -356,6 +358,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimedia chaski</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS chaskita uryakuchikun</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS chaski mana uryakurkachu, kutinlla rurapay</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Tukuylla uyayrikuchik</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Shuk pakalla chaski chayamurka ñawpa Signalmanta, mana paskarita usharinchu. Maykan kachamushkaman Signalta mushukyachichun mañapay, chaski chayamuchun.</string>
  <string name="MessageRecord_left_group"> Tantanakuymanta  llukshirka.</string>
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -157,6 +157,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal are nevoie de permisiunea pentru Cameră pentru a captura poze sau filme dar i-a fost refuzat accesul permanent. Vă rog navigați în meniul de setări al aplicației, selectați \"Permisiuni\" și activați \"Cameră\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal are nevoie de permisiunea pentru Cameră pentru a captura poze sau filme</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Da</string>
+  <string name="ConversationActivity_no">Nu</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d mesaj necitit</item>
@@ -389,6 +391,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Mesaj multimedia</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Se descarcă mesajul MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Eroare la descărcarea mesajului MMS, apasă pentru reîncercare</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Toate fișierele media</string>
  <!--MessageRecord-->
  <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 parăsit grupul.</string>
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -160,6 +160,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Чтобы сделать фото или видео требуется разрешение на доступ к камере, но оно было вами отклонено. Чтобы предоставить разрешение вручную, перейдите Настройки, выберите Приложения, найдите Signal, затем выберите Разрешения и включите Камеру.</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Для съемки фото или видео предоставьте Signal доступ к камере</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Да</string>
+  <string name="ConversationActivity_no">Нет</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d непрочитанное сообщение</item>
@@ -407,6 +409,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">MMS-сообщение</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Скачиваем MMS-сообщение</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Ошибка при скачивании MMS-сообщения; нажмите, чтобы повторить</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Все медиа-файлы</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Полученное сообщение зашифровано в старой версии Signal, которая больше не поддерживается. Пожалуйста, попросите отправителя обновиться до последней версии и заново отправить сообщение.</string>
  <string name="MessageRecord_left_group">Вы покинули группу.</string>
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -160,6 +160,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal potrebuje prístup k fotoaparátu aby mohol vytvárať fotografie a video, ale prístup bol natrvalo zakázaný. Prosím v nastaveniach aplikácií zvoľte \"Oprávnenia\", a povoľte \"Fotoaparát\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal potrebuje prístup k Fotoaparátu, aby mohol vytvárať fotografie a videá</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Áno</string>
+  <string name="ConversationActivity_no">Nie</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d neprečítaná správa</item>
@@ -403,6 +405,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimediálna správa</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Preberanie MMS správy</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Chyba pri preberaní MMS správy, ťuknite pre opakovanie</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Všetky médiá</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Prijatá správa je šifrovaná starou verziou Signalu, ktorá už nie je podporovaná. Prosím požiadajte odosielateľa o aktualizáciu na najnovšiu verziu a opätovné odoslanie správy.</string>
  <string name="MessageRecord_left_group">Opustili ste skupinu.</string>
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -160,6 +160,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Dostop do kamere je bil trajno onemogočen. Aplikacija Signal potrebuje dovoljenje za dostop do kamere za zajemanje videa in fotografij. Prosimo, pojdite v meni Nastavitve aplikacij, izberite \"Dovoljenja\" in omogočite dovoljenje pod postavko \"Kamera\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Za zajemanje videa in fotografij potrebuje aplikacija Signal dostop do kamere.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signal ne more pošiljati sporočil SMS/MMS, ker ni nastavljen kot privzeta aplikacija SMS. Bi želeli to spremeniti v nastavitvah Android?</string>
+  <string name="ConversationActivity_yes">Da</string>
+  <string name="ConversationActivity_no">Ne</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d neprebrano sporočilo</item>
@@ -407,6 +410,20 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Večpredstavno sporočilo</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Nalagam sporočilo MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Napaka pri prenosu sporočila MMS. Tapni za ponovitev.</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Pošlji %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Tapnite za izbor</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="one">Ne morete deliti več kot %d priponko.</item>
+    <item quantity="two">Ne morete deliti več kot %d priponki.</item>
+    <item quantity="few">Ne morete deliti več kot %d priponke.</item>
+    <item quantity="other">Ne morete deliti več kot %d priponk.</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Dodaj besedilo ...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Vsa večpredstavnostna sporočila</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Prejeli ste sporočilo, šifrirano z različico aplikacije Signal, ki ni več podprta. Prosite pošiljatelja, naj posodobi Signal na najnovejšo različico.</string>
  <string name="MessageRecord_left_group">Zapustili ste skupino.</string>
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -141,6 +141,8 @@
  <string name="ConversationActivity_unable_to_record_audio">Не могу да снимим звук!</string>
  <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Нема апликације за руковање овом везом на вашем уређају.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Да</string>
+  <string name="ConversationActivity_no">Не</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d непрочитана порука</item>
@@ -360,6 +362,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Мултимедијална порука</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Преузимам ММС поруку</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Грешка при преузимању ММС поруке, тапните да покушам поново</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Сви медији</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Примљена је порука шифрована старим издањем Signal-a које више није подржано. Замолите пошиљаоца да надогради на најновије издање и поново пошаље поруку.</string>
  <string name="MessageRecord_left_group">Напустили сте групу.</string>
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -154,6 +154,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal behöver behörigheten Kamera för att kunna ta bilder och filma men har nekats den permanent. Fortsätt till inställningsmenyn för Appar och aviseringar, välj \"Behörigheter\" och aktivera \"Kamera\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal behöver behörigheten Kamera för att kunna ta bilder och filma</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signal kan inte skicka SMS/MMS eftersom det inte är din standardapp för SMS. Vill du ändra det här i dina Android-inställningar?</string>
+  <string name="ConversationActivity_yes">Ja</string>
+  <string name="ConversationActivity_no">Nej</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d oläst meddelande</item>
@@ -371,6 +374,18 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimediameddelande</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Nedladdning av MMS-meddelanden</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Fel vid hämtning av MMS-meddelanden, tryck för att försöka igen</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">Skicka till %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">Tryck för att välja</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="one">Du kan inte dela mer än %d objekt.</item>
+    <item quantity="other">Du kan inte dela mer än %d objekt.</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">Lägg till en rubrik...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">All media</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Tog emot ett meddelande som krypterats med en tidigare version av Signal som inte längre stöds. Be avsändaren uppdatera till senaste versionen och skicka om meddelandet.</string>
  <string name="MessageRecord_left_group">Du har lämnat gruppen.</string>
--- a/res/values-sw320dp/dimens.xml
+++ b/res/values-sw320dp/dimens.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="media_bubble_max_width">240dp</dimen>
-    <dimen name="media_bubble_max_height">300dp</dimen>
-</resources>
--- a/res/values-sw360dp/dimens.xml
+++ b/res/values-sw360dp/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="album_total_width">252dp</dimen>
+    <dimen name="album_2_total_height">126dp</dimen>
+    <dimen name="album_2_cell_width">125dp</dimen>
+    <dimen name="album_3_total_height">168dp</dimen>
+    <dimen name="album_3_cell_width_big">167dp</dimen>
+    <dimen name="album_3_cell_size_small">83dp</dimen>
+    <dimen name="album_4_total_height">252dp</dimen>
+    <dimen name="album_4_cell_size">125dp</dimen>
+    <dimen name="album_5_total_height">210dp</dimen>
+    <dimen name="album_5_cell_size_big">125dp</dimen>
+    <dimen name="album_5_cell_size_small">83dp</dimen>
+</resources>
--- a/res/values-sw400dp/dimens.xml
+++ b/res/values-sw400dp/dimens.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="album_total_width">300dp</dimen>
+    <dimen name="album_2_total_height">150dp</dimen>
+    <dimen name="album_2_cell_width">149dp</dimen>
+    <dimen name="album_3_total_height">200dp</dimen>
+    <dimen name="album_3_cell_width_big">199dp</dimen>
+    <dimen name="album_3_cell_size_small">99dp</dimen>
+    <dimen name="album_4_total_height">300dp</dimen>
+    <dimen name="album_4_cell_size">149dp</dimen>
+    <dimen name="album_5_total_height">250dp</dimen>
+    <dimen name="album_5_cell_size_big">149dp</dimen>
+    <dimen name="album_5_cell_size_small">99dp</dimen>
+</resources>
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -153,6 +153,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">ఫోటోలను లేదా వీడియోను తీసుకోవడానికి Signalకు కెమెరా అనుమతి అవసరం, కానీ ఇది శాశ్వతంగా తిరస్కరించబడింది. దయచేసి అనువర్తనం సెట్టింగ్లకు కొనసాగించండి, \"అనుమతులు\" ఎంచుకోండి మరియు \"కెమెరా\" ని ప్రారంభించండి.</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">ఛాయాచిత్రాలను లేదా వీడియోను తీసుకోవడానికి కెమెరా అనుమతులను Signalకి అవసరం</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">అవును</string>
+  <string name="ConversationActivity_no">కాదు</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d చదవని సందేశం </item>
@@ -370,6 +372,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">మల్టీమీడియా సందేశం</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">ఎమ్మెమ్మెస్ సందేశం దిగుమతి </string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">ఎమ్మెమ్మెస్ సందేశం దిగుమతిలో లోపం, తట్టి మళ్ళీ ప్రయత్నించండి</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">అన్ని మీడియా</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">ఇకపై మద్దతు అని Signal యొక్క పాత సంస్కరణను ఉపయోగించి ఎన్క్రిప్ట్ ఒక సందేశాన్ని పొందింది. దయచేసి ఇటీవల సంస్కరణకు అప్డేట్ మరియు సందేశాన్ని మళ్లీ పంపినవారు అడగండి</string>
  <string name="MessageRecord_left_group">మీరు సమూహం నుండి వైదొలిగారు</string>
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -145,6 +145,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">เพื่อที่จะถ่ายรูปหรือวิดีโอได้ Signal ต้องได้รับอนุญาตให้เข้าถึงกล้อง แต่คำขอนั้นถูกปฏิเสธอย่างถาวร กรุณาไปที่เมนูตั้งค่าแอป เลือก \"การอนุญาต\" และเปิดใช้งาน \"กล้อง\"</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal ต้องได้รับอนุญาตให้เข้าถึงกล้องเพื่อถ่ายรูปและวิดีโอ</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">ใช่</string>
+  <string name="ConversationActivity_no">ไม่</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="other">%d ข้อความที่ยังไม่ได้อ่าน</item>
@@ -339,6 +341,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">ข้อความมัลติมีเดีย</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">กำลังดาวน์โหลดข้อความ MMS</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">เกิดข้อผิดพลาดระหว่างดาวน์โหลด MMS แตะเพื่อลองใหม่</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">สื่อทั้งหมด</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">ได้รับข้อความที่เข้ารหัสด้วย Signal รุ่นเก่าที่ไม่รองรับอีกต่อไปแล้ว โปรดขอให้ผู้ส่งอัพเดตแอปเป็นเวอร์ชันล่าสุดและส่งข้อความอีกครั้ง</string>
  <string name="MessageRecord_left_group">คุณได้ออกจากกลุ่ม</string>
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -154,6 +154,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal, fotoğraf veya video çekmek için Kamera iznine ihtiyaç duyar, fakat bu izin kalıcı olarak reddedilmiş. Lütfen uygulama ayarları menüsüne girip \"İzinler\" kısmını seçin, ve \"Kamera\"yı etkinleştirin.</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal fotoğraf veya video çekebilmek için kamera erişimine ihtiyaç duyar</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Evet</string>
+  <string name="ConversationActivity_no">Hayır</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d okunmamış mesaj</item>
@@ -371,6 +373,11 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Multimedya mesajı</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">MMS mesajı indiriliyor</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">MMS mesajı indirilirken hata, yeniden denemek için dokunun</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Tüm medya</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Artık desteklenmeyen eski bir Signal sürümü kullanılarak şifrelenmiş bir mesaj alındı. Gönderen kişiden Signal\'i en son sürüme güncellemesini ve mesajı yeniden göndermesini isteyin.</string>
  <string name="MessageRecord_left_group">Gruptan ayrıldınız.</string>
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -153,6 +153,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal потребує дозволу \"Камера\", щоб фотографувати або знімати відео,  але наразі доступу немає. Будь ласка, перейдіть до налаштувань додатку, оберіть \"Дозволи\", та увімкніть \"Камера\".</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal потребує дозволу \"Камера\", щоб фотографувати або фільмувати.</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_yes">Так</string>
+  <string name="ConversationActivity_no">Ні</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="one">%d непрочитане повідомлення</item>
@@ -390,6 +392,12 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">Мультимедійне повідомлення</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">Завантаження MMS...</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Виникла помилка при завантаженні MMS, натисніть щоб повторити</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">Всі медіа-файли
+Всі зображення</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Отримано повідомлення, яке зашифроване старою версією Signal, яка вже не підтримується. Попросіть друга оновитися до останньої версії та надіслати повідомлення знову.</string>
  <string name="MessageRecord_left_group">Ви покинули групу.</string>
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -151,6 +151,8 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal 需要相机权限来拍摄照片或录制视频。但是该权限已经被永久拒绝，请进入应用程序设置，点击权限，并启用“相机”。</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal 需要相机权限以拍摄照片或视频</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s%2$s</string>
+  <string name="ConversationActivity_yes">是</string>
+  <string name="ConversationActivity_no">否</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="other">%d 条未读信息</item>
@@ -353,6 +355,12 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">多媒体信息</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">正在下载彩信</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">下载彩信时错误，点击重试</string>
+  <!--MediaPickerActivity-->
+  <!--MediaPickerItemFragment-->
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">添加注释...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">所有媒体</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">已收到的信息使用了旧版本的 Signal 进行加密，并且已经不再被支持。请联系发送者升级 Signal 到最新版本然后再次发送该信息。</string>
  <string name="MessageRecord_left_group">您已经离开了此群组。</string>
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -151,6 +151,9 @@
  <string name="ConversationActivity_signal_needs_the_camera_permission_to_take_photos_or_video">Signal 需要相機的權限來拍攝照片或是影片 ，但是現在系統設定為總是拒絕 Signal。請到 Signal 的應用程式設定中，點選「權限」，並啟用相機的權限。</string>
  <string name="ConversationActivity_signal_needs_camera_permissions_to_take_photos_or_video">Signal 需要使用相機的權限來拍攝照片和影片</string>
  <string name="ConversationActivity_quoted_contact_message">%1$s %2$s</string>
+  <string name="ConversationActivity_signal_cannot_sent_sms_mms_messages_because_it_is_not_your_default_sms_app">Signal 無法傳送 SMS/MMS 訊息，因為Signal 不是你預設 SMS 應用軟體。你要在 Android 設定中改變這個設定嗎？</string>
+  <string name="ConversationActivity_yes">是</string>
+  <string name="ConversationActivity_no">否</string>
  <!--ConversationAdapter-->
  <plurals name="ConversationAdapter_n_unread_messages">
    <item quantity="other">%d 則未讀訊息</item>
@@ -353,6 +356,17 @@
  <string name="NotificationMmsMessageRecord_multimedia_message">多媒體訊息</string>
  <string name="NotificationMmsMessageRecord_downloading_mms_message">正在下載MMS訊息</string>
  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">下載MMS訊息時發生錯誤，點擊重試</string>
+  <!--MediaPickerActivity-->
+  <string name="MediaPickerActivity_send_to">傳送給 %s</string>
+  <!--MediaPickerItemFragment-->
+  <string name="MediaPickerItemFragment_tap_to_select">點取以選擇</string>
+  <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+    <item quantity="other">你無法分享超過 %d 個的項目。</item>
+  </plurals>
+  <!--MediaSendActivity-->
+  <string name="MediaSendActivity_add_a_caption">加入一個標題...</string>
+  <!--MediaRepository-->
+  <string name="MediaRepository_all_media">所有的媒體</string>
  <!--MessageRecord-->
  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">收到一則使用舊版本並已經不再支援的 Signal 加密訊息。請尋求傳送人將 Signal 升級到最新的版本並再次傳送該訊息。</string>
  <string name="MessageRecord_left_group">您已經離開了此群組。</string>
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -17,7 +17,18 @@
    <dimen name="contact_photo_target_size">64dp</dimen>
    <dimen name="contact_selection_photo_size">50dp</dimen>

-    <!-- TODO: Consolidate these two message corner things -->
+    <dimen name="album_total_width">210dp</dimen>
+    <dimen name="album_2_total_height">105dp</dimen>
+    <dimen name="album_2_cell_width">104dp</dimen>
+    <dimen name="album_3_total_height">140dp</dimen>
+    <dimen name="album_3_cell_width_big">139dp</dimen>
+    <dimen name="album_3_cell_size_small">69dp</dimen>
+    <dimen name="album_4_total_height">210dp</dimen>
+    <dimen name="album_4_cell_size">104dp</dimen>
+    <dimen name="album_5_total_height">175dp</dimen>
+    <dimen name="album_5_cell_size_big">104dp</dimen>
+    <dimen name="album_5_cell_size_small">69dp</dimen>
+
    <dimen name="message_corner_radius">16dp</dimen>
    <dimen name="message_corner_collapse_radius">4dp</dimen>
    <dimen name="message_bubble_corner_radius">2dp</dimen>
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -440,10 +440,17 @@

    <!-- MediaPickerItemFragment -->
    <string name="MediaPickerItemFragment_tap_to_select">Tap to select</string>
+    <plurals name="MediaPickerItemFragment_cant_share_more_than_n_items">
+        <item quantity="one">You can\'t share more than %d item.</item>
+        <item quantity="other">You can\'t share more than %d items.</item>
+    </plurals>

    <!-- MediaSendActivity -->
    <string name="MediaSendActivity_add_a_caption">Add a caption...</string>

+    <!-- MediaRepository -->
+    <string name="MediaRepository_all_media">All media</string>
+
    <!-- MessageRecord -->
    <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Received a message encrypted using an old version of Signal that is no longer supported. Please ask the sender to update to the most recent version and resend the message.</string>
    <string name="MessageRecord_left_group">You have left the group.</string>
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -1549,7 +1549,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
    Log.i(TAG, "Selected: " + type);
    switch (type) {
    case AttachmentTypeSelector.ADD_GALLERY:
-      AttachmentManager.selectGallery(this, MEDIA_SENDER, recipient, sendButton.getSelectedTransport()); break;
+      AttachmentManager.selectGallery(this, MEDIA_SENDER, recipient, composeText.getTextTrimmed(), sendButton.getSelectedTransport()); break;
    case AttachmentTypeSelector.ADD_DOCUMENT:
      AttachmentManager.selectDocument(this, PICK_DOCUMENT); break;
    case AttachmentTypeSelector.ADD_SOUND:
@@ -2193,7 +2193,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity

    @Override
    public void onQuickAttachment(Uri uri, String mimeType, String bucketId, long dateTaken, int width, int height) {
-      Media media = new Media(uri, mimeType, dateTaken, width, height, Optional.fromNullable(bucketId), Optional.absent());
+      Media media = new Media(uri, mimeType, dateTaken, width, height, Optional.of(Media.ALL_MEDIA_BUCKET_ID), Optional.absent());
      startActivityForResult(MediaSendActivity.getIntent(ConversationActivity.this, Collections.singletonList(media), recipient, composeText.getTextTrimmed(), sendButton.getSelectedTransport()), MEDIA_SENDER);
    }
  }
--- a/src/org/thoughtcrime/securesms/ConversationFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationFragment.java
@@ -59,6 +59,8 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.ViewSwitcher;

+import com.annimon.stream.Stream;
+
 import org.thoughtcrime.securesms.ConversationAdapter.HeaderViewHolder;
 import org.thoughtcrime.securesms.ConversationAdapter.ItemClickListener;
 import org.thoughtcrime.securesms.contactshare.ContactUtil;
@@ -84,6 +86,7 @@ import org.thoughtcrime.securesms.util.CommunicationActions;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.StickyHeaderDecoration;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
+import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.whispersystems.libsignal.util.guava.Optional;
@@ -559,12 +562,14 @@ public class ConversationFragment extends Fragment
  private void handleSaveAttachment(final MediaMmsMessageRecord message) {
    SaveAttachmentTask.showWarningDialog(getActivity(), new DialogInterface.OnClickListener() {
      public void onClick(DialogInterface dialog, int which) {
-        for (Slide slide : message.getSlideDeck().getSlides()) {
-          if ((slide.hasImage() || slide.hasVideo() || slide.hasAudio() || slide.hasDocument()) && slide.getUri() != null) {
-            SaveAttachmentTask saveTask = new SaveAttachmentTask(getActivity());
-            saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, new SaveAttachmentTask.Attachment(slide.getUri(), slide.getContentType(), message.getDateReceived(), slide.getFileName().orNull()));
-            return;
-          }
+        List<SaveAttachmentTask.Attachment> attachments = Stream.of(message.getSlideDeck().getSlides())
+                                                                .filter(s -> s.getUri() != null && (s.hasImage() || s.hasVideo() || s.hasAudio() || s.hasDocument()))
+                                                                .map(s -> new SaveAttachmentTask.Attachment(s.getUri(), s.getContentType(), message.getDateReceived(), s.getFileName().orNull()))
+                                                                .toList();
+        if (!Util.isEmpty(attachments)) {
+          SaveAttachmentTask saveTask = new SaveAttachmentTask(getActivity());
+          saveTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, attachments.toArray(new SaveAttachmentTask.Attachment[0]));
+          return;
        }

        Log.w(TAG, "No slide with attachable media found, failing nicely.");
--- a/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
+++ b/src/org/thoughtcrime/securesms/components/RecentPhotoViewRail.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.components;


+import android.annotation.TargetApi;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
@@ -109,8 +110,8 @@ public class RecentPhotoViewRail extends FrameLayout implements LoaderManager.Lo
      String mimeType     = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.ImageColumns.MIME_TYPE));
      String bucketId     = cursor.getString(cursor.getColumnIndexOrThrow(MediaStore.Images.ImageColumns.BUCKET_ID));
      int    orientation  = cursor.getInt(cursor.getColumnIndexOrThrow(MediaStore.Images.ImageColumns.ORIENTATION));
-      int    width        = Build.VERSION.SDK_INT >= 16 ? cursor.getInt(cursor.getColumnIndexOrThrow(MediaStore.Images.ImageColumns.WIDTH)) : 0;
-      int    height       = Build.VERSION.SDK_INT >= 16 ? cursor.getInt(cursor.getColumnIndexOrThrow(MediaStore.Images.ImageColumns.HEIGHT)) : 0;
+      int    width        = Build.VERSION.SDK_INT >= 16 ? cursor.getInt(cursor.getColumnIndexOrThrow(getWidthColumn(orientation))) : 0;
+      int    height       = Build.VERSION.SDK_INT >= 16 ? cursor.getInt(cursor.getColumnIndexOrThrow(getHeightColumn(orientation))) : 0;

      final Uri uri = Uri.withAppendedPath(baseUri, Long.toString(id));

@@ -128,6 +129,20 @@ public class RecentPhotoViewRail extends FrameLayout implements LoaderManager.Lo

    }

+    @TargetApi(16)
+    @SuppressWarnings("SuspiciousNameCombination")
+    private String getWidthColumn(int orientation) {
+      if (orientation == 0 || orientation == 180) return MediaStore.Images.ImageColumns.WIDTH;
+      else                                        return MediaStore.Images.ImageColumns.HEIGHT;
+    }
+
+    @TargetApi(16)
+    @SuppressWarnings("SuspiciousNameCombination")
+    private String getHeightColumn(int orientation) {
+      if (orientation == 0 || orientation == 180) return MediaStore.Images.ImageColumns.HEIGHT;
+      else                                        return MediaStore.Images.ImageColumns.WIDTH;
+    }
+
    public void setListener(@Nullable OnItemClickedListener listener) {
      this.clickedListener = listener;
    }
--- a/src/org/thoughtcrime/securesms/database/Address.java
+++ b/src/org/thoughtcrime/securesms/database/Address.java
@@ -21,6 +21,7 @@ import org.thoughtcrime.securesms.util.GroupUtil;
 import org.thoughtcrime.securesms.util.NumberUtil;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
+import org.whispersystems.libsignal.util.guava.Optional;

 import java.util.Collections;
 import java.util.HashSet;
@@ -28,6 +29,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.regex.Matcher;
 import java.util.regex.Pattern;

 public class Address implements Parcelable, Comparable<Address> {
@@ -186,26 +188,30 @@ public class Address implements Parcelable, Comparable<Address> {
      add("AC");
    }};

-    private final String localNumberString;
-    private final String localCountryCode;
+    private static final Pattern US_NO_AREACODE = Pattern.compile("^(\\d{7})$");
+    private static final Pattern BR_NO_AREACODE = Pattern.compile("^(9?\\d{8})$");
+
+    private final Optional<PhoneNumber> localNumber;
+    private final String                localCountryCode;

    private final PhoneNumberUtil phoneNumberUtil = PhoneNumberUtil.getInstance();
    private final Pattern         ALPHA_PATTERN   = Pattern.compile("[a-zA-Z]");

    ExternalAddressFormatter(@NonNull String localNumberString) {
      try {
-        Phonenumber.PhoneNumber localNumber = phoneNumberUtil.parse(localNumberString, null);
+        Phonenumber.PhoneNumber libNumber   = phoneNumberUtil.parse(localNumberString, null);
+        int                     countryCode = libNumber.getCountryCode();

-        this.localNumberString = localNumberString;
-        this.localCountryCode  = phoneNumberUtil.getRegionCodeForNumber(localNumber);
+        this.localNumber       = Optional.of(new PhoneNumber(localNumberString, countryCode, parseAreaCode(localNumberString, countryCode)));
+        this.localCountryCode  = phoneNumberUtil.getRegionCodeForNumber(libNumber);
      } catch (NumberParseException e) {
        throw new AssertionError(e);
      }
    }

    ExternalAddressFormatter(@NonNull String localCountryCode, boolean countryCode) {
-      this.localNumberString = "";
-      this.localCountryCode  = localCountryCode;
+      this.localNumber      = Optional.absent();
+      this.localCountryCode = localCountryCode;
    }

    public String format(@Nullable String number) {
@@ -230,20 +236,21 @@ public class Address implements Parcelable, Comparable<Address> {
        return bareNumber;
      }

+      if (isShortCode(bareNumber, localCountryCode)) {
+        return bareNumber;
+      }
+
+      String processedNumber = applyAreaCodeRules(localNumber, bareNumber);
+
      try {
-        Phonenumber.PhoneNumber parsedNumber = phoneNumberUtil.parse(bareNumber, localCountryCode);
-
-        if (ShortNumberInfo.getInstance().isPossibleShortNumberForRegion(parsedNumber, localCountryCode)) {
-          return bareNumber;
-        }
-
+        Phonenumber.PhoneNumber parsedNumber = phoneNumberUtil.parse(processedNumber, localCountryCode);
        return phoneNumberUtil.format(parsedNumber, PhoneNumberUtil.PhoneNumberFormat.E164);
      } catch (NumberParseException e) {
        Log.w(TAG, e);
        if (bareNumber.charAt(0) == '+')
          return bareNumber;

-        String localNumberImprecise = localNumberString;
+        String localNumberImprecise = localNumber.isPresent() ? localNumber.get().getE164Number() : "";

        if (localNumberImprecise.charAt(0) == '+')
          localNumberImprecise = localNumberImprecise.substring(1);
@@ -256,6 +263,72 @@ public class Address implements Parcelable, Comparable<Address> {
        return "+" + localNumberImprecise.substring(0, difference) + bareNumber;
      }
    }
-  }

+    private boolean isShortCode(@NonNull String bareNumber, String localCountryCode) {
+      try {
+        Phonenumber.PhoneNumber parsedNumber = phoneNumberUtil.parse(bareNumber, localCountryCode);
+        return ShortNumberInfo.getInstance().isPossibleShortNumberForRegion(parsedNumber, localCountryCode);
+      } catch (NumberParseException e) {
+        return false;
+      }
+    }
+
+    private @Nullable String parseAreaCode(@NonNull String e164Number, int countryCode) {
+      switch (countryCode) {
+        case 1:
+          return e164Number.substring(2, 5);
+        case 55:
+          return e164Number.substring(3, 5);
+      }
+      return null;
+    }
+
+
+    private @NonNull String applyAreaCodeRules(@NonNull Optional<PhoneNumber> localNumber, @NonNull String testNumber) {
+      if (!localNumber.isPresent() || !localNumber.get().getAreaCode().isPresent()) {
+        return testNumber;
+      }
+
+      Matcher matcher;
+      switch (localNumber.get().getCountryCode()) {
+        case 1:
+          matcher = US_NO_AREACODE.matcher(testNumber);
+          if (matcher.matches()) {
+            return localNumber.get().getAreaCode() + matcher.group();
+          }
+          break;
+
+        case 55:
+          matcher = BR_NO_AREACODE.matcher(testNumber);
+          if (matcher.matches()) {
+            return localNumber.get().getAreaCode() + matcher.group();
+          }
+      }
+      return testNumber;
+    }
+
+    private static class PhoneNumber {
+      private final String           e164Number;
+      private final int              countryCode;
+      private final Optional<String> areaCode;
+
+      PhoneNumber(String e164Number, int countryCode, @Nullable String areaCode) {
+        this.e164Number  = e164Number;
+        this.countryCode = countryCode;
+        this.areaCode    = Optional.fromNullable(areaCode);
+      }
+
+      String getE164Number() {
+        return e164Number;
+      }
+
+      int getCountryCode() {
+        return countryCode;
+      }
+
+      Optional<String> getAreaCode() {
+        return areaCode;
+      }
+    }
+  }
 }
--- a/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/AttachmentUploadJob.java
@@ -48,7 +48,7 @@ public class AttachmentUploadJob extends ContextJob implements InjectableType {
  private AttachmentId               attachmentId;
  @Inject SignalServiceMessageSender messageSender;

-  protected AttachmentUploadJob(@NonNull Context context, @NonNull WorkerParameters workerParameters) {
+  public AttachmentUploadJob(@NonNull Context context, @NonNull WorkerParameters workerParameters) {
    super(context, workerParameters);
  }

--- a/src/org/thoughtcrime/securesms/jobs/ContextJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/ContextJob.java
@@ -13,7 +13,7 @@ public abstract class ContextJob extends Job implements ContextDependent {

  protected transient Context context;

-  protected ContextJob(@NonNull Context context, @NonNull WorkerParameters workerParameters) {
+  public ContextJob(@NonNull Context context, @NonNull WorkerParameters workerParameters) {
    super(context, workerParameters);
  }

--- a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
@@ -3,12 +3,14 @@ package org.thoughtcrime.securesms.jobs;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
+import android.support.annotation.WorkerThread;

 import com.annimon.stream.Collectors;
 import com.annimon.stream.Stream;

 import org.thoughtcrime.securesms.ApplicationContext;
 import org.thoughtcrime.securesms.attachments.Attachment;
+import org.thoughtcrime.securesms.attachments.DatabaseAttachment;
 import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
 import org.thoughtcrime.securesms.database.Address;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -18,8 +20,11 @@ import org.thoughtcrime.securesms.database.NoSuchMessageException;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
+import org.thoughtcrime.securesms.jobmanager.ChainParameters;
+import org.thoughtcrime.securesms.jobmanager.JobManager;
 import org.thoughtcrime.securesms.jobmanager.JobParameters;
 import org.thoughtcrime.securesms.jobmanager.SafeData;
+import org.thoughtcrime.securesms.logging.Log;
 import org.thoughtcrime.securesms.mms.MediaConstraints;
 import org.thoughtcrime.securesms.mms.MmsException;
 import org.thoughtcrime.securesms.mms.OutgoingGroupMediaMessage;
@@ -85,6 +90,29 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
    this.filterRecipientId = -1;
  }

+  @WorkerThread
+  public static void enqueue(@NonNull Context context, @NonNull JobManager jobManager, long messageId, @NonNull Address destination, @Nullable Address filterAddress) {
+    try {
+      MmsDatabase               database       = DatabaseFactory.getMmsDatabase(context);
+      OutgoingMediaMessage      message        = database.getOutgoingMessage(messageId);
+      List<AttachmentUploadJob> attachmentJobs = Stream.of(message.getAttachments()).map(a -> new AttachmentUploadJob(context, ((DatabaseAttachment) a).getAttachmentId())).toList();
+      ChainParameters           chainParams    = new ChainParameters.Builder().setGroupId(destination.serialize()).build();
+
+      if (attachmentJobs.isEmpty()) {
+        jobManager.add(new PushGroupSendJob(context, messageId, destination, filterAddress));
+      } else {
+        jobManager.startChain(attachmentJobs)
+                  .then(new PushGroupSendJob(context, messageId, destination, filterAddress))
+                  .enqueue(chainParams);
+      }
+
+    } catch (NoSuchMessageException | MmsException e) {
+      Log.w(TAG, "Failed to enqueue message.", e);
+      DatabaseFactory.getMmsDatabase(context).markAsSentFailed(messageId);
+      notifyMediaMessageDeliveryFailed(context, messageId);
+    }
+  }
+
  @Override
  protected void initialize(@NonNull SafeData data) {
    messageId     = data.getLong(KEY_MESSAGE_ID);
@@ -175,11 +203,6 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
        database.markAsSentFailed(messageId);
        notifyMediaMessageDeliveryFailed(context, messageId);
      }
-
-    } catch (InvalidNumberException | RecipientFormattingException | UndeliverableMessageException e) {
-      warn(TAG, e);
-      database.markAsSentFailed(messageId);
-      notifyMediaMessageDeliveryFailed(context, messageId);
    } catch (UntrustedIdentityException e) {
      warn(TAG, e);
      database.markAsSentFailed(messageId);
@@ -200,19 +223,16 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
  }

  private List<SendMessageResult> deliver(OutgoingMediaMessage message, @NonNull List<Address> destinations)
-      throws IOException, RecipientFormattingException, InvalidNumberException,
-             UndeliverableMessageException, UntrustedIdentityException
+      throws IOException, UntrustedIdentityException
  {
    rotateSenderCertificateIfNecessary();

-    String                        groupId           = message.getRecipient().getAddress().toGroupString();
-    Optional<byte[]>              profileKey        = getProfileKey(message.getRecipient());
-    MediaConstraints              mediaConstraints  = MediaConstraints.getPushMediaConstraints();
-    List<Attachment>              scaledAttachments = scaleAndStripExifFromAttachments(mediaConstraints, message.getAttachments());
-    List<SignalServiceAttachment> attachmentStreams = getAttachmentsFor(scaledAttachments);
-    Optional<Quote>               quote             = getQuoteFor(message);
-    List<SharedContact>           sharedContacts    = getSharedContactsFor(message);
-    List<SignalServiceAddress>    addresses         = Stream.of(destinations).map(this::getPushAddress).toList();
+    String                        groupId            = message.getRecipient().getAddress().toGroupString();
+    Optional<byte[]>              profileKey         = getProfileKey(message.getRecipient());
+    List<SignalServiceAttachment> attachmentPointers = getAttachmentPointersFor(message.getAttachments());
+    Optional<Quote>               quote              = getQuoteFor(message);
+    List<SharedContact>           sharedContacts     = getSharedContactsFor(message);
+    List<SignalServiceAddress>    addresses          = Stream.of(destinations).map(this::getPushAddress).toList();

    List<Optional<UnidentifiedAccessPair>> unidentifiedAccess = Stream.of(addresses)
                                                                      .map(address -> Address.fromSerialized(address.getNumber()))
@@ -223,7 +243,7 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
    if (message.isGroup()) {
      OutgoingGroupMediaMessage groupMessage     = (OutgoingGroupMediaMessage) message;
      GroupContext              groupContext     = groupMessage.getGroupContext();
-      SignalServiceAttachment   avatar           = attachmentStreams.isEmpty() ? null : attachmentStreams.get(0);
+      SignalServiceAttachment   avatar           = attachmentPointers.isEmpty() ? null : attachmentPointers.get(0);
      SignalServiceGroup.Type   type             = groupMessage.isGroupQuit() ? SignalServiceGroup.Type.QUIT : SignalServiceGroup.Type.UPDATE;
      SignalServiceGroup        group            = new SignalServiceGroup(type, GroupUtil.getDecodedId(groupId), groupContext.getName(), groupContext.getMembersList(), avatar);
      SignalServiceDataMessage  groupDataMessage = SignalServiceDataMessage.newBuilder()
@@ -238,7 +258,7 @@ public class PushGroupSendJob extends PushSendJob implements InjectableType {
      SignalServiceDataMessage groupMessage = SignalServiceDataMessage.newBuilder()
                                                                      .withTimestamp(message.getSentTimeMillis())
                                                                      .asGroupMessage(group)
-                                                                      .withAttachments(attachmentStreams)
+                                                                      .withAttachments(attachmentPointers)
                                                                      .withBody(message.getBody())
                                                                      .withExpiration((int)(message.getExpiresIn() / 1000))
                                                                      .asExpirationUpdate(message.isExpirationUpdate())
--- a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java
@@ -142,7 +142,7 @@ public abstract class PushSendJob extends SendJob {
    return null;
  }

-  protected @Nullable List<SignalServiceAttachment> getAttachmentPointersFor(List<Attachment> attachments) {
+  protected @NonNull List<SignalServiceAttachment> getAttachmentPointersFor(List<Attachment> attachments) {
    return Stream.of(attachments).map(this::getAttachmentPointerFor).filter(a -> a != null).toList();
  }

--- a/src/org/thoughtcrime/securesms/jobs/SendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/SendJob.java
@@ -31,7 +31,7 @@ public abstract class SendJob extends ContextJob {
  @SuppressWarnings("unused")
  private final static String TAG = SendJob.class.getSimpleName();

-  protected SendJob(@NonNull Context context, @NonNull WorkerParameters workerParameters) {
+  public SendJob(@NonNull Context context, @NonNull WorkerParameters workerParameters) {
    super(context, workerParameters);
  }

--- a/src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java
+++ b/src/org/thoughtcrime/securesms/mediapreview/MediaRailAdapter.java
@@ -10,24 +10,29 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.ThumbnailView;
 import org.thoughtcrime.securesms.mediasend.Media;
 import org.thoughtcrime.securesms.mms.GlideRequests;
+import org.thoughtcrime.securesms.util.StableIdGenerator;

 import java.util.ArrayList;
 import java.util.List;

 public class MediaRailAdapter extends RecyclerView.Adapter<MediaRailAdapter.MediaRailViewHolder> {

-  private final GlideRequests    glideRequests;
-  private final List<Media>      media;
-  private final RailItemListener listener;
-  private final boolean          deleteEnabled;
+  private final GlideRequests            glideRequests;
+  private final List<Media>              media;
+  private final RailItemListener         listener;
+  private final boolean                  deleteEnabled;
+  private final StableIdGenerator<Media> stableIdGenerator;

  private int activePosition;

  public MediaRailAdapter(@NonNull GlideRequests glideRequests, @NonNull RailItemListener listener, boolean deleteEnabled) {
-    this.glideRequests = glideRequests;
-    this.media         = new ArrayList<>();
-    this.listener      = listener;
-    this.deleteEnabled = deleteEnabled;
+    this.glideRequests     = glideRequests;
+    this.media             = new ArrayList<>();
+    this.listener          = listener;
+    this.deleteEnabled     = deleteEnabled;
+    this.stableIdGenerator = new StableIdGenerator<>();
+
+    setHasStableIds(true);
  }

  @NonNull
@@ -51,6 +56,11 @@ public class MediaRailAdapter extends RecyclerView.Adapter<MediaRailAdapter.Medi
    return media.size();
  }

+  @Override
+  public long getItemId(int position) {
+    return stableIdGenerator.getId(media.get(position));
+  }
+
  public void setMedia(@NonNull List<Media> media) {
    setMedia(media, activePosition);
  }
--- a/src/org/thoughtcrime/securesms/mediasend/Media.java
+++ b/src/org/thoughtcrime/securesms/mediasend/Media.java
@@ -12,6 +12,8 @@ import org.whispersystems.libsignal.util.guava.Optional;
 */
 public class Media implements Parcelable {

+  public static final String ALL_MEDIA_BUCKET_ID = "org.thoughtcrime.securesms.ALL_MEDIA";
+
  private final Uri    uri;
  private final String mimeType;
  private final long   date;
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemAdapter.java
@@ -13,6 +13,7 @@ import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.GlideRequests;
 import org.thoughtcrime.securesms.util.MediaUtil;
+import org.thoughtcrime.securesms.util.StableIdGenerator;

 import java.util.ArrayList;
 import java.util.Collection;
@@ -22,22 +23,25 @@ import java.util.TreeSet;

 public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItemAdapter.ItemViewHolder> {

-  private final GlideRequests glideRequests;
-  private final EventListener eventListener;
-  private final List<Media>   media;
-  private final Set<Media>    selected;
-  private final int           maxSelection;
+  private final GlideRequests            glideRequests;
+  private final EventListener            eventListener;
+  private final List<Media>              media;
+  private final Set<Media>               selected;
+  private final int                      maxSelection;
+  private final StableIdGenerator<Media> stableIdGenerator;

  private boolean forcedMultiSelect;

  public MediaPickerItemAdapter(@NonNull GlideRequests glideRequests, @NonNull EventListener eventListener, int maxSelection) {
-    this.glideRequests = glideRequests;
-    this.eventListener = eventListener;
-    this.media         = new ArrayList<>();
-    this.maxSelection  = maxSelection;
-    this.selected      = new TreeSet<>((m1, m2) -> {
-      if (m1.equals(m2)) return 0;
-      else               return Long.compare(m2.getDate(), m1.getDate());
+    this.glideRequests     = glideRequests;
+    this.eventListener     = eventListener;
+    this.media             = new ArrayList<>();
+    this.maxSelection      = maxSelection;
+    this.stableIdGenerator = new StableIdGenerator<>();
+    this.selected          = new TreeSet<>((m1, m2) -> {
+      if      (m1.equals(m2))                                 return 0;
+      else if (Long.compare(m2.getDate(), m1.getDate()) == 0) return m2.getUri().compareTo(m1.getUri());
+      else                                                    return Long.compare(m2.getDate(), m1.getDate());
    });

    setHasStableIds(true);
@@ -65,7 +69,7 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem

  @Override
  public long getItemId(int position) {
-    return media.get(position).getDate();
+    return stableIdGenerator.getId(media.get(position));
  }

  void setMedia(@NonNull List<Media> media) {
@@ -130,6 +134,8 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
          if (selected.size() < maxSelection) {
            selected.add(media);
            eventListener.onMediaSelectionChanged(new ArrayList<>(selected));
+          } else {
+            eventListener.onMediaSelectionOverflow(maxSelection);
          }
        });
      }
@@ -143,5 +149,6 @@ public class MediaPickerItemAdapter extends RecyclerView.Adapter<MediaPickerItem
  interface EventListener {
    void onMediaChosen(@NonNull Media media);
    void onMediaSelectionChanged(@NonNull List<Media> media);
+    void onMediaSelectionOverflow(int maxSelection);
  }
 }
--- a/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaPickerItemFragment.java
@@ -22,6 +22,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
+import android.widget.Toast;

 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.mms.GlideApp;
@@ -167,6 +168,11 @@ public class MediaPickerItemFragment extends Fragment implements MediaPickerItem
    viewModel.onSelectedMediaChanged(selected);
  }

+  @Override
+  public void onMediaSelectionOverflow(int maxSelection) {
+    Toast.makeText(requireContext(), getResources().getQuantityString(R.plurals.MediaPickerItemFragment_cant_share_more_than_n_items, maxSelection, maxSelection), Toast.LENGTH_SHORT).show();
+  }
+
  private void initToolbar(Toolbar toolbar) {
    ((AppCompatActivity) requireActivity()).setSupportActionBar(toolbar);
    ((AppCompatActivity) requireActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(true);
--- a/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaRepository.java
@@ -1,20 +1,23 @@
 package org.thoughtcrime.securesms.mediasend;

+import android.annotation.TargetApi;
 import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Environment;
+import android.provider.MediaStore;
 import android.provider.MediaStore.Images;
 import android.provider.MediaStore.Video;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.support.annotation.WorkerThread;

 import com.annimon.stream.Stream;

+import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.Util;
-import org.whispersystems.libsignal.util.Pair;
 import org.whispersystems.libsignal.util.guava.Optional;

 import java.io.File;
@@ -46,11 +49,11 @@ class MediaRepository {

  @WorkerThread
  private @NonNull List<MediaFolder> getFolders(@NonNull Context context) {
-    Pair<String, Map<String, FolderData>> imageFolders = getFolders(context, Images.Media.EXTERNAL_CONTENT_URI);
-    Pair<String, Map<String, FolderData>> videoFolders = getFolders(context, Video.Media.EXTERNAL_CONTENT_URI);
-    Map<String, FolderData>               folders      = new HashMap<>(imageFolders.second());
+    FolderResult imageFolders       = getFolders(context, Images.Media.EXTERNAL_CONTENT_URI);
+    FolderResult videoFolders       = getFolders(context, Video.Media.EXTERNAL_CONTENT_URI);
+    Map<String, FolderData> folders = new HashMap<>(imageFolders.getFolderData());

-    for (Map.Entry<String, FolderData> entry : videoFolders.second().entrySet()) {
+    for (Map.Entry<String, FolderData> entry : videoFolders.getFolderData().entrySet()) {
      if (folders.containsKey(entry.getKey())) {
        folders.get(entry.getKey()).incrementCount(entry.getValue().getCount());
      } else {
@@ -58,7 +61,7 @@ class MediaRepository {
      }
    }

-    String            cameraBucketId = imageFolders.first() != null ? imageFolders.first() : videoFolders.first();
+    String            cameraBucketId = imageFolders.getCameraBucketId() != null ? imageFolders.getCameraBucketId() : videoFolders.getCameraBucketId();
    FolderData        cameraFolder   = cameraBucketId != null ? folders.remove(cameraBucketId) : null;
    List<MediaFolder> mediaFolders   = Stream.of(folders.values()).map(folder -> new MediaFolder(folder.getThumbnail(),
                                                                                                 folder.getTitle(),
@@ -68,6 +71,18 @@ class MediaRepository {
                                                                  .sorted((o1, o2) -> o1.getTitle().toLowerCase().compareTo(o2.getTitle().toLowerCase()))
                                                                  .toList();

+    Uri allMediaThumbnail = imageFolders.getThumbnailTimestamp() > videoFolders.getThumbnailTimestamp() ? imageFolders.getThumbnail() : videoFolders.getThumbnail();
+
+    if (allMediaThumbnail != null) {
+      int allMediaCount = Stream.of(mediaFolders).reduce(0, (count, folder) -> count + folder.getItemCount());
+
+      if (cameraFolder != null) {
+        allMediaCount += cameraFolder.getCount();
+      }
+
+      mediaFolders.add(0, new MediaFolder(allMediaThumbnail, context.getString(R.string.MediaRepository_all_media), allMediaCount, Media.ALL_MEDIA_BUCKET_ID, MediaFolder.FolderType.NORMAL));
+    }
+
    if (cameraFolder != null) {
      mediaFolders.add(0, new MediaFolder(cameraFolder.getThumbnail(), cameraFolder.getTitle(), cameraFolder.getCount(), cameraFolder.getBucketId(), MediaFolder.FolderType.CAMERA));
    }
@@ -76,12 +91,14 @@ class MediaRepository {
  }

  @WorkerThread
-  private @NonNull Pair<String, Map<String, FolderData>> getFolders(@NonNull Context context, @NonNull Uri contentUri) {
-    String                  cameraPath     = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath() + File.separator + "Camera";
-    String                  cameraBucketId = null;
-    Map<String, FolderData> folders        = new HashMap<>();
+  private @NonNull FolderResult getFolders(@NonNull Context context, @NonNull Uri contentUri) {
+    String                  cameraPath         = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).getAbsolutePath() + File.separator + "Camera";
+    String                  cameraBucketId     = null;
+    Uri                     globalThumbnail    = null;
+    long                    thumbnailTimestamp = 0;
+    Map<String, FolderData> folders            = new HashMap<>();

-    String[] projection = new String[] { Images.Media.DATA, Images.Media.BUCKET_ID, Images.Media.BUCKET_DISPLAY_NAME };
+    String[] projection = new String[] { Images.Media.DATA, Images.Media.BUCKET_ID, Images.Media.BUCKET_DISPLAY_NAME, Images.Media.DATE_TAKEN };
    String   selection  = Images.Media.DATA + " NOT NULL";
    String   sortBy     = Images.Media.BUCKET_DISPLAY_NAME + " COLLATE NOCASE ASC, " + Images.Media.DATE_TAKEN + " DESC";

@@ -91,6 +108,7 @@ class MediaRepository {
        Uri        thumbnail = Uri.fromFile(new File(path));
        String     bucketId  = cursor.getString(cursor.getColumnIndexOrThrow(projection[1]));
        String     title     = cursor.getString(cursor.getColumnIndexOrThrow(projection[2]));
+        long       timestamp = cursor.getLong(cursor.getColumnIndexOrThrow(projection[3]));
        FolderData folder    = Util.getOrDefault(folders, bucketId, new FolderData(thumbnail, title, bucketId));

        folder.incrementCount();
@@ -99,16 +117,21 @@ class MediaRepository {
        if (cameraBucketId == null && path.startsWith(cameraPath)) {
          cameraBucketId = bucketId;
        }
+
+        if (timestamp > thumbnailTimestamp) {
+          globalThumbnail    = thumbnail;
+          thumbnailTimestamp = timestamp;
+        }
      }
    }

-    return new Pair<>(cameraBucketId, folders);
+    return new FolderResult(cameraBucketId, globalThumbnail, thumbnailTimestamp, folders);
  }

  @WorkerThread
  private @NonNull List<Media> getMediaInBucket(@NonNull Context context, @NonNull String bucketId) {
-    List<Media> images = getMediaInBucket(context, bucketId, Images.Media.EXTERNAL_CONTENT_URI);
-    List<Media> videos = getMediaInBucket(context, bucketId, Video.Media.EXTERNAL_CONTENT_URI);
+    List<Media> images = getMediaInBucket(context, bucketId, Images.Media.EXTERNAL_CONTENT_URI, true);
+    List<Media> videos = getMediaInBucket(context, bucketId, Video.Media.EXTERNAL_CONTENT_URI, false);
    List<Media> media  = new ArrayList<>(images.size() + videos.size());

    media.addAll(images);
@@ -119,24 +142,39 @@ class MediaRepository {
  }

  @WorkerThread
-  private @NonNull List<Media> getMediaInBucket(@NonNull Context context, @NonNull String bucketId, @NonNull Uri contentUri) {
-    List<Media> media      = new LinkedList<>();
-    String      selection  = Images.Media.BUCKET_ID + " = ? AND " + Images.Media.DATA + " NOT NULL";
-    String      sortBy     = Images.Media.DATE_TAKEN + " DESC";
-    String[]    projection = Build.VERSION.SDK_INT >= 16 ? new String[] { Images.Media._ID, Images.Media.MIME_TYPE, Images.Media.DATE_TAKEN, Images.Media.WIDTH, Images.Media.HEIGHT }
-                                                         : new String[] { Images.Media._ID, Images.Media.MIME_TYPE, Images.Media.DATE_TAKEN };
+  private @NonNull List<Media> getMediaInBucket(@NonNull Context context, @NonNull String bucketId, @NonNull Uri contentUri, boolean hasOrienation) {
+    List<Media> media         = new LinkedList<>();
+    String      selection     = Images.Media.BUCKET_ID + " = ? AND " + Images.Media.DATA + " NOT NULL";
+    String[]    selectionArgs = new String[] { bucketId };
+    String      sortBy        = Images.Media.DATE_TAKEN + " DESC";

-    try (Cursor cursor = context.getContentResolver().query(contentUri, projection, selection, new String[] { bucketId }, sortBy)) {
+    String[] projection;
+
+    if (hasOrienation) {
+      projection = Build.VERSION.SDK_INT >= 16 ? new String[]{Images.Media._ID, Images.Media.MIME_TYPE, Images.Media.DATE_TAKEN, Images.Media.ORIENTATION, Images.Media.WIDTH, Images.Media.HEIGHT}
+                                               : new String[]{Images.Media._ID, Images.Media.MIME_TYPE, Images.Media.DATE_TAKEN, Images.Media.ORIENTATION};
+    } else {
+      projection = Build.VERSION.SDK_INT >= 16 ? new String[]{Images.Media._ID, Images.Media.MIME_TYPE, Images.Media.DATE_TAKEN, Images.Media.WIDTH, Images.Media.HEIGHT}
+                                               : new String[]{Images.Media._ID, Images.Media.MIME_TYPE, Images.Media.DATE_TAKEN };
+    }
+
+    if (Media.ALL_MEDIA_BUCKET_ID.equals(bucketId)) {
+      selection     = Images.Media.DATA + " NOT NULL";
+      selectionArgs = null;
+    }
+
+    try (Cursor cursor = context.getContentResolver().query(contentUri, projection, selection, selectionArgs, sortBy)) {
      while (cursor != null && cursor.moveToNext()) {
-        Uri    uri       = Uri.withAppendedPath(contentUri, cursor.getString(cursor.getColumnIndexOrThrow(projection[0])));
-        String mimetype  = cursor.getString(cursor.getColumnIndexOrThrow(projection[1]));
-        long   dateTaken = cursor.getLong(cursor.getColumnIndexOrThrow(projection[2]));
-        int    width     = 0;
-        int    height    = 0;
+        Uri    uri         = Uri.withAppendedPath(contentUri, cursor.getString(cursor.getColumnIndexOrThrow(Images.Media._ID)));
+        String mimetype    = cursor.getString(cursor.getColumnIndexOrThrow(Images.Media.MIME_TYPE));
+        long   dateTaken   = cursor.getLong(cursor.getColumnIndexOrThrow(Images.Media.DATE_TAKEN));
+        int    orientation = hasOrienation ? cursor.getInt(cursor.getColumnIndexOrThrow(Images.Media.ORIENTATION)) : 0;
+        int    width       = 0;
+        int    height      = 0;

        if (Build.VERSION.SDK_INT >= 16) {
-          width  = cursor.getInt(cursor.getColumnIndexOrThrow(projection[3]));
-          height = cursor.getInt(cursor.getColumnIndexOrThrow(projection[4]));
+          width  = cursor.getInt(cursor.getColumnIndexOrThrow(getWidthColumn(orientation)));
+          height = cursor.getInt(cursor.getColumnIndexOrThrow(getHeightColumn(orientation)));
        }

        media.add(new Media(uri, mimetype, dateTaken, width, height, Optional.of(bucketId), Optional.absent()));
@@ -146,6 +184,55 @@ class MediaRepository {
    return media;
  }

+
+  @TargetApi(16)
+  @SuppressWarnings("SuspiciousNameCombination")
+  private String getWidthColumn(int orientation) {
+    if (orientation == 0 || orientation == 180) return Images.Media.WIDTH;
+    else                                        return Images.Media.HEIGHT;
+  }
+
+  @TargetApi(16)
+  @SuppressWarnings("SuspiciousNameCombination")
+  private String getHeightColumn(int orientation) {
+    if (orientation == 0 || orientation == 180) return Images.Media.HEIGHT;
+    else                                        return Images.Media.WIDTH;
+  }
+
+  private static class FolderResult {
+    private final String                  cameraBucketId;
+    private final Uri                     thumbnail;
+    private final long                    thumbnailTimestamp;
+    private final Map<String, FolderData> folderData;
+
+    private FolderResult(@Nullable String cameraBucketId,
+                         @Nullable Uri thumbnail,
+                         long thumbnailTimestamp,
+                         @NonNull Map<String, FolderData> folderData)
+    {
+      this.cameraBucketId     = cameraBucketId;
+      this.thumbnail          = thumbnail;
+      this.thumbnailTimestamp = thumbnailTimestamp;
+      this.folderData         = folderData;
+    }
+
+    @Nullable String getCameraBucketId() {
+      return cameraBucketId;
+    }
+
+    @Nullable Uri getThumbnail() {
+      return thumbnail;
+    }
+
+    long getThumbnailTimestamp() {
+      return thumbnailTimestamp;
+    }
+
+    @NonNull Map<String, FolderData> getFolderData() {
+      return folderData;
+    }
+  }
+
  private static class FolderData {
    private final Uri    thumbnail;
    private final String title;
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendActivity.java
@@ -55,16 +55,18 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();

  private Recipient          recipient;
+  private String             body;
  private TransportOption    transport;
  private MediaSendViewModel viewModel;

  /**
   * Get an intent to launch the media send flow starting with the picker.
   */
-  public static Intent getIntent(@NonNull Context context, @NonNull Recipient recipient, @NonNull TransportOption transport) {
+  public static Intent getIntent(@NonNull Context context, @NonNull Recipient recipient, @NonNull String body, @NonNull TransportOption transport) {
    Intent intent = new Intent(context, MediaSendActivity.class);
    intent.putExtra(KEY_ADDRESS, recipient.getAddress().serialize());
    intent.putExtra(KEY_TRANSPORT, transport);
+    intent.putExtra(KEY_BODY, body);
    return intent;
  }

@@ -78,9 +80,8 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
                                 @NonNull String body,
                                 @NonNull TransportOption transport)
  {
-    Intent intent = getIntent(context, recipient, transport);
+    Intent intent = getIntent(context, recipient, body, transport);
    intent.putParcelableArrayListExtra(KEY_MEDIA, new ArrayList<>(media));
-    intent.putExtra(KEY_BODY, body);
    return intent;
  }

@@ -101,10 +102,10 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple

    viewModel = ViewModelProviders.of(this, new MediaSendViewModel.Factory(new MediaRepository())).get(MediaSendViewModel.class);
    recipient = Recipient.from(this, Address.fromSerialized(getIntent().getStringExtra(KEY_ADDRESS)), true);
+    body      = getIntent().getStringExtra(KEY_BODY);
    transport = getIntent().getParcelableExtra(KEY_TRANSPORT);

    List<Media> media = getIntent().getParcelableArrayListExtra(KEY_MEDIA);
-    String      body  = getIntent().getStringExtra(KEY_BODY);

    if (!Util.isEmpty(media)) {
      navigateToMediaSend(media, body, transport);
@@ -123,7 +124,7 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple
  @Override
  public void onBackPressed() {
    MediaSendFragment sendFragment = (MediaSendFragment) getSupportFragmentManager().findFragmentByTag(TAG_SEND);
-    if (sendFragment == null || !sendFragment.handleBackPress()) {
+    if (sendFragment == null || !sendFragment.isVisible() || !sendFragment.handleBackPress()) {
      super.onBackPressed();
    }
  }
@@ -145,7 +146,7 @@ public class MediaSendActivity extends PassphraseRequiredActionBarActivity imple

  @Override
  public void onMediaSelected(@NonNull String bucketId, @NonNull Collection<Media> media) {
-    MediaSendFragment fragment = MediaSendFragment.newInstance("", transport, dynamicLanguage.getCurrentLocale());
+    MediaSendFragment fragment = MediaSendFragment.newInstance(body, transport, dynamicLanguage.getCurrentLocale());
    getSupportFragmentManager().beginTransaction()
                               .setCustomAnimations(R.anim.fade_in, R.anim.fade_out, R.anim.fade_in, R.anim.fade_out)
                               .replace(R.id.mediapicker_fragment_container, fragment, TAG_SEND)
--- a/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
+++ b/src/org/thoughtcrime/securesms/mediasend/MediaSendViewModel.java
@@ -11,6 +11,7 @@ import android.text.TextUtils;

 import com.annimon.stream.Stream;

+import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libsignal.util.guava.Optional;

@@ -45,15 +46,18 @@ class MediaSendViewModel extends ViewModel {
  }

  void setInitialSelectedMedia(@NonNull List<Media> newMedia) {
-    boolean allBucketsPopulated = Stream.of(newMedia).reduce(true, (populated, m) -> populated && m.getBucketId().isPresent());
+    List<Media> filteredMedia       = getFilteredMedia(newMedia);
+    boolean     allBucketsPopulated = Stream.of(filteredMedia).reduce(true, (populated, m) -> populated && m.getBucketId().isPresent());

-    selectedMedia.setValue(newMedia);
-    bucketId.setValue(allBucketsPopulated ? computeBucketId(newMedia) : Optional.absent());
+    selectedMedia.setValue(filteredMedia);
+    bucketId.setValue(allBucketsPopulated ? computeBucketId(filteredMedia) : Optional.absent());
  }

  void onSelectedMediaChanged(@NonNull List<Media> newMedia) {
-    selectedMedia.setValue(newMedia);
-    position.setValue(newMedia.isEmpty() ? -1 : 0);
+    List<Media> filteredMedia = getFilteredMedia(newMedia);
+
+    selectedMedia.setValue(filteredMedia);
+    position.setValue(filteredMedia.isEmpty() ? -1 : 0);
  }

  void onFolderSelected(@NonNull String bucketId) {
@@ -113,13 +117,20 @@ class MediaSendViewModel extends ViewModel {
    String candidate = media.get(0).getBucketId().get();
    for (int i = 1; i < media.size(); i++) {
      if (!Util.equals(candidate, media.get(i).getBucketId().orNull())) {
-        return Optional.absent();
+        return Optional.of(Media.ALL_MEDIA_BUCKET_ID);
      }
    }

    return Optional.of(candidate);
  }

+  private @NonNull List<Media> getFilteredMedia(@NonNull List<Media> media) {
+    return Stream.of(media).filter(m -> MediaUtil.isGif(m.getMimeType())       ||
+                                        MediaUtil.isImageType(m.getMimeType()) ||
+                                        MediaUtil.isVideoType(m.getMimeType())).toList();
+
+  }
+
  static class Factory extends ViewModelProvider.NewInstanceFactory {

    private final MediaRepository repository;
--- a/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
+++ b/src/org/thoughtcrime/securesms/mms/AttachmentManager.java
@@ -373,13 +373,13 @@ public class AttachmentManager {
               .execute();
  }

-  public static void selectGallery(Activity activity, int requestCode, @NonNull Recipient recipient, @NonNull TransportOption transport) {
+  public static void selectGallery(Activity activity, int requestCode, @NonNull Recipient recipient, @NonNull String body, @NonNull TransportOption transport) {
    Permissions.with(activity)
               .request(Manifest.permission.WRITE_EXTERNAL_STORAGE)
               .ifNecessary()
               .withPermanentDenialDialog(activity.getString(R.string.AttachmentManager_signal_requires_the_external_storage_permission_in_order_to_attach_photos_videos_or_audio))
               .onAllGranted(() -> selectMediaType(activity, "image/*", new String[] {"image/*", "video/*"}, requestCode))
-               .onAllGranted(() -> activity.startActivityForResult(MediaSendActivity.getIntent(activity, recipient, transport), requestCode))
+               .onAllGranted(() -> activity.startActivityForResult(MediaSendActivity.getIntent(activity, recipient, body, transport), requestCode))
               .execute();
  }

--- a/src/org/thoughtcrime/securesms/sms/MessageSender.java
+++ b/src/org/thoughtcrime/securesms/sms/MessageSender.java
@@ -204,7 +204,7 @@ public class MessageSender {

  private static void sendGroupPush(Context context, Recipient recipient, long messageId, Address filterAddress) {
    JobManager jobManager = ApplicationContext.getInstance(context).getJobManager();
-    jobManager.add(new PushGroupSendJob(context, messageId, recipient.getAddress(), filterAddress));
+    PushGroupSendJob.enqueue(context, jobManager, messageId, recipient.getAddress(), filterAddress);
  }

  private static void sendSms(Context context, Recipient recipient, long messageId) {
--- a/src/org/thoughtcrime/securesms/util/StableIdGenerator.java
+++ b/src/org/thoughtcrime/securesms/util/StableIdGenerator.java
@@ -0,0 +1,31 @@
+package org.thoughtcrime.securesms.util;
+
+import android.support.annotation.MainThread;
+import android.support.annotation.NonNull;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Useful for generate ID's to be used with
+ * {@link android.support.v7.widget.RecyclerView.Adapter#getItemId(int)} when you otherwise don't
+ * have a good way to generate an ID.
+ */
+public class StableIdGenerator<E> {
+
+  private final Map<E, Long> keys = new HashMap<>();
+
+  private long index = 1;
+
+  @MainThread
+  public long getId(@NonNull E item) {
+    if (keys.containsKey(item)) {
+      return keys.get(item);
+    }
+
+    long key = index++;
+    keys.put(item, key);
+
+    return key;
+  }
+}
--- a/test/unitTest/java/org/thoughtcrime/securesms/database/AddressTest.java
+++ b/test/unitTest/java/org/thoughtcrime/securesms/database/AddressTest.java
@@ -39,11 +39,45 @@ public class AddressTest {
    assertEquals(formatter.format("+1 415.111.1126"), "+14151111126");
    assertEquals(formatter.format("+1 415 111 1127"), "+14151111127");
    assertEquals(formatter.format("+1 (415) 111 1128"), "+14151111128");
+    assertEquals(formatter.format("911"), "911");
+    assertEquals(formatter.format("+456-7890"), "+4567890");

    formatter = new Address.ExternalAddressFormatter("+442079460010");
    assertEquals(formatter.format("(020) 7946 0018"), "+442079460018");
  }

+  @Test
+  public void testUsNumbers() {
+    Address.ExternalAddressFormatter formatter = new Address.ExternalAddressFormatter("+16105880522");
+
+    assertEquals("+551234567890", formatter.format("+551234567890"));
+    assertEquals("+11234567890", formatter.format("(123) 456-7890"));
+    assertEquals("+11234567890", formatter.format("1234567890"));
+    assertEquals("+16104567890", formatter.format("456-7890"));
+    assertEquals("+16104567890", formatter.format("4567890"));
+    assertEquals("+11234567890", formatter.format("011 1 123 456 7890"));
+    assertEquals("+5511912345678", formatter.format("0115511912345678"));
+    assertEquals("+16105880522", formatter.format("+16105880522"));
+  }
+
+  @Test
+  public void testBrNumbers() {
+    Address.ExternalAddressFormatter formatter = new Address.ExternalAddressFormatter("+5521912345678");
+
+    assertEquals("+16105880522", formatter.format("+16105880522"));
+    assertEquals("+552187654321", formatter.format("8765 4321"));
+    assertEquals("+5521987654321", formatter.format("9 8765 4321"));
+    assertEquals("+552287654321", formatter.format("22 8765 4321"));
+    assertEquals("+5522987654321", formatter.format("22 9 8765 4321"));
+    assertEquals("+551234567890", formatter.format("+55 (123) 456-7890"));
+    assertEquals("+14085048577", formatter.format("002214085048577"));
+    assertEquals("+5511912345678", formatter.format("011912345678"));
+    assertEquals("+5511912345678", formatter.format("02111912345678"));
+    assertEquals("+551234567", formatter.format("1234567"));
+    assertEquals("+5521912345678", formatter.format("+5521912345678"));
+    assertEquals("+552112345678", formatter.format("+552112345678"));
+  }
+
  @Test
  public void testGroup() throws Exception {
    Address.ExternalAddressFormatter formatter = new Address.ExternalAddressFormatter("+14152222222");
@@ -55,5 +89,4 @@ public class AddressTest {
    Address.ExternalAddressFormatter formatter = new Address.ExternalAddressFormatter("US", true);
    assertEquals(formatter.format("(415) 111-1122"), "+14151111122");
  }
-
 }
Author	SHA1	Message	Date
Greyson Parrelli	57ef0e9024	Bump version to 4.32.6	2019-01-17 12:33:41 -08:00
Greyson Parrelli	9ed290b8f6	Updated language translations.	2019-01-17 12:33:41 -08:00
Greyson Parrelli	d2be554e1b	Use orientation in media picker to determine width and height.	2019-01-17 12:33:41 -08:00
Greyson Parrelli	e7a807ab5b	Ensure body text is carried through to the media send screen. We were only doing it if you entered through the media rail. Now we also do it if you enter through the gallery.	2019-01-17 11:42:01 -08:00
Greyson Parrelli	9ff8f8587b	Bump version to 4.32.5	2019-01-16 14:34:36 -08:00
Greyson Parrelli	a6f31c60bd	Show a toast when you've gone over the max media selection.	2019-01-16 14:31:59 -08:00
Greyson Parrelli	4643dea2ad	Filter out non-media from media send screen.	2019-01-16 13:32:39 -08:00
Greyson Parrelli	f70bf9c5bd	Default to 'All media' bucket for items from the rail. This should give people a better multi-send experience when they want to add more media.	2019-01-16 13:18:16 -08:00
Greyson Parrelli	557e6a800f	Bump version to 4.32.4	2019-01-16 00:10:46 -08:00
Greyson Parrelli	17a391d3cf	Updated language translations.	2019-01-16 00:06:53 -08:00
Greyson Parrelli	fc989f3820	Fix album sizing issues on skinnier devices.	2019-01-15 23:57:43 -08:00
Greyson Parrelli	2be382afab	Bump version to 4.32.3	2019-01-15 15:10:18 -08:00
Greyson Parrelli	b08f81a8dc	Fix bug where back stack can get stuck in the gallery.	2019-01-15 15:08:35 -08:00
Greyson Parrelli	535e00c6d0	Saving an album will now save every item. Fixes a bug where saving would incorrectly only save the first image.	2019-01-15 14:56:27 -08:00
Greyson Parrelli	db1abf3746	Bump version to 4.32.2	2019-01-15 13:52:02 -08:00
Greyson Parrelli	66dde4415d	Added an 'All media' folder in the gallery.	2019-01-15 13:38:06 -08:00
Greyson Parrelli	ce3deb4057	Update WorkManager to beta02.	2019-01-15 12:54:14 -08:00
Greyson Parrelli	2209ff2272	Use AttachmentUploadJob in PushGroupSendJob.	2019-01-15 12:43:38 -08:00
Greyson Parrelli	1502b0ae3e	Add processing rules for partial US and BR phone numbers.	2019-01-15 11:57:42 -08:00
Greyson Parrelli	553669de45	Bump version to 4.32.1	2019-01-14 15:43:21 -08:00
Greyson Parrelli	4952b4470d	Fix bug related to gallery selection state. TreeSets are annoying. contains() is calculated with the comparator, which can lead to some weird bugs. Made sure the comparator didn't think two items with the same date were identical. Also fixed stableId generation to avoid any potential weirdness there.	2019-01-14 15:40:38 -08:00
Greyson Parrelli	5450967d00	Ensure all Workers have a public WorkManager constructor.	2019-01-14 15:15:53 -08:00