Bump version to 4.3.0

// FREEBIE

AndroidManifest.xml

@@ -115,9 +115,7 @@
               android:excludeFromRecents="true"
               android:screenOrientation="portrait"
               android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|screenSize|fontScale"
-              android:launchMode="singleTask">
-    </activity>
-
+              android:launchMode="singleTask"/>
 
     <activity android:name=".CountrySelectionActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"/>

build.gradle

@@ -57,6 +57,8 @@ dependencies {
     compile 'com.google.android.gms:play-services-maps:9.6.1'
     compile 'com.google.android.gms:play-services-places:9.6.1'
 
+    compile 'com.google.android.exoplayer:exoplayer:r2.3.1'
+
     compile 'org.whispersystems:jobmanager:1.0.2'
     compile 'org.whispersystems:libpastelog:1.0.7'
     compile 'org.whispersystems:signal-service-android:2.5.5'
@@ -127,6 +129,7 @@ dependencyVerification {
         'com.google.android.gms:play-services-gcm:312e61253a236f2d9b750b9c04fc92fd190d23b0b2755c99de6ce4a28b259dae',
         'com.google.android.gms:play-services-maps:45e8021e7ddac4a44a82a0e9698991389ded3023d35c58f38dbd86d54211ec0e',
         'com.google.android.gms:play-services-places:abf3a4a3b146ec7e6e753be62775e512868cf37d6f88ffe2d81167b33b57132b',
+        'com.google.android.exoplayer:exoplayer:955085aa611a8f7cf6c61b88ae03d1a392f4ad94c9bfbc153f3dedb9ffb14718',
         'org.whispersystems:jobmanager:506f679fc2fcf7bb6d10f00f41d6f6ea0abf75c70dc95b913398661ad538a181',
         'org.whispersystems:libpastelog:bb331d9a98240fc139101128ba836c1edec3c40e000597cdbb29ebf4cbf34d88',
         'org.whispersystems:signal-service-android:3d7859b194e518fbaf5a082daf22ca345411705e825791f751eb388f149583c3',
@@ -154,7 +157,6 @@ dependencyVerification {
         'com.davemorrissey.labs:subsampling-scale-image-view:550c5baa07e0bb4ff0a18b705e96d34436d22619248bd8c08c08c730b1f55cfe',
         'cn.carbswang.android:NumberPickerView:18b3c316d62c7c277978a8d4ed57a5b8f4e943762264960f579a8a549c756729',
         'com.tomergoldst.android:tooltips:4c56697dd1ad64b8066535c61f961a6d901e7ae5d97ae27084ba40ad620349b6',
-        'com.android.support:support-annotations:fb941680f43afbd70ce01ec3cc837a5037f0a774701b12a9fd3090bd4727cf15',
         'com.android.support:support-v4:ed4cda7c752f51d33f9bbdfff3422b425b323d356cd1bdc9786aa413c912e594',
         'com.android.support:support-vector-drawable:2697503d3e8e709023ae176ba5db7f98ca0aa0b4e6290aedcb3c371904806bf7',
         'com.android.support:animated-vector-drawable:6d05cb63d1f68900220f85c56dfe1066a9bb19cb0ec1247cc68fc2ba32f6b4a7',
@@ -180,6 +182,7 @@ dependencyVerification {
         'com.fasterxml.jackson.core:jackson-annotations:0ca408c24202a7626ec8b861e99d85eca5e38b73311dd6dd12e3e9deecc3fe94',
         'com.fasterxml.jackson.core:jackson-core:cbf4604784b4de226262845447a1ad3bb38a6728cebe86562e2c5afada8be2c0',
         'com.squareup.okio:okio:8c5436cadfab36bbd97db5f5c43b7bfdb5bf2f5f894ec8709b1929f14bdd010c',
+        'com.android.support:support-annotations:47a2a30eab487a490a8a8f16678007c3d2b6dcae1e09b0485a12bbf921200ec3',
         'com.android.support:support-media-compat:8d6a1a5ba3d9eb1a25cb8f21bb312ac6280202e3d2900cb0b447d065d0d8a125',
         'com.android.support:support-core-utils:a7649e18c04143dde40c218c5ce9a030e7ae674089cd7b18c6cf8ed2a22cf01a',
         'com.android.support:support-fragment:1294500b357f52cf3779e2521c79f54ae7844f3b9a5f6727495dbbda7f231377',
@@ -196,8 +199,8 @@ android {
     }
 
     defaultConfig {
-        versionCode 257
-        versionName "4.2.4"
+        versionCode 259
+        versionName "4.3.0"
 
         minSdkVersion 9
         targetSdkVersion 22

res/drawable/preference_divider.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item>
+        <shape>
+            <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
+            <solid android:color="#d4d4d4" />
+        </shape>
+    </item>
+
+    <item>
+        <shape>
+            <padding android:top="1dp" android:right="0dp" android:bottom="0dp" android:left="0dp" />
+            <solid android:color="#dddddd" />
+            <size android:height="20dp"/>
+        </shape>
+    </item>
+
+</layer-list>

res/layout-v16/video_player.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:orientation="vertical"
+             android:layout_width="match_parent"
+             android:layout_height="match_parent">
+
+    <com.google.android.exoplayer2.ui.SimpleExoPlayerView
+            android:id="@+id/video_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            android:gravity="center"/>
+
+</FrameLayout>

res/layout/conversation_input_panel.xml

@@ -24,6 +24,8 @@
         <LinearLayout android:id="@+id/compose_bubble"
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
+                      android:paddingTop="8dp"
+                      android:paddingBottom="8dp"
                       android:background="@drawable/sent_bubble"
                       android:clipChildren="false"
                       android:clipToPadding="false">
@@ -103,7 +105,8 @@
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:layout_gravity="center_vertical"
-                      android:orientation="horizontal">
+                      android:orientation="horizontal"
+                      tools:visibility="gone">
 
             <TextView android:id="@+id/record_time"
                       android:layout_width="wrap_content"
@@ -148,6 +151,7 @@
             android:id="@+id/button_toggle"
             android:layout_width="50dp"
             android:layout_height="50dp"
+            android:layout_marginBottom="1dp"
             android:background="@drawable/circle_tintable"
             android:layout_gravity="bottom">
 

res/layout/conversation_list_item_view.xml

@@ -7,13 +7,13 @@
         android:focusable="true"
         android:nextFocusRight="@+id/fab"
         android:nextFocusLeft="@+id/container"
-        android:layout_height="70dp">
+        android:layout_height="75dp">
 
     <org.thoughtcrime.securesms.components.AvatarImageView
         android:id="@+id/contact_photo_image"
         android:foreground="@drawable/contact_photo_background"
-        android:layout_width="50dp"
-        android:layout_height="50dp"
+        android:layout_width="54dp"
+        android:layout_height="54dp"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
         android:layout_centerVertical="true"
@@ -23,7 +23,7 @@
         tools:src="@drawable/ic_contact_picture"
         android:contentDescription="@string/conversation_list_item_view__contact_photo_image"
         android:layout_marginRight="10dp"
-        android:layout_marginLeft="10dp" />
+        android:layout_marginLeft="14dp" />
 
     <RelativeLayout android:layout_width="match_parent"
                   android:layout_height="wrap_content"
@@ -51,6 +51,7 @@
                   android:singleLine="true"
                   tools:text="Jules Bonnot"
                   android:ellipsize="end"
+                  android:layout_marginBottom="2dp"
                   android:drawablePadding="5dp"/>
 
         <org.thoughtcrime.securesms.components.AlertView

res/layout/led_color_preference_widget.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             android:layout_width="wrap_content"
+             android:layout_height="wrap_content"
+             android:layout_marginRight="3dp">
+
+    <ImageView
+            android:id="@+id/color_view"
+            android:layout_width="20dp"
+            android:layout_height="20dp"
+            android:layout_gravity="center"
+            android:scaleType="fitXY" />
+</FrameLayout>

res/layout/preference_divider.xml

@@ -0,0 +1,14 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical"
+              android:layout_margin="0dp"
+              android:background="@color/amber_50"
+              android:padding="0dp">
+
+    <View
+            android:layout_width="match_parent"
+            android:layout_height="10dp"
+            android:background="@drawable/preference_divider"/>
+
+</LinearLayout>

res/values-ar/strings.xml

@@ -638,9 +638,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">إخطارات المحادثة مكتومة</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">أرسل رسالة سيجنال.</string>
-  <string name="conversation_activity__type_message_sms_insecure">أرسل رسالة نصية غير آمنة</string>
-  <string name="conversation_activity__type_message_mms_insecure">أرسل رسالة وسائط متعددة غير آمنة</string>
   <string name="conversation_activity__from_sim_name">من %1$s</string>
   <string name="conversation_activity__send">أرسل</string>
   <string name="conversation_activity__remove">إزالة</string>
@@ -889,6 +886,7 @@
   <string name="arrays__images">صور</string>
   <string name="arrays__audio">صوت</string>
   <string name="arrays__video">فيديو</string>
+  <string name="arrays__normal">طبيعي</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="zero">%d ساعة</item>
@@ -934,7 +932,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">مطفأة:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">تم إعداد أسولب وميض LED!</string>
   <string name="preferences__sound">صوت</string>
-  <string name="preferences__change_notification_sound">تغيير صوت التنبيه</string>
   <string name="preferences__silent">صامت</string>
   <string name="preferences__in_conversation_notifications">تنويهات أثناء المحادثة</string>
   <string name="preferences__play_inthread_notifications">تفعيل تنبيه صوتي أثناء مطالعة محادثة نشطة</string>

res/values-be/strings.xml

@@ -286,8 +286,6 @@
   <string name="contact_selection_recent_activity__no_recent_calls">Няма новых выклікаў.</string>
   <!--conversation_title_view-->
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_sms_insecure">Даслаць неабароненую SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Даслаць неабароненую MMS</string>
   <string name="conversation_activity__send">Даслаць</string>
   <string name="conversation_activity__remove">Выдаліць</string>
   <string name="conversation_activity__window_description">Размова з %1$s</string>
@@ -408,6 +406,7 @@
   <string name="arrays__import_export">Імпарт / экспарт</string>
   <string name="arrays__use_default">Выкарыстоўваць стандартны</string>
   <string name="arrays__use_custom">Выкарыстоўваць кастамны</string>
+  <string name="arrays__normal">Нармальна</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d гадзіна</item>
@@ -441,7 +440,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Выключаны для:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Пэўны ўзор міргацення светладыёда усталяваны!</string>
   <string name="preferences__sound">Гук</string>
-  <string name="preferences__change_notification_sound">Змяніць гук апавяшчэння</string>
   <string name="preferences__repeat_alerts">Паўтарыць папярэджанні</string>
   <string name="preferences__never">Ніколі</string>
   <string name="preferences__one_time">Адзін раз</string>

res/values-bg/strings.xml

@@ -227,6 +227,7 @@
   <string name="DeviceListItem_last_active_s">Последна активност %s</string>
   <string name="DeviceListItem_today">Днес</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Непознат файл</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Оптимизиране за липсващи Play услуги</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Това устройство не поддържа Play услуги. Натиснете, за да изключите оптимизациите на батерият, за да преустановите опитите на Сигнал да изтегля съобщения, когато не е активен.</string>
@@ -364,6 +365,7 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <string name="MessageRecord_s_called_you">%s ти се обади</string>
   <string name="MessageRecord_called_s">Обаждане до %s</string>
   <string name="MessageRecord_missed_call_from">Пропуснато обаждане от %s</string>
+  <string name="MessageRecord_s_joined_signal">%s се присъедини към Сигнал!</string>
   <string name="MessageRecord_you_set_disappearing_message_time_to_s">Заложихте време за изчезване на съобщения на %1$s.</string>
   <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s заложи време за изчезване на съобщения на %2$s.</string>
   <string name="MessageRecord_your_safety_number_with_s_has_changed">Числата Ви за сигурност с %s са променени</string>
@@ -514,6 +516,7 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <string name="ThreadRecord_called_you">Ви се обади</string>
   <string name="ThreadRecord_missed_call">Пропуснато обаждане</string>
   <string name="ThreadRecord_media_message">Медийно съобщение</string>
+  <string name="ThreadRecord_s_joined_signal">%s се присъедини към Сигнал!</string>
   <string name="ThreadRecord_disappearing_message_time_updated_to_s">Времето за изчезване на съобщенията е %s</string>
   <string name="ThreadRecord_your_safety_number_with_s_has_changed">Числата Ви за сигурност с %s са променени.</string>
   <!--UpdateApkReadyListener-->
@@ -590,6 +593,7 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Бърз отговор не е възможен, когато Сигнал е заключен!</string>
   <string name="QuickResponseService_problem_sending_message">Проблем при изпрашане на съобщение!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Отваряне на папка</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Сигнал</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Ново съобщение</string>
@@ -637,9 +641,6 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Чатът е в тих режим</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Изпрати Сигнал съобщение</string>
-  <string name="conversation_activity__type_message_sms_insecure">Изпрати некриптиран SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Изпрати некриптиран MMS</string>
   <string name="conversation_activity__from_sim_name">От %1$s</string>
   <string name="conversation_activity__send">Изпрати</string>
   <string name="conversation_activity__remove">Премахни</string>
@@ -775,11 +776,11 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <string name="recipient_preferences__color_for_this_contact">Цвят за този контакт</string>
   <string name="recipient_preferences__verify_safety_number">Проверка на числата за сигурност</string>
   <!--- redphone_call_controls-->
-  <string name="redphone_call_card__signal_call">Сигнал-ско обаждане</string>
+  <string name="redphone_call_card__signal_call">Обаждане през Сигнал</string>
   <string name="redphone_call_controls__end_call">прекрати обаждането</string>
   <string name="redphone_call_controls__audio">Аудио</string>
   <string name="redphone_call_controls__mute">Заглуши</string>
-  <string name="redphone_call_controls__signal_call">Сигнал-ско обаждане</string>
+  <string name="redphone_call_controls__signal_call">Обаждане през Сигнал</string>
   <!--registration_activity-->
   <string name="registration_activity__verify_your_number_to_connect_with_signal">
 Потвърди своя телфонен номер, за да се свържеш с Сигнал</string>
@@ -893,6 +894,7 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <string name="arrays__audio">Аудио</string>
   <string name="arrays__video">Видео</string>
   <string name="arrays__documents">Документи</string>
+  <string name="arrays__normal">Нормално</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d час</item>
@@ -934,7 +936,6 @@ SMS-те от системния архив в Сигнал. Ако вече с
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Спрени за:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Новият начин за LED известяване зададен!</string>
   <string name="preferences__sound">Мелодия</string>
-  <string name="preferences__change_notification_sound">Промени звуков сигнал за известие</string>
   <string name="preferences__silent">Тих</string>
   <string name="preferences__in_conversation_notifications">Известия по време на разговор</string>
   <string name="preferences__play_inthread_notifications">Пускай звук за известие докато гледаш активен чат</string>

res/values-cs/strings.xml

@@ -651,9 +651,6 @@ Obdržen požadavek na výměnu klíčů pro neplatnou verzi protokolu.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Konverzace ztišena</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Poslat Signal zprávu</string>
-  <string name="conversation_activity__type_message_sms_insecure">Poslat nezabezpečenou SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Poslat nezabezpečenou MMS</string>
   <string name="conversation_activity__from_sim_name">Od %1$s</string>
   <string name="conversation_activity__send">Odeslat</string>
   <string name="conversation_activity__remove">Odebrat</string>
@@ -912,6 +909,7 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Dokumenty</string>
+  <string name="arrays__normal">Normálně</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hodina</item>
@@ -954,7 +952,6 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Vypnout po:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Způsob blikání LED byl nastaven!</string>
   <string name="preferences__sound">Zvuk</string>
-  <string name="preferences__change_notification_sound">Změnit zvuk upozornění</string>
   <string name="preferences__silent">Ticho</string>
   <string name="preferences__in_conversation_notifications">Upozornění během konverzace</string>
   <string name="preferences__play_inthread_notifications">Přehrát zvuk oznámení při prohlížení aktivní konverzace</string>

res/values-da/strings.xml

@@ -628,9 +628,6 @@ Modtog en nøgle-besked for en ugyldig protokol-version.
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Samtale dæmpet</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Send Signalbesked</string>
-  <string name="conversation_activity__type_message_sms_insecure">Send usikker (ukrypteret) SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Send usikker (ukrypteret) MMS</string>
   <string name="conversation_activity__from_sim_name">Fra %1$s</string>
   <string name="conversation_activity__send">Send</string>
   <string name="conversation_activity__remove">Fjern</string>
@@ -869,6 +866,7 @@ mislykkedes.</string>
   <string name="arrays__images">Billeder</string>
   <string name="arrays__audio">Lyd</string>
   <string name="arrays__video">Video</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d time</item>
@@ -910,7 +908,6 @@ mislykkedes.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Slukket i:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">LED-blinkemønster er tilpasset!</string>
   <string name="preferences__sound">Lyd</string>
-  <string name="preferences__change_notification_sound">Ændr notifikationslyd</string>
   <string name="preferences__silent">Ingen lyd</string>
   <string name="preferences__in_conversation_notifications">Notifikationer under samtalevisning</string>
   <string name="preferences__play_inthread_notifications">Afspil notifikationslyd, når en aktiv samtale vises</string>

res/values-de/strings.xml

@@ -21,7 +21,7 @@
   </plurals>
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Passwort deaktivieren?</string>
-  <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Entsperrt Signal und Benachrichtigungen dauerhaft.</string>
+  <string name="ApplicationPreferencesActivity_this_will_permanently_unlock_signal_and_message_notifications">Entsperrt Signal und Benachrichtigungen über Nachrichten dauerhaft</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
   <string name="ApplicationPreferencesActivity_unregistering">Registrierung löschen</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Registrierung für Signal-Nachrichten und -Anrufe wird gelöscht …</string>
@@ -117,16 +117,16 @@
   <string name="ConversationActivity_transport_insecure_sms">Unsichere SMS</string>
   <string name="ConversationActivity_transport_insecure_mms">Unsichere MMS</string>
   <string name="ConversationActivity_transport_signal">Signal</string>
-  <string name="ConversationActivity_lets_switch_to_signal">Wechseln wir zu Signal %1$s</string>
+  <string name="ConversationActivity_lets_switch_to_signal">Lass uns zu »Signal« wechseln: %1$s</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Unterhalten wir uns hiermit: %1$s</string>
   <string name="ConversationActivity_error_leaving_group">Fehler beim Verlassen der Gruppe</string>
   <string name="ConversationActivity_mms_not_supported_title">MMS nicht unterstützt</string>
   <string name="ConversationActivity_mms_not_supported_message">Diese Nachricht kann nicht gesendet werden, da dein Mobilfunkanbieter MMS nicht unterstützt.</string>
   <string name="ConversationActivity_specify_recipient">Bitte einen Kontakt auswählen</string>
-  <string name="ConversationActivity_unblock_this_contact_question">Nicht mehr blockieren?</string>
+  <string name="ConversationActivity_unblock_this_contact_question">Diesen Kontakt freigeben?</string>
   <string name="ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Du wirst wieder Nachrichten und Anrufe von diesem Kontakt erhalten können.</string>
-  <string name="ConversationActivity_unblock">Nicht mehr blockieren</string>
-  <string name="ConversationActivity_attachment_exceeds_size_limits">Anhang ist für diese Nachrichtenart zu groß.</string>
+  <string name="ConversationActivity_unblock">Freigeben</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Anhang zu groß für die gesendete Nachtrichtenart.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Kamera nicht verfügbar</string>
   <string name="ConversationActivity_unable_to_record_audio">Audioaufnahme nicht möglich!</string>
   <string name="ConversationActivity_error_sending_voice_message">Fehler beim Senden der Sprachnachricht</string>
@@ -321,7 +321,7 @@ Das Wiederherstellen einer verschlüsselten Datensicherung ersetzt deine bestehe
     <item quantity="one">1 SMS-Einladung senden?</item>
     <item quantity="other">%d SMS-Einladungen senden?</item>
   </plurals>
-  <string name="InviteActivity_lets_switch_to_signal">Wechseln wir zu »Signal«: %1$s</string>
+  <string name="InviteActivity_lets_switch_to_signal">Lass uns zu »Signal« wechseln: %1$s</string>
   <string name="InviteActivity_no_app_to_share_to">Es sieht so aus, als hättest du keine zum Teilen geeignete Apps installiert.</string>
   <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Freunde lassen Freunde nicht unverschlüsselt kommunizieren.</string>
   <!--KeyScanningActivity-->
@@ -408,9 +408,9 @@ Das Wiederherstellen einer verschlüsselten Datensicherung ersetzt deine bestehe
   <string name="RecipientPreferenceActivity_block_this_contact_question">Kontakt blockieren?</string>
   <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact">Du wirst keine Nachrichten und Anrufe mehr von diesem Kontakt erhalten können.</string>
   <string name="RecipientPreferenceActivity_block">Blockieren</string>
-  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Nicht mehr blockieren?</string>
+  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Diesen Kontakt freigeben?</string>
   <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Du wirst wieder Nachrichten und Anrufe von diesem Kontakt erhalten können.</string>
-  <string name="RecipientPreferenceActivity_unblock">Nicht mehr blockieren</string>
+  <string name="RecipientPreferenceActivity_unblock">Freigeben</string>
   <string name="RecipientPreferenceActivity_enabled">Aktiviert</string>
   <string name="RecipientPreferenceActivity_disabled">Deaktiviert</string>
   <string name="RecipientPreferenceActivity_available_once_a_message_has_been_sent_or_received">Verfügbar, sobald eine Nachricht gesendet oder empfangen wurde</string>
@@ -629,9 +629,9 @@ Schlüsselaustausch-Nachricht für eine ungültige Protokollversion empfangen</s
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Unterhaltung stummgeschaltet</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Signal-Nachricht senden</string>
-  <string name="conversation_activity__type_message_sms_insecure">Unsichere SMS senden</string>
-  <string name="conversation_activity__type_message_mms_insecure">Unsichere MMS senden</string>
+  <string name="conversation_activity__type_message_push">Signal-Nachricht</string>
+  <string name="conversation_activity__type_message_sms_insecure">Unsichere SMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">Unsichere MMS</string>
   <string name="conversation_activity__from_sim_name">Von %1$s</string>
   <string name="conversation_activity__send">Senden</string>
   <string name="conversation_activity__remove">Entfernen</string>
@@ -824,7 +824,7 @@ Das Warten auf eine Bestätigungs-SMS hat zu lange gedauert.</string>
   <string name="recipients_panel__to"><small>Name/Rufnummer eingeben</small></string>
   <string name="recipients_panel__add_members">Mitglieder hinzufügen</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[Falls du die Sicherheit deiner Ende-zu-Ende-Verschlüsselung mit %s überprüfen möchtest, vergleiche bitte die oben dargestellte Nummer mit der Nummer auf dem Gerät deines Kontakts. Alternativ kannst du den Code deines Kontakts einscannen oder ihn deinen eigenen Code einscannen lassen. <a href="https://whispersystems.org/redirect/safety-numbers">Mehr über das Überprüfen von Sicherheitsnummern erfahren</a>]]></string>
+  <string name="verify_display_fragment__if_you_wish_to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Falls du die Sicherheit deiner Ende-zu-Ende-Verschlüsselung mit %s überprüfen möchtest, vergleiche bitte die oben dargestellte Nummer mit der Nummer auf dem Gerät deines Kontakts. Alternativ kannst du den Code deines Kontakts einscannen oder ihn deinen eigenen Code einscannen lassen. <a href="https://whispersystems.org/redirect/safety-numbers">Erfahre mehr über das Überprüfen von Sicherheitsnummern</a>]]></string>
   <string name="verify_display_fragment__tap_to_scan">Zum Scannen antippen</string>
   <!--verify_identity-->
   <string name="verify_identity__share_safety_number">Sicherheitsnummer teilen</string>
@@ -871,6 +871,10 @@ Das Warten auf eine Bestätigungs-SMS hat zu lange gedauert.</string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Dokumente</string>
+  <string name="arrays__small">Klein</string>
+  <string name="arrays__normal">Normal</string>
+  <string name="arrays__large">Groß</string>
+  <string name="arrays__extra_large">Extragroß</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d Stunde</item>
@@ -894,14 +898,14 @@ Das Warten auf eine Bestätigungs-SMS hat zu lange gedauert.</string>
   <string name="preferences__change_passphrase">Passwort ändern</string>
   <string name="preferences__change_your_passphrase">Dein Passwort ändern</string>
   <string name="preferences__enable_passphrase">Passwort aktivieren</string>
-  <string name="preferences__lock_signal_and_message_notifications_with_a_passphrase">Signal und Benachrichtungen mit einem Passwort sperren</string>
+  <string name="preferences__lock_signal_and_message_notifications_with_a_passphrase">Signal und Benachrichtungen über Nachrichten mit einem Passwort sperren</string>
   <string name="preferences__screen_security">Bildschirmschutz</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Bildschirmfotos in der Anwendung und der Liste der letzten Anwendungen blockieren</string>
   <string name="preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity">Signal bei Inaktivität nach einer festgelegten Verzögerungszeit automatisch sperren</string>
   <string name="preferences__inactivity_timeout_passphrase">Passwort bei Inaktivität</string>
   <string name="preferences__inactivity_timeout_interval">Verzögerungszeit</string>
   <string name="preferences__notifications">Benachrichtigungen</string>
-  <string name="preferences__enable_message_notifications">Benachrichtigungen über Nachrichtenempfang aktivieren</string>
+  <string name="preferences__enable_message_notifications">Benachrichtigungen über Nachrichten aktivieren</string>
   <string name="preferences__new_contacts_notifications">Über neue Kontakte benachrichtigen</string>
   <string name="preferences__show_a_notification_for_new_signal_contacts">Benachrichtigungen über neue Signal-Kontakte anzeigen</string>
   <string name="preferences__led_color">LED-Farbe</string>
@@ -912,7 +916,6 @@ Das Warten auf eine Bestätigungs-SMS hat zu lange gedauert.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Deaktiviert für:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">LED-Blinkmuster eingestellt</string>
   <string name="preferences__sound">Ton</string>
-  <string name="preferences__change_notification_sound">Benachrichtigungston ändern</string>
   <string name="preferences__silent">Lautlos</string>
   <string name="preferences__in_conversation_notifications">Immer benachrichtigen</string>
   <string name="preferences__play_inthread_notifications">Benachrichtigungston während aktiver Unterhaltungen wiedergeben</string>
@@ -985,6 +988,14 @@ Das Warten auf eine Bestätigungs-SMS hat zu lange gedauert.</string>
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Unterstützung für Video- und Sprachanrufe der nächsten Generation, falls bei beiden Beteiligten aktiviert. Diese Funktion befindet sich im Beta-Test.</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Alle Anrufe über den Signal-Server leiten, um die eigene IP-Adresse gegenüber Kontakten nicht offenzulegen. Bei Aktivierung wird sich die Anrufqualität verringern.</string>
   <string name="preferences_advanced__always_relay_calls">Anrufe immer indirekt</string>
+  <string name="preferences_app_protection__app_access">App-Zugriff</string>
+  <string name="preferences_app_protection__communication">Kommunikation</string>
+  <string name="preferences_chats__chats">Unterhaltungen</string>
+  <string name="preferences_notifications__message_notifications">Benachrichtigungen über Nachrichten</string>
+  <string name="preferences_notifications__events">Ereignisse</string>
+  <string name="preferences_chats__show_invitation_prompts">Einladungshinweise anzeigen</string>
+  <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Einladungshinweise für Kontakte ohne Signal anzeigen</string>
+  <string name="preferences_chats__message_text_size">Schriftgröße für Nachrichten</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-el/strings.xml

@@ -4,12 +4,12 @@
   <string name="yes">Ναι</string>
   <string name="no">Όχι</string>
   <string name="delete">Διαγραφή</string>
-  <string name="please_wait">Παρακαλώ περιμένετε...</string>
+  <string name="please_wait">Παρακαλώ περίμενε...</string>
   <!--AbstractNotificationBuilder-->
   <string name="AbstractNotificationBuilder_new_message">Νέο μήνυμα</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Αυτή τη στιγμή: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Δεν έχετε ορίσει φράση πρόσβασης!</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Δεν έχεις ορίσει συνθηματικό!</string>
   <plurals name="ApplicationPreferencesActivity_messages_per_conversation">
     <item quantity="one">1 μήνυμα ανά συζήτηση</item>
     <item quantity="other">%d μηνύματα ανά συζήτηση</item>
@@ -26,12 +26,12 @@
   <string name="ApplicationPreferencesActivity_unregistering">Απεγγραφή</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Απεγγραφή από τα μηνύματα και τις κλήσεις Signal...</string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Απενεργοποίηση των μηνυμάτων και των κλήσεων Signal;</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Απενεργοποίηση μηνυμάτων και κλήσεων του Signal με απεγγραφή από τον διακομιστή. Θα χρειαστεί να επανεγγράψετε τον αριθμό τηλεφώνου σας για να τα ξαναχρησιμοποιήσετε στο μέλλον.</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Απενεργοποίηση μηνυμάτων και κλήσεων του Signal με απεγγραφή από τον διακομιστή. Θα χρειαστεί να επανεγγράψεις τον αριθμό τηλεφώνου σου για να τα ξαναχρησιμοποιήσεις στο μέλλον.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Πρόβλημα με τη σύνδεση με τον διακομιστή!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Ενεργοποίηση SMS</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Πατήστε για αλλαγή της προεπιλεγμένης εφαρμογής για SMS</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Πάτησε για αλλαγή της προεπιλεγμένης εφαρμογής για SMS</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">Απενεργοποίηση SMS</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Πατήστε εδώ για να κάνετε το Signal την προκαθορισμένη εφαρμογή SMS</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Πατήσε εδώ για να κάνεις το Signal την προκαθορισμένη εφαρμογή για SMS</string>
   <string name="ApplicationPreferencesActivity_on">ενεργοποιημένο</string>
   <string name="ApplicationPreferencesActivity_On">Ενεργοποιημένο</string>
   <string name="ApplicationPreferencesActivity_off">απενεργοποιημένο</string>
@@ -50,7 +50,7 @@
   <string name="DraftDatabase_Draft_video_snippet">(βίντεο)</string>
   <string name="DraftDatabase_Draft_location_snippet">(τοποθεσία)</string>
   <!--AttchmentManager-->
-  <string name="AttachmentManager_cant_open_media_selection">Δεν μπορεί να βρεθεί μια εφαρμογή για επιλογή πολυμέσων.</string>
+  <string name="AttachmentManager_cant_open_media_selection">Δεν μπορεί να βρεθεί εφαρμογή για επιλογή πολυμέσων.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_camera">Κάμερα</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Εικόνα</string>
@@ -65,7 +65,7 @@
   <string name="CallScreen_Incoming_call">Εισερχόμενη κλήση</string>
   <!--ConfirmIdentityDialog-->
   <string name="ConfirmIdentityDialog_your_safety_number_with_s_has_changed">Ο αριθμός ασφαλείας με τον/την %1$s έχει αλλάξει. Αυτό σημαίνει ότι είτε κάποιος προσπαθεί να υποκλέψει τη συνομιλία σας, είτε ο/η %2$s απλά επανεγκατέστησε το Signal.</string>
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact">Μήπως θέλετε να επιβεβαιώσετε τον αριθμό ασφαλείας σας για αυτή την επαφή;</string>
+  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_your_safety_number_with_this_contact">Μήπως θα ήθελες να επιβεβαιώσεις τον αριθμό ασφαλείας σου με αυτή την επαφή;</string>
   <string name="ConfirmIdentityDialog_accept">Αποδοχή</string>
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s">Μήνυμα %s</string>
@@ -75,21 +75,21 @@
   <string name="ConversationItem_expires_s">Λήγει: %s</string>
   <string name="ConversationItem_error_not_delivered">Δεν παραδόθηκε</string>
   <string name="ConversationItem_view_secure_media_question">Προβολή ασφαλών πολυμέσων;</string>
-  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Αυτό το πολυμέσο έχει αποθηκευτεί σε μια κρυπτογραφημένη βάση δεδομένων. Δυστυχώς, για να το δείτε με εξωτερικό πρόγραμμα, θα πρέπει να αποκρυπτογραφηθεί προσωρινά και να γραφτεί στην μνήμη. Είστε σίγουρος/η πως θέλετε να το κάνετε αυτό;</string>
+  <string name="ConversationItem_this_media_has_been_stored_in_an_encrypted_database_external_viewer_warning">Αυτό το πολυμέσο έχει αποθηκευτεί σε μια κρυπτογραφημένη βάση δεδομένων. Δυστυχώς, για να το δεις με εξωτερικό πρόγραμμα, θα πρέπει να αποκρυπτογραφηθεί προσωρινά και να γραφτεί στην μνήμη. Είσαι σίγουρος/η πως θέλεις να το κάνεις αυτό;</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Πρόβλημα, λάβαμε ληγμένο μήνυμα ανταλλαγής κλειδιών.</string>
-  <string name="ConversationItem_received_key_exchange_message_tap_to_process">Ελήφθη μήνυμα ανταλλαγής κλειδιών, πατήστε για να επεξεργαστεί.</string>
+  <string name="ConversationItem_received_key_exchange_message_tap_to_process">Ελήφθη μήνυμα ανταλλαγής κλειδιών, πάτησε για να επεξεργαστεί.</string>
   <string name="ConversationItem_group_action_left">Ο/Η %1$s έφυγε απο την ομάδα.</string>
-  <string name="ConversationItem_click_for_details">Πατήστε για λεπτομέρειες</string>
-  <string name="ConversationItem_click_to_approve_unencrypted">Πατήστε για απροστάτευτη εναλλακτική</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Να σταλεί ΜΗ κρυπτογραφημένο μηνύμα?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Να σταλεί ΜΗ κρυπτογραφημένο μήνυμα πολυμέσων?</string>
+  <string name="ConversationItem_click_for_details">Πάτησε για λεπτομέρειες</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Πάτησε για απροστάτευτη εναλλακτική</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Να σταλεί ΜΗ κρυπτογραφημένο μηνύμα SMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Να σταλεί ΜΗ κρυπτογραφημένο μήνυμα πολυμέσων MMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Αυτό το μήνυμα <b>δεν</b> θα κρυπτογραφηθεί, επειδή ο παραλήπτης δεν είναι πλέον χρήστης του Signal.\n\nΝα σταλεί το μήνυμα μη κρυπτογραφημένο;</string>
   <string name="ConversationItem_unable_to_open_media">Δεν μπορεί να βρεθεί κατάλληλη εφαρμογή για το άνοιγμα αυτού του πολυμέσου.</string>
   <string name="ConversationItem_from_s">από %s</string>
   <string name="ConversationItem_to_s">προς %s</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_reset_secure_session_question">Επαναφορά ασφαλούς συνεδρίας;</string>
-  <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Αυτό ίσως βοηθήσει αν έχετε πρόβλημα με την κρυπτογράφηση σε αυτή την συζήτηση. Τα μηνύματά σας δεν θα σβηστούν.</string>
+  <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Αυτό ίσως βοηθήσει αν έχεις πρόβλημα με την κρυπτογράφηση σε αυτή την συζήτηση. Τα μηνύματά σου δεν θα σβηστούν.</string>
   <string name="ConversationActivity_reset">Επαναφορά</string>
   <string name="ConversationActivity_delete_thread_question">Διαγραφή συζήτησης;</string>
   <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Αυτό θα διαγράψει μόνιμα όλα τα μηνύματα αυτής της συζήτησης.</string>
@@ -97,7 +97,7 @@
   <string name="ConversationActivity_select_contact_info">Επιλογή πληροφοριών επαφής</string>
   <string name="ConversationActivity_compose_message">Νέο μήνυμα</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Συγγνώμη, υπήρξε πρόβλημα με τη σύναψη αρχείου.</string>
-  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Το gif που επιλέξατε ήταν πολύ μεγάλο!</string>
+  <string name="ConversationActivity_the_gif_you_selected_was_too_big">Το gif που επέλεξες ήταν πολύ μεγάλο!</string>
   <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Συγγνώμη, το επιλεγμένο βίντεο υπερβαίνει το μέγιστο μέγεθος μηνύματος  (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Συγγνώμη, το επιλεγμένο αρχείο ήχου υπερβαίνει το μέγιστο μέγεθος μηνύματος (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Ο παραλήπτης δεν είναι έγκυρη διεύθυνση SMS ή email!</string>
@@ -113,24 +113,24 @@
   <string name="ConversationActivity_calls_not_supported">Δεν υποστηρίζονται οι κλήσεις</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Αυτή η συσκευή δε φαίνεται να υποστηρίζει ενέργειες κλήσης.</string>
   <string name="ConversationActivity_leave_group">Αποχώρηση από την ομάδα;</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Είστε σίγουρος/η πως θέλετε να αποχωρήσετε από την ομάδα;</string>
-  <string name="ConversationActivity_transport_insecure_sms">Μη ασφαλές μήνυμα (SMS)</string>
-  <string name="ConversationActivity_transport_insecure_mms">Μη ασφαλές μήνυμα πολυμέσων (MMS)</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Είσαι σίγουρος/η πως θέλεις να αποχωρήσεις από την ομάδα;</string>
+  <string name="ConversationActivity_transport_insecure_sms">Μη ασφαλές μήνυμα SMS</string>
+  <string name="ConversationActivity_transport_insecure_mms">Μη ασφαλές μήνυμα πολυμέσων MMS</string>
   <string name="ConversationActivity_transport_signal">Signal</string>
   <string name="ConversationActivity_lets_switch_to_signal">Ας χρησιμοποιήσουμε το Signal %1$s</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Ας χρησιμοποιήσουμε αυτό για να συνομιλήσουμε: %1$s</string>
   <string name="ConversationActivity_error_leaving_group">Πρόβλημα με την αποχώρηση από την ομάδα</string>
-  <string name="ConversationActivity_mms_not_supported_title">Τα μηνύματα πολυμέσων (MMS) δεν υποστηρίζονται</string>
-  <string name="ConversationActivity_mms_not_supported_message">Αυτό το μήνυμα δεν μπορεί να σταλεί, γιατι ο φορέας σας δεν υποστηρίζει τα μηνύματα πολυμέσων (MMS).</string>
+  <string name="ConversationActivity_mms_not_supported_title">Τα μηνύματα πολυμέσων MMS δεν υποστηρίζονται</string>
+  <string name="ConversationActivity_mms_not_supported_message">Αυτό το μήνυμα δεν μπορεί να σταλεί, γιατι ο φορέας σου δεν υποστηρίζει τα μηνύματα πολυμέσων MMS.</string>
   <string name="ConversationActivity_specify_recipient">Παρακαλώ επιλέξτε μια επαφή</string>
   <string name="ConversationActivity_unblock_this_contact_question">Ξεμπλοκάρισμα αυτής της επαφής;</string>
-  <string name="ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Θα μπορείτε και πάλι να λάβετε μηνύματα και κλήσεις από αυτή την επαφή.</string>
+  <string name="ConversationActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Θα μπορείς και πάλι να λαμβάνεις μηνύματα και κλήσεις από αυτή την επαφή.</string>
   <string name="ConversationActivity_unblock">Ξεμπλοκάρισμα</string>
-  <string name="ConversationActivity_attachment_exceeds_size_limits">Το συννημένο υπερβαίνει τα όρια μεγέθους για το είδος μηνύματος που στέλνετε.</string>
+  <string name="ConversationActivity_attachment_exceeds_size_limits">Το συνημμένο υπερβαίνει τα όρια μεγέθους για το είδος μηνύματος που στέλνεις.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Κάμερα μη διαθέσιμη</string>
   <string name="ConversationActivity_unable_to_record_audio">Η ηχογράφηση απέτυχε!</string>
   <string name="ConversationActivity_error_sending_voice_message">Πρόβλημα με την αποστολή φωνητικού μηνύματος</string>
-  <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Δεν υπάρχει διαθέσιμη εφαρμογή στην συσκευή σας που να μπορεί να διαχειριστεί αυτό τον σύνδεσμο.</string>
+  <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Δεν υπάρχει διαθέσιμη εφαρμογή στην συσκευή σου να μπορεί να διαχειριστεί αυτό τον σύνδεσμο.</string>
   <!--ConversationAdapter-->
   <plurals name="ConversationAdapter_n_unread_messages">
     <item quantity="one">%d μη αναγνωσμένο μήνυμα</item>
@@ -151,7 +151,7 @@
   <string name="ConversationFragment_save_to_sd_card">Να αποθηκευτεί στην μνήμη;</string>
   <plurals name="ConversationFragment_saving_n_media_to_storage_warning">
     <item quantity="one">Αποθηκεύοντας αυτό το πολυμέσο στην μνήμη θα επιτρέψει σε άλλες εφαρμογές στην συσκευή σου να έχουν πρόσβαση σε αυτό. \n\nΣυνέχεια;</item>
-    <item quantity="other">Αποθηκεύοντας τα %1$d πολυμέσα στην μνήμη θα επιτρέψει σε άλλες εφαρμογές της συσκευής σας να έχουν πρόσβαση σε αυτά.\n\nΣυνέχεια;</item>
+    <item quantity="other">Αποθηκεύοντας τα %1$d πολυμέσα στην μνήμη θα επιτρέψει σε άλλες εφαρμογές της συσκευής σου να έχουν πρόσβαση σε αυτά.\n\nΣυνέχεια;</item>
   </plurals>
   <plurals name="ConversationFragment_error_while_saving_attachments_to_sd_card">
     <item quantity="one">Πρόβλημα με την αποθήκευση του συνημμένου στην μνήμη!</item>
@@ -179,7 +179,7 @@
   <string name="ConversationFragment_deleting_messages">Διαγραφή μηνυμάτων...</string>
   <!--ConversationListActivity-->
   <string name="ConversationListActivity_search">Αναζήτηση</string>
-  <string name="ConversationListActivity_there_is_no_browser_installed_on_your_device">Δεν υπάρχει εγκατεστημένο πρόγραμμα περιήγησης στην συσκευή σας.</string>
+  <string name="ConversationListActivity_there_is_no_browser_installed_on_your_device">Δεν υπάρχει εγκατεστημένο πρόγραμμα περιήγησης στη συσκευή σας.</string>
   <!--ConversationListFragment-->
   <plurals name="ConversationListFragment_delete_selected_conversations">
     <item quantity="one">Διαγραφή επιλεγμένης συζήτησης;</item>
@@ -217,7 +217,7 @@
   <string name="DeviceListActivity_unlink_s">Αποσύνδεση του \'%s\';</string>
   <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Η αποσύνδεση της συσκευής σημαίνει οτι δεν θα μπορεί πλέον να λάβει ή να στείλει μηνύματα.</string>
   <string name="DeviceListActivity_network_connection_failed">Αποτυχία σύνδεσης στο δίκτυο</string>
-  <string name="DeviceListActivity_try_again">Ξαναπροσπαθήστε</string>
+  <string name="DeviceListActivity_try_again">Ξαναπροσπάθησε</string>
   <string name="DeviceListActivity_unlinking_device">Η συσκευή αποσυνδέεται...</string>
   <string name="DeviceListActivity_unlinking_device_no_ellipsis">Η συσκευή αποσυνδέεται</string>
   <string name="DeviceListActivity_network_failed">Αποτυχία δικτύου!</string>
@@ -230,32 +230,32 @@
   <string name="DocumentView_unknown_file">Άγνωστο αρχείο</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Βελτιστοποίηση για τις υπηρεσίες Play που λείπουν</string>
-  <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Αυτή η συσκευή δεν υποστηρίζει τις υπηρεσίες Play. Πατήστε για απενεργοποίηση των βελτιστοποιήσεων μπαταρίας του συστήματος που εμποδίζουν το Signal από το να λαμβάνει μηνύματα όταν είναι ανενεργό.</string>
+  <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Αυτή η συσκευή δεν υποστηρίζει τις υπηρεσίες Play. Πάτησε για απενεργοποίηση των βελτιστοποιήσεων μπαταρίας του συστήματος που εμποδίζουν το Signal από το να λαμβάνει μηνύματα όταν είναι ανενεργό.</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Διαμοιρασμός με</string>
   <!--ExperienceUpgradeActivity-->
-  <string name="ExperienceUpgradeActivity_welcome_to_signal_dgaf">Καλωσήλθατε στο Signal.</string>
+  <string name="ExperienceUpgradeActivity_welcome_to_signal_dgaf">Καλωσήλθες στο Signal.</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_called_signal">Το Textsecure και το Redphone έγιναν πλέον μία εφαρμογή ιδιωτικής επικοινωνίας για κάθε περίπτωση: το Signal.</string>
-  <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Καλωσήλθατε στο Signal!</string>
+  <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Καλωσήλθες στο Signal!</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal">Το TextSecure είναι πλέον Signal.</string>
-  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">Το Textsecure και το Redphone είναι πλέον μία εφαρμογή: Signal. Πατήστε για να την εξερευνήσετε.</string>
-  <string name="ExperienceUpgradeActivity_say_hello_to_video_calls">Πείτε γειά στις ασφαλείς βιντεοκλήσεις.</string>
-  <string name="ExperienceUpgradeActivity_signal_now_supports_secure_video_calls">Το Signal πλέον υποστηρίζει ασφαλείς βιντεοκλήσεις. Απλά κάντε μια κλήση Signal όπως συνήθως, πατήστε το κουμπί για το βίντεο, και χαμογελάστε.</string>
+  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">Το Textsecure και το Redphone είναι πλέον μία εφαρμογή: Signal. Πάτησε για να την εξερευνήσεις.</string>
+  <string name="ExperienceUpgradeActivity_say_hello_to_video_calls">Πες γεια στις ασφαλείς βιντεοκλήσεις.</string>
+  <string name="ExperienceUpgradeActivity_signal_now_supports_secure_video_calls">Το Signal πλέον υποστηρίζει ασφαλείς βιντεοκλήσεις. Απλά κάνε μια κλήση Signal όπως συνήθως, πάτησε το κουμπί για το βίντεο, και χαμογέλα.</string>
   <string name="ExperienceUpgradeActivity_signal_now_supports_secure_video_calling">Το Signal πλέον υποστηρίζει ασφαλείς βιντεοκλήσεις.</string>
-  <string name="ExperienceUpgradeActivity_signal_now_supports_secure_video_calling_long">Το Signal πλέον υποστηρίζει ασφαλείς βιντεοκλήσεις. Πατήστε για να εξερευνήσετε.</string>
+  <string name="ExperienceUpgradeActivity_signal_now_supports_secure_video_calling_long">Το Signal πλέον υποστηρίζει ασφαλείς βιντεοκλήσεις. Πάτησε για να εξερευνήσεις.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Εξαγωγή</string>
   <string name="ExportFragment_export_plaintext_to_storage">Εξαγωγή αποκρυπτογραφημένου κειμένου στη μνήμη;</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Προσοχή, αυτό θα εξάγει αποκρυπτογραφημένα περιεχόμενα των μηνυμάτων Signal σας στη μνήμη.</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Προσοχή, αυτό θα εξάγει αποκρυπτογραφημένα περιεχόμενα των μηνυμάτων Signal σου στη μνήμη.</string>
   <string name="ExportFragment_cancel">Ακύρωση</string>
   <string name="ExportFragment_exporting">Εξαγωγή</string>
   <string name="ExportFragment_exporting_plaintext_to_storage">Εξαγωγή των αποκρυπτογραφημένων δεδομένων στη μνήμη...</string>
   <string name="ExportFragment_error_unable_to_write_to_storage">Πρόβλημα, δεν μπόρεσε να γίνει εγγραφή στη μνήμη.</string>
-  <string name="ExportFragment_error_while_writing_to_storage">Πρόβλημα με την εγγραφή στη μνήμη.</string>
+  <string name="ExportFragment_error_while_writing_to_storage">Πρόβλημα κατά την εγγραφή στη μνήμη.</string>
   <string name="ExportFragment_export_successful">Επιτυχία εξαγωγής.</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Μόνιμη αποτυχία επικοινωνίας του Signal!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Το Signal δεν μπόρεσε να εγγραφτεί στις Υπηρεσίες Google Play. Τα μηνύματα και οι κλήσεις του Signal έχουν απενεργοποιηθεί. Παρακαλώ προσπαθήστε να επανεγγραφτείτε στις Ρυθμίσεις &gt; Προχωρημένες Ρυθμίσεις.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Το Signal δεν μπόρεσε να εγγραφτεί στις Υπηρεσίες Google Play. Τα μηνύματα και οι κλήσεις του Signal έχουν απενεργοποιηθεί. Παρακαλώ προσπάθησε να επανεγγραφτείς στις Ρυθμίσεις &gt; Προχωρημένες Ρυθμίσεις.</string>
   <!--GiphyActivity-->
   <string name="GiphyActivity_error_while_retrieving_full_resolution_gif">Πρόβλημα κατά την ανάκτηση της πλήρους ανάλυσης της εικόνας GIF</string>
   <!--GiphyFragmentPageAdapter-->
@@ -266,8 +266,8 @@
   <string name="GroupCreateActivity_actionbar_edit_title">Επεξεργασία ομάδας</string>
   <string name="GroupCreateActivity_group_name_hint">Όνομα ομάδας</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Νέα ομάδα MMS</string>
-  <string name="GroupCreateActivity_contacts_dont_support_push">Επιλέξατε μια επαφή που δεν υποστηρίζει ομάδες Signal, οπότε αυτή η ομάδα θα είναι MMS.</string>
-  <string name="GroupCreateActivity_youre_not_registered_for_signal">Δεν έχετε εγγραφεί για μηνύματα και κλήσεις του Signal, οπότε οι ομάδες του Signal έχουν απενεργοποιηθεί. Παρακαλώ προσπαθήστε να εγγραφτείτε στις Ρυθμίσεις &gt; Προχωρημένες Ρυθμίσεις.</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Επέλεξες μια επαφή που δεν υποστηρίζει ομάδες Signal, οπότε αυτή η ομάδα θα είναι MMS.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Δεν έχεις εγγραφεί για μηνύματα και κλήσεις του Signal, οπότε οι ομάδες του Signal έχουν απενεργοποιηθεί. Παρακαλώ προσπάθησε να εγγραφτείς στις Ρυθμίσεις &gt; Προχωρημένες Ρυθμίσεις.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Προέκυψε ένα απρόσμενο πρόβλημα και η δημιουργία ομάδας απέτυχε.</string>
   <string name="GroupCreateActivity_contacts_no_members">Χρειάζεται τουλάχιστον ένα άτομο στην ομάδα σου
 !</string>
@@ -293,7 +293,7 @@
   <string name="ImportFragment_cancel">Ακύρωση</string>
   <string name="ImportFragment_restore_encrypted_backup">Επαναφορά του κρυπτογραφημένου αντίγραφου ασφαλείας;</string>
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
-Η επαναφορά του κρυπτογραφημένου αντίγραφου ασφαλείας θα αντικαταστήσει πλήρως τα υπάρχοντα κλειδιά, τις ρυθμίσεις και τα μηνύματά σας. Θα χάσετε όλα τα δεδομένα αυτής της εγκατάστασης του Signal, αλλά όχι το αντίγραφο ασφαλείας.</string>
+Η επαναφορά του κρυπτογραφημένου αντίγραφου ασφαλείας θα αντικαταστήσει πλήρως τα υπάρχοντα κλειδιά, τις ρυθμίσεις και τα μηνύματά σου. Θα χάσεις όλα τα δεδομένα αυτής της εγκατάστασης του Signal, αλλά όχι το αντίγραφο ασφαλείας.</string>
   <string name="ImportFragment_restore">Επαναφορά</string>
   <string name="ImportFragment_import_plaintext_backup">Εισαγωγή μη κρυπτογραφημένου αντίγραφου ασφαλείας;</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Αυτό θα εισάγει
@@ -310,7 +310,7 @@
   <string name="ImportFragment_no_encrypted_backup_found">Δε βρέθηκε κρυπτογραφημένο αντίγραφο ασφαλείας!</string>
   <string name="ImportFragment_restore_complete">Η επαναφορά ολοκληρώθηκε!</string>
   <!--InputPanel-->
-  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Πατήστε και κρατήστε πατημένο για να ηχογραφήσετε ένα μήνυμα φωνής, αφήστε το κουμπί για αποστολή</string>
+  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Πάτησε και κράτα πατημένο για να ηχογραφήσεις ένα μήνυμα φωνής, άφησε το κουμπί για αποστολή</string>
   <!--InviteActivity-->
   <string name="InviteActivity_share">Διαμοιρασμός</string>
   <string name="InviteActivity_choose_contacts">Επιλογή επαφών</string>
@@ -332,7 +332,7 @@
   <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Οι φίλοι δεν αφήνουν τους φίλους να συνομιλούν χωρίς κρυπτογράφηση.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Δε βρέθηκε σαρωμένο κλειδί!</string>
-  <string name="KeyScanningActivity_install_barcode_Scanner">Θέλετε να εγκαταστήσετε το Barcode Scanner;</string>
+  <string name="KeyScanningActivity_install_barcode_Scanner">Θέλεις να εγκαταστήσεις το Barcode Scanner;</string>
   <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Το Signal χρειάζεται την εφαρμογή Barcode Scanner για κωδικούς QR</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">Αποτυχία αποστολής</string>
@@ -392,7 +392,7 @@
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Δυστυχώς έχεις υπερβολικό αριθμό συσκευών συνδεδεμένες, προσπάθησε να διαγράψεις μερικές</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Συγγνώμη, αυτός δεν είναι ένας έγκυρος κωδικός QR για σύνδεση συσκευών.</string>
   <string name="DeviceProvisioningActivity_link_a_signal_device">Σύνδεση μιας συσκευής Signal;</string>
-  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Φαίνεται πως προσπαθείτε να συνδέσετε μια συσκευή Signal χρησιμοποιώντας κάποιο άλλο πρόγραμμα σάρωσης. Για την προστασία σας, παρακαλώ ξανασαρώστε τον κωδικό μέσω του Signal.</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Φαίνεται πως προσπαθείς να συνδέσεις μια συσκευή Signal χρησιμοποιώντας κάποιο άλλο πρόγραμμα σάρωσης. Για την προστασία σας, παρακαλώ ξανασάρωσε τον κωδικό μέσω του Signal.</string>
   <!--ExpirationDialog-->
   <string name="ExpirationDialog_disappearing_messages">Μηνήματα που εξαφανίζονται</string>
   <string name="ExpirationDialog_your_messages_will_not_expire">Τα μηνύματά σου δεν θα λήξουν.</string>
@@ -413,10 +413,10 @@
   <string name="RatingManager_whoops_the_play_store_app_does_not_appear_to_be_installed">Ουπς, δεν φαίνεται να έχεις εγκατεστημένη την εφαρμογή Play Store στην συσκευή σου.</string>
   <!--RecipientPreferencesActivity-->
   <string name="RecipientPreferenceActivity_block_this_contact_question">Μπλοκάρισμα αυτής της επαφής;</string>
-  <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact">Δεν θα λάβετε πλέον μηνύματα και κλήσεις από αυτή την επαφή.</string>
+  <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_and_calls_from_this_contact">Δεν θα λαμβάνεις πλέον μηνύματα και κλήσεις από αυτή την επαφή.</string>
   <string name="RecipientPreferenceActivity_block">Μπλοκάρισμα</string>
   <string name="RecipientPreferenceActivity_unblock_this_contact_question">Ξεμπλοκάρισμα αυτής της επαφής;</string>
-  <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Θα μπορείτε και πάλι να λάβετε μηνύματα και κλήσεις από αυτή την επαφή.</string>
+  <string name="RecipientPreferenceActivity_you_will_once_again_be_able_to_receive_messages_and_calls_from_this_contact">Θα μπορείς και πάλι να λάβεις μηνύματα και κλήσεις από αυτή την επαφή.</string>
   <string name="RecipientPreferenceActivity_unblock">Ξεμπλοκάρισμα</string>
   <string name="RecipientPreferenceActivity_enabled">Ενεργοποιημένο</string>
   <string name="RecipientPreferenceActivity_disabled">Απενεργοποιημένο</string>
@@ -641,9 +641,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Η συζήτηση έχει σιγαθεί</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Αποστολή μηνύματος Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Αποστολή μη ασφαλούς SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Αποστολή μη ασφαλούς MMS</string>
   <string name="conversation_activity__from_sim_name">Από τον/την %1$s</string>
   <string name="conversation_activity__send">Αποστολή</string>
   <string name="conversation_activity__remove">Αφαίρεση</string>
@@ -793,7 +790,7 @@
 ΚΑΙ ΑΡΙΘΜΟΣ ΚΙΝΗΤΟΥ ΤΗΛΕΦΩΝΟΥ</string>
   <string name="registration_activity__phone_number">ΑΡΙΘΜΟΣ ΚΙΝΗΤΟΥ</string>
   <string name="registration_activity__register">Εγγραφή</string>
-  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Το Signal κάνει την επικοινωνία εύκολη χρησιμοποιόντας τον αριθμό σας και τη λίστα επαφών σας. Φίλοι και επαφές που έχουν ήδη τον αριθμό σας θα μπορούν να σας μιλήσουν εύκολα μέσω του Signal.\n\nΗ εγγραφή μεταδίδει προσωρινά μερικά στοιχεία επικοινωνίας στον διακομιστή. Δεν θα αποθηκευτούν.</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Το Signal κάνει την επικοινωνία εύκολη χρησιμοποιόντας τον τηλεφωνικό αριθμό και τη λίστα επαφών σου. Φίλοι/ες και επαφές που έχουν ήδη τον αριθμό σου θα μπορούν να σου μιλήσουν εύκολα μέσω του Signal.\n\nΗ εγγραφή μεταδίδει προσωρινά μερικά στοιχεία επικοινωνίας στον διακομιστή. Δεν θα αποθηκευτούν.</string>
   <string name="registration_activity__powered_by_twilio">Με την υποστήριξη του twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Μερικά ενδεχόμενα προβλήματα
@@ -904,6 +901,7 @@
   <string name="arrays__audio">Ήχοι</string>
   <string name="arrays__video">Βίντεο</string>
   <string name="arrays__documents">Αρχεία</string>
+  <string name="arrays__normal">Κανονικό</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d ώρα</item>
@@ -945,7 +943,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Σβηστό για:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Ορίστηκε το προσαρμοσμένο μοτίβο αναβοσβησίματος του LED!</string>
   <string name="preferences__sound">Ήχος</string>
-  <string name="preferences__change_notification_sound">Αλλαγή ήχου ειδοποίησης</string>
   <string name="preferences__silent">Σε σίγαση</string>
   <string name="preferences__in_conversation_notifications">Ειδοποιήσεις εντός της συζήτησης</string>
   <string name="preferences__play_inthread_notifications">Αναπαραγωγή ήχου ειδοποίησης όταν βλέπεις μια ενεργή συνομιλία</string>

res/values-es/strings.xml

@@ -651,9 +651,6 @@ Se recibió un mensaje de intercambio de claves para una versión no válida del
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Conversación silenciada</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Enviar mensaje de Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Enviar SMS no seguro</string>
-  <string name="conversation_activity__type_message_mms_insecure">Enviar MMS no seguro</string>
   <string name="conversation_activity__from_sim_name">De %1$s</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Eliminar</string>
@@ -918,6 +915,7 @@ por SMS.
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Vídeo</string>
   <string name="arrays__documents">Documentos</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -959,7 +957,6 @@ por SMS.
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Apagado durante:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">¡Se ha establecido el patrón personalizado de parpadeo del LED!</string>
   <string name="preferences__sound">Sonido</string>
-  <string name="preferences__change_notification_sound">Cambiar sonido de notificación</string>
   <string name="preferences__silent">Silenciar</string>
   <string name="preferences__in_conversation_notifications">Notificaciones en conversación</string>
   <string name="preferences__play_inthread_notifications">Reproducir sonido de notificación al pasar a ver una conversación activa</string>

res/values-et/strings.xml

@@ -227,6 +227,7 @@
   <string name="DeviceListItem_last_active_s">%s viimati aktiivne</string>
   <string name="DeviceListItem_today">Täna</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Tundmatu fail</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Optimeeri puuduvate Play teenuste jaoks</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">See seade ei toeta Play teenuseid. Koputa, et keelata süsteemi aku optimeerimine, kuna see ei lase Signalil sõnumeid hankida, kui seade on ebaaktiivne.</string>
@@ -601,6 +602,7 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Kiirvastus pole saadaval, kui Signal on lukustatud!</string>
   <string name="QuickResponseService_problem_sending_message">Sõnumi saatmisel esines probleem!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Ava faili asukoht</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Uus sõnum</string>
@@ -648,9 +650,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Vestlus vaigistatud</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Saada Signali sõnum</string>
-  <string name="conversation_activity__type_message_sms_insecure">Saada turvamata SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Saada turvamata MMS</string>
   <string name="conversation_activity__from_sim_name">Kontaktilt %1$s</string>
   <string name="conversation_activity__send">Saada</string>
   <string name="conversation_activity__remove">Eemalda</string>
@@ -921,6 +920,7 @@
   <string name="arrays__audio">Heli</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Dokumendid</string>
+  <string name="arrays__normal">Keskmine</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d tund</item>
@@ -962,7 +962,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Keelamisaeg:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Kohandatud LEDi välkumismuster on seatud!</string>
   <string name="preferences__sound">Heli</string>
-  <string name="preferences__change_notification_sound">Muuda teate heli</string>
   <string name="preferences__silent">Vaikne</string>
   <string name="preferences__in_conversation_notifications">Vestlusesisesed teated</string>
   <string name="preferences__play_inthread_notifications">Mängi teateheli, kui vaatad aktiivset vestlust</string>

res/values-eu/strings.xml

@@ -445,6 +445,7 @@ zenbakia (%s) baliogabea da.
   <string name="RegistrationActivity_edit">Editatu</string>
   <string name="RegistrationActivity_missing_google_play_services">Ez dira topatzen Google Play-ren zerbitzuak </string>
   <string name="RegistrationActivity_i_understand">Ulertzen dut</string>
+  <string name="RegistrationActivity_more_information">Informazio gehiago</string>
   <!--RegistrationProblemsActivity-->
   <string name="RegistrationProblemsActivity_possible_problems">Aurreikusi daitezkeen arazoak</string>
   <!--RegistrationProgressActivity-->
@@ -604,9 +605,6 @@ Gakoaren elkar-trukeraro mezua jaso da protokoloaren bertsio baliogabe baterako.
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Solasaldi isildua</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Bidali Signal mezua</string>
-  <string name="conversation_activity__type_message_sms_insecure">SMS ez segurua bidali</string>
-  <string name="conversation_activity__type_message_mms_insecure">MMS ez segurua bidali</string>
   <string name="conversation_activity__from_sim_name">%1$s-(e)tik</string>
   <string name="conversation_activity__send">Bidali</string>
   <string name="conversation_activity__remove">Ezabatu</string>
@@ -851,6 +849,7 @@ huts egin du.
   <string name="arrays__images">Irudiak</string>
   <string name="arrays__audio">Audioa</string>
   <string name="arrays__video">Bideoa</string>
+  <string name="arrays__normal">Normala</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">ordu %d</item>
@@ -892,7 +891,6 @@ huts egin du.
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Zenbat denbora itzalita:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Personalizatutako LED keinu eredua ezarrita!</string>
   <string name="preferences__sound">Soinua</string>
-  <string name="preferences__change_notification_sound">Aldatu jakinarazpenaren soinua</string>
   <string name="preferences__silent">Isildu</string>
   <string name="preferences__in_conversation_notifications">Solasaldi barruko jakinarazpenak</string>
   <string name="preferences__play_inthread_notifications">Erreproduzitu jakinarazpena solasaldi aktibo bat ikusterakoan.</string>

res/values-fa/strings.xml

@@ -523,9 +523,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">مکالمه خاموش</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">ارسال پیام سیگنال</string>
-  <string name="conversation_activity__type_message_sms_insecure">ارسال نا امن SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">ارسال نا امن MMS</string>
   <string name="conversation_activity__from_sim_name">از %1$s</string>
   <string name="conversation_activity__send">ارسال</string>
   <string name="conversation_activity__remove">حذف</string>
@@ -742,6 +739,7 @@
   <string name="arrays__images">تصویر</string>
   <string name="arrays__audio">صدا</string>
   <string name="arrays__video">ویدئو</string>
+  <string name="arrays__normal">عادی</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d ساعت</item>
@@ -782,7 +780,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">خاموش به مدت:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">الگوی چشمک زدن چراغ ال‌ای‌دی تنظیم شد</string>
   <string name="preferences__sound">زنگ</string>
-  <string name="preferences__change_notification_sound">تغییر زنگ اطلاعیه‌ها</string>
   <string name="preferences__silent">بی صدا</string>
   <string name="preferences__in_conversation_notifications">اطلاعیه‌های داخل گفتگو</string>
   <string name="preferences__play_inthread_notifications">پخش کردن اطلاعیه‌ در حال خاندن گفتگو باز شده </string>

res/values-fi/strings.xml

@@ -634,9 +634,6 @@ Vastaanotetiin avaintenvaihtoviesti, joka kuuluu väärälle protokollaversiolle
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Keskustelu mykistetty</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Lähetä Signal-viesti</string>
-  <string name="conversation_activity__type_message_sms_insecure">Lähetä salaamaton SMS </string>
-  <string name="conversation_activity__type_message_mms_insecure">Lähetä salaamaton MMS-viesti</string>
   <string name="conversation_activity__from_sim_name">SIM-kortilta %1$s</string>
   <string name="conversation_activity__send">Lähetä</string>
   <string name="conversation_activity__remove">Poista</string>
@@ -879,6 +876,7 @@ Signal ei saanut vahvistustekstiviestiä odotusajan sisällä.</string>
   <string name="arrays__images">Kuvat</string>
   <string name="arrays__audio">Äänitallenteet</string>
   <string name="arrays__video">Videot</string>
+  <string name="arrays__normal">Normaali</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d tunti</item>
@@ -920,7 +918,6 @@ Signal ei saanut vahvistustekstiviestiä odotusajan sisällä.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Pois päältä:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Mukautettu LED:in vilkkumistahti asetettu!</string>
   <string name="preferences__sound">Ääni</string>
-  <string name="preferences__change_notification_sound">Vaihda ilmoitusääni</string>
   <string name="preferences__silent">Ei ääntä</string>
   <string name="preferences__in_conversation_notifications">Keskustelun sisäiset ilmoitukset</string>
   <string name="preferences__play_inthread_notifications">Käytä ilmoitusääniä myös silloin, kun olen keskustelussa.</string>

res/values-fr/strings.xml

@@ -227,6 +227,7 @@
   <string name="DeviceListItem_last_active_s">Vu pour la dernière fois %s</string>
   <string name="DeviceListItem_today">Aujourd\'hui</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Fichier inconnu</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Optimiser les services Play manquant</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Cet appareil ne prend pas en charge le Play Services. Appuyez sur cette touche pour désactiver les optimisations de la batterie du système qui empêchent le signal de récupérer les messages lorsqu\'ils sont inactifs.</string>
@@ -360,6 +361,7 @@ l\'importer à nouveau se traduira par des messages dupliqués.</string>
   <string name="MessageRecord_s_called_you">%s vous a appelé</string>
   <string name="MessageRecord_called_s">Appelé %s</string>
   <string name="MessageRecord_missed_call_from">Appel manqué de %s</string>
+  <string name="MessageRecord_s_joined_signal">%s a rejoint Signal !</string>
   <string name="MessageRecord_you_set_disappearing_message_time_to_s">Vous avez choisi %1$s comme heure de disparition du message.</string>
   <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s a choisi %2$s comme heure de disparition du message.</string>
   <string name="MessageRecord_your_safety_number_with_s_has_changed">Votre numéro de sécurité avec %s a changé</string>
@@ -456,6 +458,8 @@ introduit (%s) n\'est pas valide.</string>
   <string name="RegistrationActivity_i_understand">Je comprends</string>
   <string name="RegistrationActivity_play_services_error">Erreur Service Play</string>
   <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services est en cours de mise à jour ou est temporairement indisponible. Veuillez réessayer.</string>
+  <string name="RegistrationActivity_more_information">Plus d\'informations</string>
+  <string name="RegistrationActivity_less_information">Moins d\'informations</string>
   <!--RegistrationProblemsActivity-->
   <string name="RegistrationProblemsActivity_possible_problems">Problèmes possibles</string>
   <!--RegistrationProgressActivity-->
@@ -478,6 +482,8 @@ introduit (%s) n\'est pas valide.</string>
   <string name="RegistrationProgressActivity_too_many_requests">Trop de requêtes !</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Vous avez déjà demandé récemment un appel vocal. Vous pouvez en demander un autre dans 20 minutes.</string>
   <string name="RegistrationProgressActivity_registration_conflict">Conflit d’inscription</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Ce numéro est déjà enregistré sur un serveur Signal différent.
+Vous devez vous désinscrire sur l\'autre serveur avant de vous enregistrer ici.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Enregistrement complet</string>
   <string name="RegistrationService_signal_registration_has_successfully_completed">L\'enregistrement sur Signal a bien réussi.</string>
@@ -505,6 +511,7 @@ Réception d\'un message d\'échange de clés pour une version invalide du proto
   <string name="ThreadRecord_called_you">Vous a appelé</string>
   <string name="ThreadRecord_missed_call">Appel manqué</string>
   <string name="ThreadRecord_media_message">Message média</string>
+  <string name="ThreadRecord_s_joined_signal">%s a rejoint Signal !</string>
   <string name="ThreadRecord_disappearing_message_time_updated_to_s">Le temps de disparition des messages a été réglé à %s</string>
   <string name="ThreadRecord_your_safety_number_with_s_has_changed">Votre numéro de sécurité avec %s a changé</string>
   <!--UpdateApkReadyListener-->
@@ -581,6 +588,7 @@ Réception d\'un message d\'échange de clés pour une version invalide du proto
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">La réponse rapide n\'est pas disponible lorsque Signal est verrouillé !</string>
   <string name="QuickResponseService_problem_sending_message">Erreur lors de l\'envoi du message !</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Ouvrir le répertoire</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Nouveau message</string>
@@ -628,9 +636,6 @@ Réception d\'un message d\'échange de clés pour une version invalide du proto
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Conversation mise en silencieux</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Envoyer un message Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Envoyer un SMS non-sécurisé</string>
-  <string name="conversation_activity__type_message_mms_insecure">Envoyer un MMS non-sécurisé</string>
   <string name="conversation_activity__from_sim_name">De %1$s</string>
   <string name="conversation_activity__send">Envoyer</string>
   <string name="conversation_activity__remove">Supprimer</string>
@@ -780,6 +785,7 @@ Vérifier votre numéro de téléphone pour vous connecter avec Signal</string>
 VOTRE NUMÉRO DE TÉLÉPHONE</string>
   <string name="registration_activity__phone_number">NUMÉRO DE TÉLÉPHONE</string>
   <string name="registration_activity__register">S\'enregistrer</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Signal facilite la communication en utilisant votre numéro de téléphone et votre carnet d\'adresses. Les amis et les contacts qui savent déjà comment vous contacter par téléphone pourront facilement entrer en contact avec vous via Signal.\n\L\'inscription transmet certaines informations de contact au serveur. Ces informations ne sont pas enregistrées.</string>
   <string name="registration_activity__powered_by_twilio">Fourni par twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Certains des problèmes possibles
@@ -881,6 +887,8 @@ par SMS.</string>
   <string name="arrays__images">Images</string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Vidéo</string>
+  <string name="arrays__documents">Documents</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d heure</item>
@@ -922,7 +930,6 @@ par SMS.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Éteinte pour :</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Rythme de clignotement de la LED personnalisée défini !</string>
   <string name="preferences__sound">Son</string>
-  <string name="preferences__change_notification_sound">Modifier le son de notification</string>
   <string name="preferences__silent">Silencieux</string>
   <string name="preferences__in_conversation_notifications">Notifications dans les conversations</string>
   <string name="preferences__play_inthread_notifications">Émettre une notification sonore lors de la lecture d\'une discussion active.</string>

res/values-gl/strings.xml

@@ -501,9 +501,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Conversa silenciada</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Enviar mensaxe Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Enviar SMS insegura</string>
-  <string name="conversation_activity__type_message_mms_insecure">Enviar MMS insegura</string>
   <string name="conversation_activity__from_sim_name">De %1$s</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Eliminar</string>
@@ -671,6 +668,7 @@
   <string name="arrays__images">Imaxes</string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Vídeo</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -702,7 +700,6 @@
   <string name="preferences__led_color_unknown">Descoñecido</string>
   <string name="preferences__pref_led_blink_title">Intermitencia do LED</string>
   <string name="preferences__sound">Son</string>
-  <string name="preferences__change_notification_sound">Cambiar o son das notificacións</string>
   <string name="preferences__silent">En silencio</string>
   <string name="preferences__in_conversation_notifications">Notificacións durante a conversa</string>
   <string name="preferences__play_inthread_notifications">Reproduce un son mentres se está a ver unha conversa activa</string>

res/values-hr/strings.xml

@@ -657,9 +657,6 @@ Primljena poruka razmjene ključeva za pogrešnu inačicu protokola.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Razgovor utišan</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Pošalji Signal poruku</string>
-  <string name="conversation_activity__type_message_sms_insecure">Pošalji nesigurni SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Pošalji nesigurni MMS</string>
   <string name="conversation_activity__from_sim_name">Od %1$s</string>
   <string name="conversation_activity__send">Pošalji</string>
   <string name="conversation_activity__remove">Ukloni</string>
@@ -919,6 +916,7 @@ neuspješno.</string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Dokumenti</string>
+  <string name="arrays__normal">Normalno</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d sat</item>
@@ -961,7 +959,6 @@ neuspješno.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Isključi za:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Prilagođeni LED uzorak treptanja postavljen!</string>
   <string name="preferences__sound">Zvuk</string>
-  <string name="preferences__change_notification_sound">Izmjenite zvuk obavijesti</string>
   <string name="preferences__silent">Bezvučno</string>
   <string name="preferences__in_conversation_notifications">Obavijesti unutar razgovora</string>
   <string name="preferences__play_inthread_notifications">Reproduciraj zvukove obavijesti prilikom pregleda aktivnog razgovora</string>

res/values-hu/strings.xml

@@ -229,6 +229,7 @@
   <string name="DeviceListItem_last_active_s">Utoljára aktív %s</string>
   <string name="DeviceListItem_today">Ma</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">ismeretlen fájl</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Optimalizálás hiányzó Play Szolgáltatásokra</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Ez a készülék nem támogat Play Szolgáltatásokat. Érints a rendszer akkumulátor optimalizációk letiltásához, ami megakadályozza a Signal-t az üzenetek visszakeresésében, amikor inaktív.</string>
@@ -602,6 +603,7 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Gyors válasz nem elérhető, amikor a Signal zárolva van!</string>
   <string name="QuickResponseService_problem_sending_message">Probléma az üzenetküldéskor!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Könyvtár megnyitása</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Új üzenet</string>
@@ -651,9 +653,6 @@ Kulcs-csere üzenet érkezett érvénytelen protokoll verzióhoz.
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Beszélgetés némítva</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Signal üzenet küldése</string>
-  <string name="conversation_activity__type_message_sms_insecure">Védtelen SMS küldése</string>
-  <string name="conversation_activity__type_message_mms_insecure">Védtelen MMS küldése</string>
   <string name="conversation_activity__from_sim_name">%1$s hálózaton</string>
   <string name="conversation_activity__send">Küldés</string>
   <string name="conversation_activity__remove">Eltávolítás</string>
@@ -925,6 +924,7 @@ sikertelen.
   <string name="arrays__audio">Hang</string>
   <string name="arrays__video">Videó</string>
   <string name="arrays__documents">Dokumentumok</string>
+  <string name="arrays__normal">Normál</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d óra</item>
@@ -966,7 +966,6 @@ sikertelen.
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Ki ehhez:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Egyéni LED villogási mintázat beállítva!</string>
   <string name="preferences__sound">Hang</string>
-  <string name="preferences__change_notification_sound">Értesítési hang megváltoztatása</string>
   <string name="preferences__silent">Csendes</string>
   <string name="preferences__in_conversation_notifications">Beszélgetésen belüli értesítések</string>
   <string name="preferences__play_inthread_notifications">Értesítési hang lejátszása aktív beszélgetés nézésekor</string>

res/values-in/strings.xml

@@ -554,9 +554,6 @@ Diterima pesan pertukaran kunci untuk versi protokol yang tidak valid.
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Percakapan dibisukan</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Kirim pesan Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Kirim SMS tidak aman</string>
-  <string name="conversation_activity__type_message_mms_insecure">Kirim MMS tidak aman</string>
   <string name="conversation_activity__from_sim_name">Dari %1$s</string>
   <string name="conversation_activity__send">Kirim</string>
   <string name="conversation_activity__remove">Hapus</string>
@@ -778,6 +775,7 @@ gagal
   <string name="arrays__images">Gambar</string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Video</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d jam</item>
@@ -818,7 +816,6 @@ gagal
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Mati selama:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Set pola kedip LED!</string>
   <string name="preferences__sound">Bunyi</string>
-  <string name="preferences__change_notification_sound">Ganti suara notofikasi</string>
   <string name="preferences__silent">Diam</string>
   <string name="preferences__in_conversation_notifications">Pemberitahuan percakapan</string>
   <string name="preferences__play_inthread_notifications">Putar suara pemberitahuan ketika berada pada percakapan aktif</string>

res/values-it/strings.xml

@@ -227,6 +227,7 @@
   <string name="DeviceListItem_last_active_s">Ultima attività %s</string>
   <string name="DeviceListItem_today">Oggi</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">File sconosciuto</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Ottimizza per la mancanza di Google Play Services</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Questo dispositivo non supporta Google Play Services. Premi per disabilitare l\'ottimizzazione di sistema del consumo della batteria che impedisce a Signal di ricevere messaggi quando è inattivo</string>
@@ -589,6 +590,7 @@ Ricevuto un messaggio di scambio chiavi per una versione di protocollo non valid
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Risposta veloce non disponibile quando Signal è bloccato!</string>
   <string name="QuickResponseService_problem_sending_message">Problema nell\'invio del messaggio!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Apri cartella</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Nuovo messaggio</string>
@@ -636,9 +638,6 @@ Ricevuto un messaggio di scambio chiavi per una versione di protocollo non valid
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Conversazione mutata</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Invia messaggio Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Invia SMS non cifrato</string>
-  <string name="conversation_activity__type_message_mms_insecure">Invia MMS non cifrato</string>
   <string name="conversation_activity__from_sim_name">Da %1$s</string>
   <string name="conversation_activity__send">Invia</string>
   <string name="conversation_activity__remove">Elimina</string>
@@ -895,6 +894,7 @@ non riuscita.
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Documenti</string>
+  <string name="arrays__normal">Normale</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d ora</item>
@@ -936,7 +936,6 @@ non riuscita.
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Spento per:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Lampeggiamento personalizzato impostato!</string>
   <string name="preferences__sound">Suono</string>
-  <string name="preferences__change_notification_sound">Cambia il suono di notifica</string>
   <string name="preferences__silent">Silenzioso</string>
   <string name="preferences__in_conversation_notifications">Notifiche nelle conversazioni</string>
   <string name="preferences__play_inthread_notifications">Riproduci il suono di notifica anche all\'interno di una conversazione</string>

res/values-iw/strings.xml

@@ -635,9 +635,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">שיחה מושתקת</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">שליחת מסר בסיגנל</string>
-  <string name="conversation_activity__type_message_sms_insecure">שליחת SMS לא מאובטח</string>
-  <string name="conversation_activity__type_message_mms_insecure">שליחת MMS לא מאובטח</string>
   <string name="conversation_activity__from_sim_name">מ־%1$s</string>
   <string name="conversation_activity__send">שליחה</string>
   <string name="conversation_activity__remove">הסרה</string>
@@ -887,6 +884,7 @@
   <string name="arrays__images">תמונות</string>
   <string name="arrays__audio">קול</string>
   <string name="arrays__video">סרט</string>
+  <string name="arrays__normal">רגיל</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">שעה %d</item>
@@ -928,7 +926,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">כבויה כאשר:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">תבנית הבהוב נורית אישית הוגדרה!</string>
   <string name="preferences__sound">קול</string>
-  <string name="preferences__change_notification_sound">שינוי צליל ההתראה</string>
   <string name="preferences__silent">שקט</string>
   <string name="preferences__in_conversation_notifications">התראות בתוך השיחה</string>
   <string name="preferences__play_inthread_notifications">לנגן צליל התראה רק בזמן הצגת שיחה פעילה</string>

res/values-ja/strings.xml

@@ -607,9 +607,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">会話を消音</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">プッシュ送信</string>
-  <string name="conversation_activity__type_message_sms_insecure">SMSを送信（通信安全性は確保されません）</string>
-  <string name="conversation_activity__type_message_mms_insecure">MMSを送信（通信安全性は確保されません）</string>
   <string name="conversation_activity__from_sim_name">%1$sから</string>
   <string name="conversation_activity__send">送信</string>
   <string name="conversation_activity__remove">削除</string>
@@ -836,6 +833,7 @@
   <string name="arrays__audio">音声</string>
   <string name="arrays__video">動画</string>
   <string name="arrays__documents">文書</string>
+  <string name="arrays__normal">普通</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d時間前</item>
@@ -876,7 +874,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">消灯時間:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">オリジナルのLED点滅パターンが設定されました！</string>
   <string name="preferences__sound">着信音</string>
-  <string name="preferences__change_notification_sound">通知音を変更</string>
   <string name="preferences__silent">無音</string>
   <string name="preferences__in_conversation_notifications">チャット中の通知</string>
   <string name="preferences__play_inthread_notifications">チャットを表示している間も通知音を出す</string>

res/values-km-rKH/strings.xml

@@ -211,6 +211,7 @@
   <string name="DeviceListItem_last_active_s">សកម្មក្រោយគេ​ %s</string>
   <string name="DeviceListItem_today">ថ្ងៃនេះ</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">ឯកសារមិនស្គាល់</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">បង្កើនប្រសិទ្ធភាពសម្រាប់ការបាត់ Play Services</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">ឧបករណ៍នេះ មិនគាំទ្រ Play Services។ ចុច ដើម្បីបិទការបង្កើនប្រសិទ្ធិភាពប្រព័ន្ធថ្ម ដែលរារាំង Signal ពីទាញយកសារនានា ពេលទុកឧបករណ៍ចោល។</string>
@@ -346,6 +347,7 @@
   <string name="MessageRecord_s_called_you">%s ហៅមកអ្នក</string>
   <string name="MessageRecord_called_s">ហៅទៅកាន់ %s</string>
   <string name="MessageRecord_missed_call_from">ការហៅមិនបានទទួលពី %s</string>
+  <string name="MessageRecord_s_joined_signal">%s បានចូលរួម Signal!</string>
   <string name="MessageRecord_you_set_disappearing_message_time_to_s">អ្នកកំណត់រយៈពេលសារមិនបង្ហាញ %1$s។</string>
   <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s កំណត់រយៈពេលសារមិនបង្ហាញ %2$s។</string>
   <string name="MessageRecord_your_safety_number_with_s_has_changed">លេខសុវត្ថិភាពអ្នកជាមួយ %s បានផ្លាស់ប្តូរ។</string>
@@ -442,6 +444,8 @@
   <string name="RegistrationActivity_i_understand">ខ្ញុំយល់</string>
   <string name="RegistrationActivity_play_services_error">បញ្ហា Play Services </string>
   <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services កំពុងធ្វើបច្ចុប្បន្នភាព ឬមិនអាចប្រើបានជាបណ្តោះអាសន្ន។ សូមព្យាយាមម្តងទៀត។</string>
+  <string name="RegistrationActivity_more_information">ព័ត៌មានបន្ថែម</string>
+  <string name="RegistrationActivity_less_information">ព័ត៌មានបន្តិច</string>
   <!--RegistrationProblemsActivity-->
   <string name="RegistrationProblemsActivity_possible_problems">បញ្ហាដែលអាចមាន</string>
   <!--RegistrationProgressActivity-->
@@ -464,6 +468,7 @@
   <string name="RegistrationProgressActivity_too_many_requests">មានការស្នើសុំច្រើនពេក!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">អ្នកបានស្នើសុំការហៅចូលម្តងហើយ។ អ្នកអាចស្នើសុំម្តងទៀត ក្នុងពេល20នាទី។ </string>
   <string name="RegistrationProgressActivity_registration_conflict">ការចុះឈ្មោះស្ទួន</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">លេខនេះបានចុះឈ្មោះលើម៉ាស៊ីនមេផ្សេងរួចហើយ។ អ្នកត្រូវលុបឈ្មោះ នៅទីនោះសិន មុនពេលចុះឈ្មោះនៅទីនេះ។</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">ការចុះឈ្មោះជោគជ័យ</string>
   <string name="RegistrationService_signal_registration_has_successfully_completed">ការចុះឈ្មោះ Signal ជោគជ័យ។</string>
@@ -491,6 +496,7 @@
   <string name="ThreadRecord_called_you">ហៅមកអ្នក</string>
   <string name="ThreadRecord_missed_call">ការហៅមិនបានទទួល</string>
   <string name="ThreadRecord_media_message">សារមេឌា</string>
+  <string name="ThreadRecord_s_joined_signal">%s បានចូលរួម Signal!</string>
   <string name="ThreadRecord_disappearing_message_time_updated_to_s">កំណត់រយៈពេលសារមិនបង្ហាញ %s</string>
   <string name="ThreadRecord_your_safety_number_with_s_has_changed">លេខសុវត្ថិភាពអ្នកជាមួយ %s បានផ្លាស់ប្តូរ។</string>
   <!--UpdateApkReadyListener-->
@@ -567,6 +573,7 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">មិនមានការឆ្លើយតបភ្លាមៗ នៅពេល Signal ត្រូវបានចាក់សោរ!</string>
   <string name="QuickResponseService_problem_sending_message">សារដែលមានបញ្ហាបញ្ជូន!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">បើកថត</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal"> Signal </string>
   <string name="SingleRecipientNotificationBuilder_new_message">សារថ្មី</string>
@@ -614,9 +621,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">បិទសំឡេងការសន្ទនា</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">ផ្ញើសារ Signal </string>
-  <string name="conversation_activity__type_message_sms_insecure">ផ្ញើ SMS គ្មានសុវត្ថិភាព</string>
-  <string name="conversation_activity__type_message_mms_insecure">ផ្ញើ MMS គ្មានសុវត្ថិភាព</string>
   <string name="conversation_activity__from_sim_name">ពី %1$s</string>
   <string name="conversation_activity__send">ផ្ញើ</string>
   <string name="conversation_activity__remove">លុប</string>
@@ -759,6 +763,7 @@
 លេខទូរស័ព្ទ</string>
   <string name="registration_activity__phone_number">លេខទូរស័ព្ទ</string>
   <string name="registration_activity__register">ចុះឈ្មោះ</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Signal ធ្វើឲ្យការទំនាក់ទំនងងាយស្រួល ដោយប្រើប្រាស់លេខទូរស័ព្ទ និងបញ្ជីដែលមានស្រាប់។ មិត្តភក្តិ និងលេខទំនាក់ទំនង ដែលដឹងពីរបៀបទាក់ទងអ្នកតាមលេខទូរស័ព្ទ នឹងអាចទាក់ទងអ្នក យ៉ាងងាយស្រួលតាម Signal.\n\nការចុះឈ្មោះ បញ្ជូនព័ត៌មានទំនាក់ទំនងមួយចំនួនទៅកាន់ម៉ាស៊ីនមេ។ វាមិនរក្សាទុកអ្វីឡើយ។</string>
   <string name="registration_activity__powered_by_twilio">ឧបត្ថម្ភដោយ twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">បញ្ហាដែលអាចកើតឡើង
@@ -861,6 +866,8 @@
   <string name="arrays__images">រូបភាព</string>
   <string name="arrays__audio">សំឡេង</string>
   <string name="arrays__video">វីដេអូ</string>
+  <string name="arrays__documents">ឯកសារ</string>
+  <string name="arrays__normal">ធម្មតា</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d ម៉ោង</item>
@@ -901,7 +908,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">បិទសម្រាប់៖</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">លំនាំលោតភ្លើង LED ផ្សេងត្រូវបានកំណត់!</string>
   <string name="preferences__sound">សំឡេង</string>
-  <string name="preferences__change_notification_sound">ផ្លាស់ប្តូរសំឡេងដំណឹង</string>
   <string name="preferences__silent">ស្ងាត់</string>
   <string name="preferences__in_conversation_notifications">សារដំណឹងក្នុងការសន្ទនា</string>
   <string name="preferences__play_inthread_notifications">ដាក់សំឡេងដំណឹងពេលបើកមើលការសន្ទនា</string>

res/values-kn-rIN/strings.xml

@@ -421,8 +421,6 @@
   <string name="contact_selection_recent_activity__no_recent_calls">ಯಾವುದೇ ಇತ್ತೀಚಿನ ಕರೆಗಳಿಲ್ಲ.</string>
   <!--conversation_title_view-->
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_sms_insecure">ಅಸುರಕ್ಷಿತ ಎಸ್ಎಂಎಸ್ ಕಳುಹಿಸಿ</string>
-  <string name="conversation_activity__type_message_mms_insecure">ಅಸುರಕ್ಷಿತ ಎಂಎಂಎಸ್ ಕಳುಹಿಸಿ</string>
   <string name="conversation_activity__send">ಕಳುಹಿಸು</string>
   <string name="conversation_activity__remove">ತೆಗೆದುಹಾಕಿ</string>
   <string name="conversation_activity__window_description">%1$s ಅವರೊಂದಿಗೆ ಸಂವಾದ</string>
@@ -548,6 +546,7 @@
   <string name="arrays__import_export">ಆಮದು / ರಫ್ತು</string>
   <string name="arrays__enabled">ಸಕ್ರಿಯಗೊಳಿಸು</string>
   <string name="arrays__disabled">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸು</string>
+  <string name="arrays__normal">ಸಾಧಾರಣ</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d ಗಂಟೆಗಳು</item>
@@ -578,7 +577,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">ಆಫ್:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">ಇಚ್ಛೆಯ ಎಲ್. ಇ. ಡಿ ಮಿಣುಕುವ ಮಾದರಿಯನ್ನು ಹೊಂದಿಸಲಾಗಿದೆ!</string>
   <string name="preferences__sound">ಶಬ್ದ</string>
-  <string name="preferences__change_notification_sound">ಸೂಚನೆಯ ಶಬ್ದ ಬದಲಾಯಿಸಿ</string>
   <string name="preferences__one_time">ಒಮ್ಮೆ</string>
   <string name="preferences__two_times">ಎರಡು ಬಾರಿ</string>
   <string name="preferences__three_times">ಮೂರು ಬಾರಿ</string>

res/values-ko/strings.xml

@@ -536,9 +536,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">대화 알림 꺼짐</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Signal 메시지 보내기</string>
-  <string name="conversation_activity__type_message_sms_insecure">보안 해제된 SMS 보내기</string>
-  <string name="conversation_activity__type_message_mms_insecure">보안 해제된 MMS 보내기</string>
   <string name="conversation_activity__from_sim_name">%1$s(으)로</string>
   <string name="conversation_activity__send">보내기</string>
   <string name="conversation_activity__remove">삭제</string>
@@ -746,6 +743,7 @@
   <string name="arrays__images">이미지</string>
   <string name="arrays__audio">오디오</string>
   <string name="arrays__video">동영상</string>
+  <string name="arrays__normal">보통</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d시간 전</item>
@@ -786,7 +784,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">꺼진 시간</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">알림등 반복 패턴 맞춤 설정됨</string>
   <string name="preferences__sound">소리</string>
-  <string name="preferences__change_notification_sound">알림 벨소리 변경</string>
   <string name="preferences__silent">무음</string>
   <string name="preferences__in_conversation_notifications">대화 중 알림</string>
   <string name="preferences__play_inthread_notifications">대화 중에 알림 벨소리 재생</string>

res/values-lg/strings.xml

@@ -523,9 +523,6 @@ Dammu okebere e namba yo.  Tugenda kugikakasa no bubaka ku simu</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">emboozi esilisidwa</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">welezza obubaka bwamayengo</string>
-  <string name="conversation_activity__type_message_sms_insecure">sindika obubaka obwekusifu</string>
-  <string name="conversation_activity__type_message_mms_insecure">sindika  MMS obutakumidwa</string>
   <string name="conversation_activity__from_sim_name">kuva %1$s</string>
   <string name="conversation_activity__send">Sindika</string>
   <string name="conversation_activity__remove">Gyawo</string>
@@ -766,6 +763,7 @@ Signal evudeko bwebadde erinda obubaka okukakasa.</string>
   <string name="arrays__images">Ebifaananyi</string>
   <string name="arrays__audio">Doboozi</string>
   <string name="arrays__video">Vidiyo</string>
+  <string name="arrays__normal">Kyabulijjo</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d saawa</item>
@@ -811,7 +809,6 @@ Signal evudeko bwebadde erinda obubaka okukakasa.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Okuvako paka: </string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Custom LED blink pattern esetingidwa!</string>
   <string name="preferences__sound">Doboozi</string>
-  <string name="preferences__change_notification_sound">Kyusa doboozi lyo\' kutemezebwako. </string>
   <string name="preferences__silent">Kusirika</string>
   <string name="preferences__in_conversation_notifications">Mu mboozi zo\'kutemezebwako.</string>
   <string name="preferences__play_inthread_notifications">

res/values-lt/strings.xml

@@ -668,9 +668,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Pokalbis nutildytas</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Siųsti Signal žinutę</string>
-  <string name="conversation_activity__type_message_sms_insecure">Siųsti nesaugią SMS žinutę</string>
-  <string name="conversation_activity__type_message_mms_insecure">Siųsti nesaugią MMS žinutę</string>
   <string name="conversation_activity__from_sim_name">Nuo %1$s</string>
   <string name="conversation_activity__send">Siųsti</string>
   <string name="conversation_activity__remove">Šalinti</string>
@@ -948,6 +945,7 @@ yra prisijungęs prie belaidžio (Wi-Fi) arba duomenų perdavimo tinklo.
   <string name="arrays__audio">Garso įrašai</string>
   <string name="arrays__video">Vaizdo įrašai</string>
   <string name="arrays__documents">Dokumentai</string>
+  <string name="arrays__normal">Normalus</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d valanda</item>
@@ -990,7 +988,6 @@ yra prisijungęs prie belaidžio (Wi-Fi) arba duomenų perdavimo tinklo.
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Išjungtas:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Tinkintas šviesos diodo šablonas nustatytas!</string>
   <string name="preferences__sound">Garsas</string>
-  <string name="preferences__change_notification_sound">Pakeisti pranešimų garsą</string>
   <string name="preferences__silent">Tyliai</string>
   <string name="preferences__in_conversation_notifications">Pranešimai pokalbyje</string>
   <string name="preferences__play_inthread_notifications">Groti pranešimų garsą, kuomet rodomas aktyvus pokalbis</string>

res/values-mk/strings.xml

@@ -373,8 +373,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Разговорот сега е безгласен</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_sms_insecure">Пратете нешифрирана SMS порака</string>
-  <string name="conversation_activity__type_message_mms_insecure">Пратете нешифрирана MMS порака</string>
   <string name="conversation_activity__send">Испрати</string>
   <string name="conversation_activity__remove">Отстрани</string>
   <string name="conversation_activity__window_description">Разговор со %1$s</string>
@@ -518,6 +516,7 @@
   <string name="arrays__enabled">Овозможено</string>
   <string name="arrays__disabled">Оневозможено</string>
   <string name="arrays__audio">Звук</string>
+  <string name="arrays__normal">Нормално</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d час</item>
@@ -549,7 +548,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Исклучено за:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Поставен е прилагодениот LED примерок за трепкање</string>
   <string name="preferences__sound">Звук</string>
-  <string name="preferences__change_notification_sound">Променете го звукот за известување</string>
   <string name="preferences__play_inthread_notifications">Свири звук за известување за време на активен разговор</string>
   <string name="preferences__repeat_alerts">Повтори известувања</string>
   <string name="preferences__never">Никогаш</string>

res/values-nb/strings.xml

@@ -591,9 +591,6 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversion.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Samtale dempet</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Send Signal-melding</string>
-  <string name="conversation_activity__type_message_sms_insecure">Send usikker SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Send usikker MMS</string>
   <string name="conversation_activity__from_sim_name">Fra %1$s</string>
   <string name="conversation_activity__send">Send</string>
   <string name="conversation_activity__remove">Fjern</string>
@@ -845,6 +842,7 @@ Signal fikk tidsavbrudd under venting på bekreftelsesmelding.</string>
   <string name="arrays__images">Bilder</string>
   <string name="arrays__audio">Lyd</string>
   <string name="arrays__video">Video</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d time</item>
@@ -886,7 +884,6 @@ Signal fikk tidsavbrudd under venting på bekreftelsesmelding.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Av for:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">LED-blinkemønster er endret.</string>
   <string name="preferences__sound">Lyd</string>
-  <string name="preferences__change_notification_sound">Endre varslingslyd</string>
   <string name="preferences__silent">Stille</string>
   <string name="preferences__in_conversation_notifications">Varsling under samtaler</string>
   <string name="preferences__play_inthread_notifications">Spill av varslingslyd når du ser på en aktiv samtale</string>

res/values-nl/strings.xml

@@ -227,6 +227,7 @@
   <string name="DeviceListItem_last_active_s">Laatst actief %s</string>
   <string name="DeviceListItem_today">Vandaag</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Onbekend bestand</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Achtergrond verbinding geactiveerd</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Dit apparaat ondersteund de Play Services niet. Tik om de optimalisaties m.b.t. stroomverbruik uit te schakelen die Signal momenteel verhinderen om berichten te ontvangen op de achtergrond.</string>
@@ -587,6 +588,7 @@ Sleuteluitwisselingsbericht ontvangen voor een verkeerde protocol-versie.</strin
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Snel reageren niet beschikbaar wanneer Signal vergrendeld is!</string>
   <string name="QuickResponseService_problem_sending_message">Fout bij verzenden van bericht!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Map openen</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Nieuw bericht</string>
@@ -634,9 +636,9 @@ Sleuteluitwisselingsbericht ontvangen voor een verkeerde protocol-versie.</strin
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Gesprek gedempt</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Verzend een Signal-bericht</string>
-  <string name="conversation_activity__type_message_sms_insecure">Verzend een onbeveiligde SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Verzend een onbeveiligde MMS</string>
+  <string name="conversation_activity__type_message_push">Signal bericht</string>
+  <string name="conversation_activity__type_message_sms_insecure">Onbeveiligde SMS</string>
+  <string name="conversation_activity__type_message_mms_insecure">Onbeveiligde MMS</string>
   <string name="conversation_activity__from_sim_name">Van %1$s</string>
   <string name="conversation_activity__send">Verzenden</string>
   <string name="conversation_activity__remove">Verwijderen</string>
@@ -884,6 +886,10 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <string name="arrays__audio">Geluid</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Documenten</string>
+  <string name="arrays__small">Klein</string>
+  <string name="arrays__normal">Normaal</string>
+  <string name="arrays__large">Groot</string>
+  <string name="arrays__extra_large">Extra groot</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d uur</item>
@@ -925,7 +931,6 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Uit voor:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Aangepast LED-knipperpatroon ingesteld.</string>
   <string name="preferences__sound">Geluid</string>
-  <string name="preferences__change_notification_sound">Meldingsgeluid wijzigen</string>
   <string name="preferences__silent">Stil</string>
   <string name="preferences__in_conversation_notifications">Meldingen in een gesprek</string>
   <string name="preferences__play_inthread_notifications">Meldingsgeluid afspelen tijdens het bekijken van een actief gesprek</string>
@@ -998,6 +1003,14 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Biedt ondersteuning voor video- en audiogesprekken van de volgende generatie, indien ingeschakeld door beide partijen. Deze functie is in bèta.</string>
   <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Verstuur 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__always_relay_calls">Alle oproepen doorsturen</string>
+  <string name="preferences_app_protection__app_access">App toegang</string>
+  <string name="preferences_app_protection__communication">Communicatie</string>
+  <string name="preferences_chats__chats">Gesprekken</string>
+  <string name="preferences_notifications__message_notifications">Gespreks notificaties</string>
+  <string name="preferences_notifications__events">Gebeurtenissen</string>
+  <string name="preferences_chats__show_invitation_prompts">Uitnodigings vragen 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__message_text_size">Tekstgrootte voor berichten</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->

res/values-nn/strings.xml

@@ -642,9 +642,6 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversjon.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Samtale dempa</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Send Signal-melding</string>
-  <string name="conversation_activity__type_message_sms_insecure">Send usikker SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Send usikker MMS</string>
   <string name="conversation_activity__from_sim_name">Frå %1$s</string>
   <string name="conversation_activity__send">Send</string>
   <string name="conversation_activity__remove">Fjern</string>
@@ -901,6 +898,7 @@ Signal fekk tidsavbrot ved venting på stadfestingsmeldinga.</string>
   <string name="arrays__audio">Lyd</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Dokument</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d time</item>
@@ -942,7 +940,6 @@ Signal fekk tidsavbrot ved venting på stadfestingsmeldinga.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Av for:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">LED-blinkemønster er endra.</string>
   <string name="preferences__sound">Lyd</string>
-  <string name="preferences__change_notification_sound">Endra varslingslyd</string>
   <string name="preferences__silent">Stille</string>
   <string name="preferences__in_conversation_notifications">Varsling under samtalar</string>
   <string name="preferences__play_inthread_notifications">Spel av varslingslyd når du ser på ein aktiv samtale</string>

res/values-no/strings.xml

@@ -549,9 +549,6 @@ Mottok nøkkelutvekslingsmelding for ugyldig protokollversjon.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Samtale mutet</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Send Signal melding</string>
-  <string name="conversation_activity__type_message_sms_insecure">Send usikret SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Send usikret MMS</string>
   <string name="conversation_activity__from_sim_name">Fra %1$s</string>
   <string name="conversation_activity__send">Send</string>
   <string name="conversation_activity__remove">Slett</string>
@@ -776,6 +773,7 @@ feilet.</string>
   <string name="arrays__images">Bilder</string>
   <string name="arrays__audio">Lyd</string>
   <string name="arrays__video">Video</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d time</item>
@@ -817,7 +815,6 @@ feilet.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Av for:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Tilpasset LED blinkemønster satt!</string>
   <string name="preferences__sound">Lyd</string>
-  <string name="preferences__change_notification_sound">Endre lyd på meldingsvarsling</string>
   <string name="preferences__silent">Stille</string>
   <string name="preferences__in_conversation_notifications">Varsling i aktiv samtale</string>
   <string name="preferences__play_inthread_notifications">Spill av varlingslyd når du ser på en aktiv samtale</string>

res/values-pl/strings.xml

@@ -670,9 +670,6 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Rozmowa jest wyciszona</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Wyślij wiadomość Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Wyślij nieszyfrowany SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Wyślij nieszyfrowany MMS</string>
   <string name="conversation_activity__from_sim_name">Od %1$s</string>
   <string name="conversation_activity__send">Wyślij</string>
   <string name="conversation_activity__remove">Usuń</string>
@@ -925,6 +922,7 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Wideo</string>
   <string name="arrays__documents">Dokumenty</string>
+  <string name="arrays__normal">Normalnie</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d godzina</item>
@@ -968,7 +966,6 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Wyłączony dla:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Ustawiono niestandardowy wzór migających świateł LED!</string>
   <string name="preferences__sound">Dźwięk</string>
-  <string name="preferences__change_notification_sound">Zmień dźwięk powiadomienia</string>
   <string name="preferences__silent">Wycisz</string>
   <string name="preferences__in_conversation_notifications">Powiadomienia \"w konwersacji\"</string>
   <string name="preferences__play_inthread_notifications">Włącz dźwięk powiadomienia w aktywnej rozmowie</string>

res/values-pt-rBR/strings.xml

@@ -650,9 +650,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Conversa silenciada</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Enviar mensagem via Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Enviar SMS inseguro</string>
-  <string name="conversation_activity__type_message_mms_insecure">Enviar MMS inseguro</string>
   <string name="conversation_activity__from_sim_name">De %1$s</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Remover</string>
@@ -909,6 +906,7 @@ falhou.</string>
   <string name="arrays__audio">Áudio</string>
   <string name="arrays__video">Vídeo</string>
   <string name="arrays__documents">Documentos</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -950,7 +948,6 @@ falhou.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Desligado por:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Padrão de pisca do LED definido!</string>
   <string name="preferences__sound">Som</string>
-  <string name="preferences__change_notification_sound">Mudar som de notificação</string>
   <string name="preferences__silent">Silencioso</string>
   <string name="preferences__in_conversation_notifications">Notificações na conversa</string>
   <string name="preferences__play_inthread_notifications">Tocar som de notificação quando vendo uma conversa ativa</string>

res/values-pt/strings.xml

@@ -636,9 +636,6 @@ Mensagem de troca de chave inválida para esta versão do protocolo.
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Conversa silenciada</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Enviar mensagem Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Enviar SMS insegura</string>
-  <string name="conversation_activity__type_message_mms_insecure">Enviar MMS insegura</string>
   <string name="conversation_activity__from_sim_name">De %1$s</string>
   <string name="conversation_activity__send">Enviar</string>
   <string name="conversation_activity__remove">Remover</string>
@@ -901,6 +898,7 @@ falhou.
   <string name="arrays__images">Imagens</string>
   <string name="arrays__audio">Áudio</string>
   <string name="arrays__video">Vídeo</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hora</item>
@@ -942,7 +940,6 @@ falhou.
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Inactivo durante:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Padrão de intermitência LED definido!</string>
   <string name="preferences__sound">Som</string>
-  <string name="preferences__change_notification_sound">Alterar som de notificação</string>
   <string name="preferences__silent">Silencioso</string>
   <string name="preferences__in_conversation_notifications">Notificações nas conversas</string>
   <string name="preferences__play_inthread_notifications">Activar notificações enquanto segue uma conversa activa</string>

res/values-ro/strings.xml

@@ -243,6 +243,7 @@
   <string name="DeviceListItem_last_active_s">Ultima oară activ %s</string>
   <string name="DeviceListItem_today">Azi</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Fișier necunoscut</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Optimizează pentru lipsa serviciilor Play</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Acest dispozitiv nu suportă serviciile Play. Apasă pentru a dezactiva optimizarea de sistem a bateriei care împiedică Signal să preia mesajele cât timp este inactivă.</string>
@@ -607,6 +608,7 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Răspunsul rapid nu este disponibil cât timp Signal este blocat!</string>
   <string name="QuickResponseService_problem_sending_message">Problemă la trimiterea mesajului!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Deschide directorul</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Mesaj nou</string>
@@ -654,9 +656,6 @@ Am primit mesajul conform căruia schimbul de chei a avut loc pentru o versiune
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Conversaţia este acum silenţiosă</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Trimite mesaj Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Trimite SMS nesecurizat</string>
-  <string name="conversation_activity__type_message_mms_insecure">Trimite MMS nesecurizat</string>
   <string name="conversation_activity__from_sim_name">De la %1$s</string>
   <string name="conversation_activity__send">Trimite</string>
   <string name="conversation_activity__remove">Șterge</string>
@@ -925,6 +924,7 @@ SMS a eșuat.</string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Documente</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d oră</item>
@@ -967,7 +967,6 @@ SMS a eșuat.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Dezactivat pentru:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Şablonul personalizat de clipire a LED-ului a fost setat!</string>
   <string name="preferences__sound">Sunet</string>
-  <string name="preferences__change_notification_sound">Schimbă sunetul de notificare</string>
   <string name="preferences__silent">Silențios</string>
   <string name="preferences__in_conversation_notifications">Notificări în conversație</string>
   <string name="preferences__play_inthread_notifications">Redare sunet de notificare în timp ce vizualizați o conversație activă</string>

res/values-ru/strings.xml

@@ -259,6 +259,7 @@
   <string name="DeviceListItem_last_active_s">Было онлайн %s</string>
   <string name="DeviceListItem_today">Сегодня</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Неизвестный файл</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Режим без Служб Google Play</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Это устройство не поддерживает Службы Google Play. Нажмите для отключения оптимизации энергопотребления, которая не позволяет Signal получать сообщения, когда он неактивен.</string>
@@ -390,9 +391,12 @@
   <!--MessageRecord-->
   <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Полученное сообщение зашифровано в старой версии Signal, которая больше не поддерживается. Пожалуйста, попросите отправителя обновиться до последней версии и заново отправить сообщение.</string>
   <string name="MessageRecord_left_group">Вы покинули группу.</string>
+  <string name="MessageRecord_you_updated_group">Вы обновили группу.</string>
+  <string name="MessageRecord_s_updated_group">%s обновил группу.</string>
   <string name="MessageRecord_s_called_you">%s звонил(а) вам</string>
   <string name="MessageRecord_called_s">Вы звонили %s</string>
   <string name="MessageRecord_missed_call_from">Пропущен звонок от %s</string>
+  <string name="MessageRecord_s_joined_signal">%s присоединился к Signal!</string>
   <string name="MessageRecord_you_set_disappearing_message_time_to_s">Вы установили время исчезновения сообщений в %1$s.</string>
   <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s установил(а) время исчезновения сообщений в %2$s.</string>
   <string name="MessageRecord_your_safety_number_with_s_has_changed">Ваш с %s код безопасности изменился.</string>
@@ -487,6 +491,8 @@
   <string name="RegistrationActivity_i_understand">Я понимаю</string>
   <string name="RegistrationActivity_play_services_error">Ошибка Служб Google Play</string>
   <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Службы Google Play обновляются или временно недоступны. Пожалуйста, попробуйте ещё раз.</string>
+  <string name="RegistrationActivity_more_information">Больше информации</string>
+  <string name="RegistrationActivity_less_information">Меньше информации</string>
   <!--RegistrationProblemsActivity-->
   <string name="RegistrationProblemsActivity_possible_problems">Возможные проблемы</string>
   <!--RegistrationProgressActivity-->
@@ -509,6 +515,7 @@
   <string name="RegistrationProgressActivity_too_many_requests">Слишком много запросов!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Вы недавно уже запрашивали голосовой звонок. Запросить ещё один вы сможете через 20 минут.</string>
   <string name="RegistrationProgressActivity_registration_conflict">Конфликт регистрации</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Этот номер уже зарегистрирован на другом сервере Signal. Вам нужно прекратить регистрацию там для регистрации здесь.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Регистрация завершена</string>
   <string name="RegistrationService_signal_registration_has_successfully_completed">Регистрация в Signal успешно завершена.</string>
@@ -530,6 +537,7 @@
   <string name="SmsMessageRecord_secure_session_reset_s">%s сбросил(а) защищенный сеанс.</string>
   <string name="SmsMessageRecord_duplicate_message">Дубликат сообщения.</string>
   <!--ThreadRecord-->
+  <string name="ThreadRecord_group_updated">Группа обновлена</string>
   <string name="ThreadRecord_left_the_group">Вы покинули группу</string>
   <string name="ThreadRecord_secure_session_reset">Защищённый сеанс сброшен.</string>
   <string name="ThreadRecord_draft">Черновик:</string>
@@ -537,6 +545,7 @@
   <string name="ThreadRecord_called_you">Звонили вам</string>
   <string name="ThreadRecord_missed_call">Пропущен звонок</string>
   <string name="ThreadRecord_media_message">Медиа-сообщение</string>
+  <string name="ThreadRecord_s_joined_signal">%s присоединился к Signal!</string>
   <string name="ThreadRecord_disappearing_message_time_updated_to_s">Время исчезновения сообщений – %s</string>
   <string name="ThreadRecord_your_safety_number_with_s_has_changed">Ваш с %s код безопасности изменился.</string>
   <!--UpdateApkReadyListener-->
@@ -613,6 +622,7 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Быстрые ответы недоступны, когда Signal заблокирован!</string>
   <string name="QuickResponseService_problem_sending_message">Проблема при отправке сообщения!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Открыть директорию</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Новое сообщение</string>
@@ -660,9 +670,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Звуки разговора выключены</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Отправить через Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Отправить незащищённое SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Отправить незащищённое MMS</string>
   <string name="conversation_activity__from_sim_name">Через %1$s</string>
   <string name="conversation_activity__send">Отправить</string>
   <string name="conversation_activity__remove">Удалить</string>
@@ -784,6 +791,7 @@
   <!--message_recipients_list_item-->
   <string name="message_recipients_list_item__verify">ПОДТВЕРДИТЬ</string>
   <string name="message_recipients_list_item__resend">ОТПРАВИТЬ ЕЩЁ РАЗ</string>
+  <string name="message_recipients_list_item__resending">Пересылка...</string>
   <!--GroupUtil-->
   <plurals name="GroupUtil_joined_the_group">
     <item quantity="one">%1$s присоединился к группе.</item>
@@ -822,6 +830,7 @@
 И НОМЕР ТЕЛЕФОНА</string>
   <string name="registration_activity__phone_number">НОМЕР ТЕЛЕФОНА</string>
   <string name="registration_activity__register">Зарегистрироваться</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Signal упрощает связь, используя номер телефона и адресную книгу. Ваши друзья с легкостью смогут связаться с вам, зная ваш номер.\n\nПри регистрации на сервер передается некоторая информация о контактах, но не сохраняется там.</string>
   <string name="registration_activity__powered_by_twilio">Сервис предоставлен twilio</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Возможные причины:</string>
@@ -924,6 +933,8 @@ SMS-подтверждения...
   <string name="arrays__images">Изображения</string>
   <string name="arrays__audio">Аудио</string>
   <string name="arrays__video">Видео</string>
+  <string name="arrays__documents">Документы</string>
+  <string name="arrays__normal">Среднее</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d час</item>
@@ -967,7 +978,6 @@ SMS-подтверждения...
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Выключить на:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Мигание светодиода настроено!</string>
   <string name="preferences__sound">Мелодия</string>
-  <string name="preferences__change_notification_sound">Изменить мелодию уведомления</string>
   <string name="preferences__silent">Без звука</string>
   <string name="preferences__in_conversation_notifications">Уведомления при разговоре</string>
   <string name="preferences__play_inthread_notifications">Проигрывать звук уведомления, даже когда открыт текущий разговор</string>

res/values-sk/strings.xml

@@ -480,9 +480,6 @@ Bola prijatá správa vzájomnej výmeny kľúčov s neplatnou verziou protokolu
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Konverzácia umlčaná.</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Poslať Signal správu</string>
-  <string name="conversation_activity__type_message_sms_insecure">Poslať nezašifrovanú SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Poslať nezašifrovanú MMS</string>
   <string name="conversation_activity__from_sim_name">Od %1$s</string>
   <string name="conversation_activity__send">Odoslať</string>
   <string name="conversation_activity__remove">Odstrániť</string>
@@ -637,6 +634,7 @@ zlyhalo.
   <string name="arrays__images">Obrázky</string>
   <string name="arrays__audio">Zvuk</string>
   <string name="arrays__video">Video</string>
+  <string name="arrays__normal">Normálne</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d hodina</item>
@@ -669,7 +667,6 @@ zlyhalo.
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Vypnuté pre:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Vlastná sekvencia blikania nastavená!</string>
   <string name="preferences__sound">Zvuk</string>
-  <string name="preferences__change_notification_sound">Zmeňiť zvuk notifikácie</string>
   <string name="preferences__repeat_alerts">Opakovať hlášky</string>
   <string name="preferences__never">Nikdy</string>
   <string name="preferences__one_time">Raz</string>

res/values-sl/strings.xml

@@ -667,9 +667,6 @@ Prejeto sporočilo za izmenjavo ključev za napačno različico protokola.</stri
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Pogovor je bil utišan</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Pošlji sporočilo Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Pošlji nezavarovan SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Pošlji nezavarovan MMS</string>
   <string name="conversation_activity__from_sim_name">Od %1$s</string>
   <string name="conversation_activity__send">Pošlji</string>
   <string name="conversation_activity__remove">Odstrani</string>
@@ -928,6 +925,7 @@ bila uspešna.</string>
   <string name="arrays__audio">Zvok</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Dokumenti</string>
+  <string name="arrays__normal">Normalno</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d ura</item>
@@ -971,7 +969,6 @@ bila uspešna.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Izklopljeno za:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Utripenje LED je nastavljeno!</string>
   <string name="preferences__sound">Zvok</string>
-  <string name="preferences__change_notification_sound">Spremeni zvok za obvestila</string>
   <string name="preferences__silent">Tiho</string>
   <string name="preferences__in_conversation_notifications">Obvestila znotraj pogovora</string>
   <string name="preferences__play_inthread_notifications">Ob ogledu aktivnega pogovora predvajaj zvok za obvestila</string>

res/values-sq/strings.xml

@@ -638,9 +638,6 @@ U pranua mesazh për shkembim çelsash për një verzion të protokolli jo valid
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Biseda u hesht</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Dërgo porosi përmes Signal-it</string>
-  <string name="conversation_activity__type_message_sms_insecure">Dërgo SMS të pasigurt</string>
-  <string name="conversation_activity__type_message_mms_insecure">Dërgo MMS të pasigurtë</string>
   <string name="conversation_activity__from_sim_name">Nga %1$s</string>
   <string name="conversation_activity__send">Dërgo</string>
   <string name="conversation_activity__remove">Hiç</string>
@@ -892,6 +889,7 @@ Signal u ndal derisa pritej SMSi për verifikim.</string>
   <string name="arrays__images">Imazhet</string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Video</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d orë</item>
@@ -933,7 +931,6 @@ Signal u ndal derisa pritej SMSi për verifikim.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Ndalur për:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Lloji i vezullimit lend u vendos!</string>
   <string name="preferences__sound">Zë</string>
-  <string name="preferences__change_notification_sound">Ndrysho zërin e lajmërimit</string>
   <string name="preferences__silent">Heshtur</string>
   <string name="preferences__in_conversation_notifications">Njoftimet gjatë bisedës</string>
   <string name="preferences__play_inthread_notifications">Luaj zërin e njoftimit gjatë shikimit të një bisede aktive</string>

res/values-sr/strings.xml

@@ -244,6 +244,7 @@
   <string name="DeviceListItem_last_active_s">Последња активност %s</string>
   <string name="DeviceListItem_today">Данас</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Непознат фајл</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Оптимизуј за недостајуће Плеј сервисе</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Овај уређај не подржава Плеј сервисе. Тапните да искључите системску оптимизацију потрошње батерије која спречава добављање порука док је Сигнал неактиван.</string>
@@ -611,6 +612,7 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Брзи одговор није доступан ако је Сигнал закључан!</string>
   <string name="QuickResponseService_problem_sending_message">Проблем са слањем поруке!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Отвори директоријум</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Сигнал</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Нова порука</string>
@@ -658,9 +660,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Преписка утишана</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Пошаљи Сигнал поруку</string>
-  <string name="conversation_activity__type_message_sms_insecure">Пошаљи необезбеђени СМС</string>
-  <string name="conversation_activity__type_message_mms_insecure">Пошаљи необезбеђени ММС</string>
   <string name="conversation_activity__from_sim_name">Од %1$s</string>
   <string name="conversation_activity__send">Пошаљи</string>
   <string name="conversation_activity__remove">Уклони</string>
@@ -918,6 +917,7 @@
   <string name="arrays__audio">Звук</string>
   <string name="arrays__video">Видео</string>
   <string name="arrays__documents">Документи</string>
+  <string name="arrays__normal">Нормално</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d сат</item>
@@ -960,7 +960,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Искључено:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Посебни шаблон трептања ЛЕД светла постављен!</string>
   <string name="preferences__sound">Звук</string>
-  <string name="preferences__change_notification_sound">Промени звук обавештења</string>
   <string name="preferences__silent">Без звука</string>
   <string name="preferences__in_conversation_notifications">Обавештења унутар преписки</string>
   <string name="preferences__play_inthread_notifications">Звук обавештења на приказу активне преписке</string>

res/values-sv/strings.xml

@@ -227,6 +227,7 @@
   <string name="DeviceListItem_last_active_s">Senast aktiv %s</string>
   <string name="DeviceListItem_today">Idag</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Okänd fil</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">Optimera för avsaknad av Play-tjänster</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">Denna enhet stödjer inte Play-tjänster. Tryck för att slå av systemets batterioptimeringar som förhindrar Signal från att ta emot meddelanden medan den är inaktiv.</string>
@@ -589,6 +590,7 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Snabbsvar är ej tillgängligt när Signal är låst!</string>
   <string name="QuickResponseService_problem_sending_message">Problem med att skicka meddelandet!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Öppna mapp</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Nytt meddelande</string>
@@ -636,9 +638,6 @@ Tog emot meddelande för nyckelutbyte för ogiltig protokollversion.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Konversation tystad</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Skicka Signalmeddelande</string>
-  <string name="conversation_activity__type_message_sms_insecure">Skicka okrypterat SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Skicka okrypterat MMS</string>
   <string name="conversation_activity__from_sim_name">Från %1$s</string>
   <string name="conversation_activity__send">Skicka</string>
   <string name="conversation_activity__remove">Ta bort</string>
@@ -885,6 +884,7 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="arrays__audio">Ljud</string>
   <string name="arrays__video">Video</string>
   <string name="arrays__documents">Dokument</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d timme</item>
@@ -926,7 +926,6 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Av under:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Specialanpassat LED-blinkningsmönster valt!</string>
   <string name="preferences__sound">Ljud</string>
-  <string name="preferences__change_notification_sound">Ändra aviseringsljud</string>
   <string name="preferences__silent">Tyst</string>
   <string name="preferences__in_conversation_notifications">Inom-konversationsaviseringar</string>
   <string name="preferences__play_inthread_notifications">Spela aviseringsljud när du tittar på en aktiv konversation</string>

res/values-ta/strings.xml

@@ -438,9 +438,6 @@
   <string name="contact_selection_recent_activity__no_recent_calls">சமீபத்திய அழைப்புகள் இல்லை.</string>
   <!--conversation_title_view-->
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">சிக்னல் தகவல் அனுப்புக </string>
-  <string name="conversation_activity__type_message_sms_insecure">பாதுகாப்பில்லாத SMS அனுப்பு </string>
-  <string name="conversation_activity__type_message_mms_insecure">பாதுகாப்பில்லாத MMS அனுப்பு </string>
   <string name="conversation_activity__send">அனுப்பு</string>
   <string name="conversation_activity__remove">நீக்கு</string>
   <string name="conversation_activity__window_description">%1$s உடன் உரையாடல்</string>
@@ -590,6 +587,7 @@
   <string name="arrays__images">புகைப்படங்கள்</string>
   <string name="arrays__audio">ஒலி</string>
   <string name="arrays__video">காணொளி</string>
+  <string name="arrays__normal">சாதாரணமாக</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d மணிநேரம்</item>
@@ -623,7 +621,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">இவைக்கு இயற்றாதே:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">LED மிளிரும் முறையை சுய விருப்பம் போல் அமைக்கப்பட்டது!</string>
   <string name="preferences__sound">ஒலி</string>
-  <string name="preferences__change_notification_sound">அறிவிப்பு ஒலியை மாற்று</string>
   <string name="preferences__silent">அமைதி</string>
   <string name="preferences__repeat_alerts">பலமுறை எச்சரிக்கைகள்</string>
   <string name="preferences__never">ஒருபோதுமில்லை</string>

res/values-tr/strings.xml

@@ -211,6 +211,7 @@
   <string name="DeviceListItem_last_active_s">Son görülme %s</string>
   <string name="DeviceListItem_today">Bugün</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Bilinmeyen dosya</string>
   <!--DozeReminder-->
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Paylaşılan kişi</string>
@@ -220,6 +221,10 @@
   <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Signal\'e hoşgeldiniz!</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal">TextSecure\'un adı artık Signal</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure ve RedPhone artık tek bir uygulama: Signal. Keşfetmek için dokunun.</string>
+  <string name="ExperienceUpgradeActivity_say_hello_to_video_calls">Güvenli görüntülü aramalara merhaba deyin.</string>
+  <string name="ExperienceUpgradeActivity_signal_now_supports_secure_video_calls">Signal şimdi güvenli görüntülü aramayı destekliyor. Normal bir Signal araması gibi başlatın, video düğmesine dokunun ve merhaba diyerek el sallayın.</string>
+  <string name="ExperienceUpgradeActivity_signal_now_supports_secure_video_calling">Signal şimdi güvenli görüntülü aramayı destekliyor.</string>
+  <string name="ExperienceUpgradeActivity_signal_now_supports_secure_video_calling_long">Signal şimdi güvenli görüntülü aramayı destekliyor. Keşfetmek için dokunun.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Dışa Aktar</string>
   <string name="ExportFragment_export_plaintext_to_storage">Metni dışa aktar?</string>
@@ -308,6 +313,7 @@
   <string name="MessageDetailsRecipient_new_safety_number">Yeni güvenlik numarası</string>
   <!--MessageRetrievalService-->
   <string name="MessageRetrievalService_signal">Signal</string>
+  <string name="MessageRetrievalService_background_connection_enabled">Arkaplan bağlantı etkinleştirildi</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_error_storing_mms">MMS depolama hatası!</string>
   <string name="MmsDownloader_error_connecting_to_mms_provider">MMS sağlayıcısına bağlantı hatası</string>
@@ -329,9 +335,12 @@
   <!--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 iletiyi yeniden göndermesini isteyin.</string>
   <string name="MessageRecord_left_group">Gruptan ayrıldınız.</string>
+  <string name="MessageRecord_you_updated_group">Grubu güncellediniz.</string>
+  <string name="MessageRecord_s_updated_group">%s grubu güncelledi.</string>
   <string name="MessageRecord_s_called_you">%s sizi aradı</string>
   <string name="MessageRecord_called_s">%s arandı</string>
   <string name="MessageRecord_missed_call_from">%s tarafından cevapsız çağrı</string>
+  <string name="MessageRecord_s_joined_signal">%s Signal\'e katıldı!</string>
   <string name="MessageRecord_you_set_disappearing_message_time_to_s">Mesaj yok olma zamanını %1$s olarak belirlediniz. </string>
   <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s mesaj yok olma zamanını %2$s olarak belirledi.</string>
   <string name="MessageRecord_your_safety_number_with_s_has_changed">%s ile güvenlik numaranız değişti.</string>
@@ -426,6 +435,9 @@
 Numaranızı ikinci kez kontrol ediniz! Numaranızı bir SMS ile doğrulamak üzereyiz.</string>
   <string name="RegistrationActivity_continue">Devam Et</string>
   <string name="RegistrationActivity_edit">Düzenle</string>
+  <string name="RegistrationActivity_i_understand">Anladım</string>
+  <string name="RegistrationActivity_more_information">Daha fazla bilgi</string>
+  <string name="RegistrationActivity_less_information">Daha az bilgi</string>
   <!--RegistrationProblemsActivity-->
   <string name="RegistrationProblemsActivity_possible_problems">Olası sorunlar</string>
   <!--RegistrationProgressActivity-->
@@ -448,6 +460,7 @@ Numaranızı ikinci kez kontrol ediniz! Numaranızı bir SMS ile doğrulamak üz
   <string name="RegistrationProgressActivity_too_many_requests">Çok fazla istek!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Zaten bir çağrı istediniz. Tekrar isteyebilmek için 20 dakika beklemelisiniz.</string>
   <string name="RegistrationProgressActivity_registration_conflict">Kayıt çakışması</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Bu numara önceden bir Signal sunucusuna kayıtlıdır. Buraya kayır olmadan önce, mevcut kayıt sildirilmelidir.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Kayıt tamamlandı</string>
   <string name="RegistrationService_signal_registration_has_successfully_completed">Signal kaydı başarıyla tamamlandı.</string>
@@ -467,6 +480,7 @@ Geçersiz protokol sürümünde anahtar değişim mesajı alındı.</string>
   <string name="SmsMessageRecord_secure_session_reset_s">%s güvenli oturumu sıfırla.</string>
   <string name="SmsMessageRecord_duplicate_message">Yinelenen ileti.</string>
   <!--ThreadRecord-->
+  <string name="ThreadRecord_group_updated">Grup güncelledi</string>
   <string name="ThreadRecord_left_the_group">Gruptan ayrıldı</string>
   <string name="ThreadRecord_secure_session_reset">Güvenli oturumu sıfırla.</string>
   <string name="ThreadRecord_draft">Taslak:</string>
@@ -474,9 +488,12 @@ Geçersiz protokol sürümünde anahtar değişim mesajı alındı.</string>
   <string name="ThreadRecord_called_you">Sizi aradı</string>
   <string name="ThreadRecord_missed_call">Cevapsız arama</string>
   <string name="ThreadRecord_media_message">Medya mesajı</string>
+  <string name="ThreadRecord_s_joined_signal">%s Signal\'e katıldı!</string>
   <string name="ThreadRecord_disappearing_message_time_updated_to_s">Mesaj yok olma zamanı %s olarak belirlendi</string>
   <string name="ThreadRecord_your_safety_number_with_s_has_changed">%s ile güvenlik numaranız değişti.</string>
   <!--UpdateApkReadyListener-->
+  <string name="UpdateApkReadyListener_Signal_update">Signal güncellemesi</string>
+  <string name="UpdateApkReadyListener_a_new_version_of_signal_is_available_tap_to_update">Signal\'in yeni sürümü mevcut, güncellemek için dokunun</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_your_contact_is_running_an_old_version_of_signal">Kişi Signal\'in eski bir sürümünü kullanıyor. Güvenlik numaranızı onaylamadan önce güncelleme yapmalarını isteyin. </string>
   <string name="VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal">Kişi QR kod biçimi ile uyumlu olmayan Signal\'in daha yeni bir sürümü kullanıyor. Karşılaştırmak için uygulamayı güncelleyin.</string>
@@ -548,6 +565,7 @@ Geçersiz protokol sürümünde anahtar değişim mesajı alındı.</string>
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal kilitlendiğinde hızlı cevap kullanılamaz!</string>
   <string name="QuickResponseService_problem_sending_message">Mesaj gönderilirken hata!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Dizini aç</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Yeni mesaj</string>
@@ -595,9 +613,6 @@ Geçersiz protokol sürümünde anahtar değişim mesajı alındı.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Sohbet sessize alındı</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Signal mesajı gönder</string>
-  <string name="conversation_activity__type_message_sms_insecure">Güvensiz SMS gönder</string>
-  <string name="conversation_activity__type_message_mms_insecure">Güvensiz MMS gönder</string>
   <string name="conversation_activity__from_sim_name">Gönderen %1$s</string>
   <string name="conversation_activity__send">Gönder</string>
   <string name="conversation_activity__remove">Kaldır</string>
@@ -704,6 +719,7 @@ Geçersiz protokol sürümünde anahtar değişim mesajı alındı.</string>
   <!--message_recipients_list_item-->
   <string name="message_recipients_list_item__verify">DOĞRULAMA</string>
   <string name="message_recipients_list_item__resend">YENİDEN GÖNDER</string>
+  <string name="message_recipients_list_item__resending">Yeniden gönderiliyor...</string>
   <!--GroupUtil-->
   <plurals name="GroupUtil_joined_the_group">
     <item quantity="other">%1$s gruba katıldı.</item>
@@ -740,6 +756,7 @@ Signal\'le bağlanmak için telefon numaranızı doğrulayın.</string>
     </string>
   <string name="registration_activity__phone_number">TELEFON NUMARASI</string>
   <string name="registration_activity__register">Kayıt ol</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">Signal mevcut telefon numaranızı ve adres defterinizi kullanarak iletişim kurmayı kolaylaştırır. Zaten sizinle telefon aracılığı ile nasıl iletişim kuracağını bilen arkadaşlarınız ve kişiler, Signal ile sizinle kolayca iletişime geçebilecek.\n\nKayıt işlemi, bazı iletişim bilgilerini sunucuya iletir. Bunlar saklanmaz.</string>
   <string name="registration_activity__powered_by_twilio">twilio tarafından desteklenmektedir</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Muhtemel sorunlar
@@ -838,6 +855,8 @@ başarısız.</string>
   <string name="arrays__images">Resim</string>
   <string name="arrays__audio">Ses</string>
   <string name="arrays__video">Video</string>
+  <string name="arrays__documents">Belgeler</string>
+  <string name="arrays__normal">Normal</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d saat</item>
@@ -878,7 +897,6 @@ başarısız.</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Süresince kapalı:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Özel LED yanıp sönme şekli belirlendi!</string>
   <string name="preferences__sound">Zil Sesi</string>
-  <string name="preferences__change_notification_sound">Bildirim sesini değiştir</string>
   <string name="preferences__silent">Sessiz</string>
   <string name="preferences__in_conversation_notifications">Sohbet içi bildirimler</string>
   <string name="preferences__play_inthread_notifications">Etkin bir sohbet görüntülenirken bildirim sesi çal</string>

res/values-uk/strings.xml

@@ -123,6 +123,7 @@
   <string name="ConversationActivity_transport_signal">Signal</string>
   <string name="ConversationActivity_lets_switch_to_signal">Давай перейдемо у Signal %1$s</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Давай використовувати це для чату: %1$s</string>
+  <string name="ConversationActivity_error_leaving_group">Помилка при виході з групи</string>
   <string name="ConversationActivity_mms_not_supported_title">MMS не підтримується</string>
   <string name="ConversationActivity_mms_not_supported_message">Це повідомлення неможливо надіслати, оскільки ваш оператор не підтримує MMS.</string>
   <string name="ConversationActivity_specify_recipient">Будь ласка, виберіть контакт</string>
@@ -132,6 +133,7 @@
   <string name="ConversationActivity_attachment_exceeds_size_limits">Вкладення перевищує обмеження за розміром для типу повідомлення, яке ви надсилаєте.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Камера недоступна</string>
   <string name="ConversationActivity_unable_to_record_audio">Не вдалося записати аудіо!</string>
+  <string name="ConversationActivity_error_sending_voice_message">Помилка при відправленні голосового повідомлення</string>
   <string name="ConversationActivity_there_is_no_app_available_to_handle_this_link_on_your_device">Немає програми на вашому пристрої, що може відкрити це посилання.</string>
   <!--ConversationAdapter-->
   <!--ConversationFragment-->
@@ -205,6 +207,7 @@
     <item quantity="other">%d розмов переміщено до вхідних</item>
   </plurals>
   <!--ConversationListItem-->
+  <string name="ConversationListItem_key_exchange_message">Повідомлення обміну ключам</string>
   <!--ConversationListItemAction-->
   <string name="ConversationListItemAction_archived_conversations_d">Архівовані розмови (%d)</string>
   <!--CustomDefaultPreference-->
@@ -215,6 +218,7 @@
   <string name="DateUtils_just_now">Щойно</string>
   <string name="DateUtils_minutes_ago">%d хв</string>
   <string name="DateUtils_today">Сьогодні</string>
+  <string name="DateUtils_yesterday">Вчора</string>
   <!--DeviceListActivity-->
   <string name="DeviceListActivity_unlink_s">Від\'єднати \'%s\'?</string>
   <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Після від\'єднання цього пристрою він більше не зможе відправляти та одержувати повідомлення.</string>
@@ -228,6 +232,7 @@
   <string name="DeviceListItem_last_active_s">Останній активний %s</string>
   <string name="DeviceListItem_today">Сьогодні</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">Невідомий файл</string>
   <!--DozeReminder-->
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Поділитися із</string>
@@ -237,6 +242,9 @@
   <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Вітаємо в Signal!</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal">TextSecure тепер Signal.</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure і RedPhone тепер єдина програма: Signal. Торкніться, щоб дізнатися більше.</string>
+  <string name="ExperienceUpgradeActivity_say_hello_to_video_calls">Привійтайте безпечні відеодзвінки.</string>
+  <string name="ExperienceUpgradeActivity_signal_now_supports_secure_video_calling">Signal тепер підтримує безпечні відеодзвінки.</string>
+  <string name="ExperienceUpgradeActivity_signal_now_supports_secure_video_calling_long">Signal тепер підтримує безпечні відеодзвінок. Натисніть, щоб дізнатись більше.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Експортувати</string>
   <string name="ExportFragment_export_plaintext_to_storage">Експортувати незашифрованим текстом до сховища?</string>
@@ -256,6 +264,7 @@
   <string name="GiphyFragmentPagerAdapter_stickers">Наліпки</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Нова група</string>
+  <string name="GroupCreateActivity_actionbar_edit_title">Редагувати групу</string>
   <string name="GroupCreateActivity_group_name_hint">Назва групи</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Нова MMS група</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Ви обрали контакт, який не підтримує групи Signal, тому це буде MMS група.</string>
@@ -264,6 +273,7 @@
   <string name="GroupCreateActivity_contacts_no_members">Для вашої групи потрібна щонайменше одна особа!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Один із учасників групи має номер, що не може бути прочитаний належним чином. Будь ласка, виправте або вилучіть той контакт і спробуйте ще раз.</string>
   <string name="GroupCreateActivity_avatar_content_description">Зображення групи</string>
+  <string name="GroupCreateActivity_menu_apply_button">Застосувати</string>
   <string name="GroupCreateActivity_creating_group">Створення %1$s…</string>
   <string name="GroupCreateActivity_updating_group">Оновлення %1$s...</string>
   <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Не вдалося додати %1$s, тому що вони не є користувачами Signal.</string>
@@ -334,8 +344,10 @@
   <string name="MessageDetailsRecipient_new_safety_number">Новий номер безпеки</string>
   <!--MessageRetrievalService-->
   <string name="MessageRetrievalService_signal">Signal</string>
+  <string name="MessageRetrievalService_background_connection_enabled">Фонове підключення активоване</string>
   <!--MmsDownloader-->
   <string name="MmsDownloader_error_storing_mms">Помилка при збереженні MMS!</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">Помилка підключення до провайдера MMS</string>
   <!--- NotificationBarManager-->
   <string name="NotificationBarManager_signal_call_in_progress">Відбувається виклик Signal</string>
   <string name="NotificationBarManager_missed_call_from_s">Пропущено виклик від %s</string>
@@ -348,12 +360,17 @@
   <string name="NotificationBarManager__cancel_call">Скасувати виклик</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Мультимедійне повідомлення</string>
+  <string name="NotificationMmsMessageRecord_downloading_mms_message">Завантаження MMS...</string>
+  <string name="NotificationMmsMessageRecord_error_downloading_mms_message">Виникла помилка при завантаженні MMS, натисніть щоб повторити</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>
+  <string name="MessageRecord_you_updated_group">Ви оновили групу</string>
+  <string name="MessageRecord_s_updated_group">%s оновив групу</string>
   <string name="MessageRecord_s_called_you">%s вам телефонував/-ла</string>
   <string name="MessageRecord_called_s">Телефонували %s</string>
   <string name="MessageRecord_missed_call_from">Пропущено виклик від %s</string>
+  <string name="MessageRecord_s_joined_signal">%s приєднався до Signal!</string>
   <string name="MessageRecord_you_set_disappearing_message_time_to_s">Ви встановили час зникнення повідомлень на %1$s.</string>
   <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s встановлює час зникнення повідомлень на %2$s.</string>
   <string name="MessageRecord_your_safety_number_with_s_has_changed">Ваш номер безпеки із %s змінився.</string>
@@ -377,6 +394,7 @@
   <string name="DeviceProvisioningActivity_content_progress_no_device">Пристрій не знайдено.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Помилка мережі.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Хибний QR-код.</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Вибачте, Ви вже прив\'язали забагато пристроїв, спробуйте видалити декілька</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Вибачте, це хибний QR код для прив\'язки пристрою.</string>
   <string name="DeviceProvisioningActivity_link_a_signal_device">Приєднати пристрій Signal?</string>
   <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Здається, ви намагаєтеся приєднати пристрій Signal, використовуючи сканер від 3-ї особи. Для вашого захисту, відскануйте код знову, використовуючи Signal.</string>
@@ -408,6 +426,7 @@
   <string name="RecipientPreferenceActivity_enabled">Увімкнено </string>
   <string name="RecipientPreferenceActivity_disabled">Вимкнено</string>
   <!--RecipientProvider-->
+  <string name="RecipientProvider_unnamed_group">Неназвана група</string>
   <!--RedPhone-->
   <string name="RedPhone_answering">Відповідаємо</string>
   <string name="RedPhone_ending_call">Завершення дзвінка</string>
@@ -447,12 +466,18 @@
  </string>
   <string name="RegistrationActivity_continue">Продовжити</string>
   <string name="RegistrationActivity_edit">Редагувати</string>
+  <string name="RegistrationActivity_i_understand">Я розумію</string>
+  <string name="RegistrationActivity_play_services_error">Помилка Play Services</string>
+  <string name="RegistrationActivity_google_play_services_is_updating_or_unavailable">Google Play Services оновлюються або тимчасово недоступні. Будь-ласка, спробуйте знов.</string>
+  <string name="RegistrationActivity_more_information">Більше інформації</string>
+  <string name="RegistrationActivity_less_information">Менше інформації</string>
   <!--RegistrationProblemsActivity-->
   <string name="RegistrationProblemsActivity_possible_problems">Можливі проблеми</string>
   <!--RegistrationProgressActivity-->
   <string name="RegistrationProgressActivity_verifying_number">Перевірка номера</string>
   <string name="RegistrationProgressActivity_edit_s">Редагувати %s</string>
   <string name="RegistrationProgressActivity_registration_complete">Реєстрацію завершено!</string>
+  <string name="RegistrationProgressActivity_you_must_enter_the_code_you_received_first">Спочатку Ви маєте ввести отриманий код</string>
   <string name="RegistrationProgressActivity_connecting">Підключення</string>
   <string name="RegistrationProgressActivity_connecting_for_verification">Підключення для підтвердження...</string>
   <string name="RegistrationProgressActivity_network_error">Помилка мережі!</string>
@@ -487,15 +512,20 @@
   <string name="SmsMessageRecord_secure_session_reset_s">%s скидає безпечний сеанс.</string>
   <string name="SmsMessageRecord_duplicate_message">Дублікат повідомлення.</string>
   <!--ThreadRecord-->
+  <string name="ThreadRecord_group_updated">Групу оновлено</string>
+  <string name="ThreadRecord_left_the_group">Покинути групу</string>
   <string name="ThreadRecord_secure_session_reset">Скидання безпечного сеансу.</string>
   <string name="ThreadRecord_draft">Чернетка:</string>
   <string name="ThreadRecord_called">Ви телефонували</string>
   <string name="ThreadRecord_called_you">Вам телефонували</string>
   <string name="ThreadRecord_missed_call">Пропущений виклик</string>
   <string name="ThreadRecord_media_message">Медіа повідомлення</string>
+  <string name="ThreadRecord_s_joined_signal">%s приєднався до Signal!</string>
   <string name="ThreadRecord_disappearing_message_time_updated_to_s">Час зникнення повідомлень встановлено на %s</string>
   <string name="ThreadRecord_your_safety_number_with_s_has_changed">Ваш номер безпеки із %s змінився.</string>
   <!--UpdateApkReadyListener-->
+  <string name="UpdateApkReadyListener_Signal_update">Оновлення Signal</string>
+  <string name="UpdateApkReadyListener_a_new_version_of_signal_is_available_tap_to_update">Нова версія Signal доступна, натисніть для оновлення</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_your_contact_is_running_an_old_version_of_signal">Ваш контакт працює на давнішій версії Signal. Будь ласка, попросіть його/її оновитися перед перевіркою вашого номера безпеки.</string>
   <string name="VerifyIdentityActivity_your_contact_is_running_a_newer_version_of_Signal">Ваш контакт працює на новішій версії Signal із несумісним форматом QR-коду. Будь ласка, оновіться, щоб порівняти.</string>
@@ -508,7 +538,9 @@
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Почати, незважаючи на існуючий запит?</string>
   <string name="KeyExchangeInitiator_send">Надіслати</string>
   <!--MessageDisplayHelper-->
+  <string name="MessageDisplayHelper_bad_encrypted_message">Погано зашифроване повідомлення</string>
   <string name="MessageDisplayHelper_decrypting_please_wait">Розшифровуємо, зачекайте, будь ласка...</string>
+  <string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Повідомлення зашифроване для неіснуючої сесії</string>
   <!--EncryptingSmsDatabase-->
   <string name="EncryptingSmsDatabase_error_decrypting_message">Помилка дешифрування повідомлення.</string>
   <!--ThreadDatabase-->
@@ -522,6 +554,8 @@
   <string name="MmsDatabase_error_decrypting_message">Помилка дешифрування повідомлення.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Розшифровуємо MMS, зачекайте, будь ласка...</string>
+  <string name="MmsMessageRecord_bad_encrypted_mms_message">Погано зашифроване MMS повідомлення</string>
+  <string name="MmsMessageRecord_mms_message_encrypted_for_non_existing_session">MMS повідомлення зашифроване для неіснуючої сесії</string>
   <!--MuteDialog-->
   <string name="MuteDialog_mute_notifications">Вимкнути звук сповіщень</string>
   <!--ApplicationMigrationService-->
@@ -538,6 +572,7 @@
   <string name="MediaPreviewActivity_you">Ви</string>
   <string name="MediaPreviewActivity_cant_display">Не вдалося показати це зображення для попереднього перегляду</string>
   <string name="MediaPreviewActivity_unssuported_media_type">Непідтримуваний тип медіа</string>
+  <string name="MediaPreviewActivity_draft">Чернетка</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d нових повідомлень у %2$d розмовах</string>
   <string name="MessageNotifier_most_recent_from_s">Останнє від: %1$s</string>
@@ -561,10 +596,12 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Швидка відповідь неможлива, коли Signal заблоковано!</string>
   <string name="QuickResponseService_problem_sending_message">Проблема під час надсилання повідомлення!</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">Відкрити теку</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">Нове повідомлення</string>
   <!--VideoPlayer-->
+  <string name="VideoPlayer_error_playing_video">Помилка відтворення відео</string>
   <!--WebRtcCallScreen-->
   <string name="WebRtcCallScreen_you_may_wish_to_verify_this_contact">Можливо, ви хочете перевірити ваш номер безпеки із цим контактом.</string>
   <string name="WebRtcCallScreen_new_safety_number_title">Новий номер безпеки</string>
@@ -599,14 +636,12 @@
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">Обрати для</string>
   <!--blocked_contacts_fragment-->
+  <string name="blocked_contacts_fragment__no_blocked_contacts">Немає заблокованих контактів</string>
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Немає недавніх викликів.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Звук для розмови вимкнено</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Надіслати Signal повідомлення</string>
-  <string name="conversation_activity__type_message_sms_insecure">Надіслати незахищене SMS</string>
-  <string name="conversation_activity__type_message_mms_insecure">Надіслати незахищене MMS</string>
   <string name="conversation_activity__from_sim_name">Від %1$s</string>
   <string name="conversation_activity__send">Надіслати</string>
   <string name="conversation_activity__remove">Вилучити</string>
@@ -641,6 +676,7 @@
   <string name="conversation_fragment_cab__batch_selection_mode">Режим групового виділення</string>
   <string name="conversation_fragment_cab__batch_selection_amount">%s обрано</string>
   <!--conversation_fragment-->
+  <string name="conversation_fragment__scroll_to_the_bottom_content_description">Прокрутить до самого низу</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Завантаження країн...</string>
   <string name="country_selection_fragment__search">Пошук</string>
@@ -649,6 +685,7 @@
   <!--device_link_fragment-->
   <string name="device_link_fragment__link_device">Прив\'язати пристрій</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Немає прив\'язаних пристроїв</string>
   <string name="device_list_fragment__link_new_device">Прив\'язати новий пристрій</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">продовжити</string>
@@ -720,6 +757,7 @@
   <!--message_recipients_list_item-->
   <string name="message_recipients_list_item__verify">ПІДТВЕРДИТИ</string>
   <string name="message_recipients_list_item__resend">НАДІСЛАТИ ЗНОВУ</string>
+  <string name="message_recipients_list_item__resending">Повторне пересилання...</string>
   <!--GroupUtil-->
   <plurals name="GroupUtil_joined_the_group">
     <item quantity="one">%1$s приєднується до групи.</item>
@@ -849,6 +887,8 @@ Signal не дочекався перевірочного SMS.
   <string name="AndroidManifest__verify_safety_number">Перевірити номер безпеки</string>
   <string name="AndroidManifest__log_submit">Відіслати журнал відлагодження</string>
   <string name="AndroidManifest__media_preview">Попередній перегляд медіа</string>
+  <string name="AndroidManifest__all_media">Всі медіа-файли
+Всі зображення</string>
   <string name="AndroidManifest__message_details">Деталі повідомлення</string>
   <string name="AndroidManifest__linked_devices">Прив\'язані пристрої</string>
   <string name="AndroidManifest__invite_friends">Запросити друзів</string>
@@ -871,6 +911,8 @@ Signal не дочекався перевірочного SMS.
   <string name="arrays__images">Зображення</string>
   <string name="arrays__audio">Аудіо</string>
   <string name="arrays__video">Відео</string>
+  <string name="arrays__documents">Документи</string>
+  <string name="arrays__normal">Звичайний</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="one">%d година</item>
@@ -913,7 +955,6 @@ Signal не дочекався перевірочного SMS.
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Вимкнено для:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Власний шаблон мерехтіння LED задано!</string>
   <string name="preferences__sound">Звук</string>
-  <string name="preferences__change_notification_sound">Змінити звук сповіщення</string>
   <string name="preferences__silent">Беззвучно</string>
   <string name="preferences__in_conversation_notifications">Сповіщення при розмові</string>
   <string name="preferences__play_inthread_notifications">Відтворювати звуковий сигнал у активній розмові</string>
@@ -982,6 +1023,8 @@ Signal не дочекався перевірочного SMS.
   <string name="preferences_chats__message_trimming">Обрізка повідомлень</string>
   <string name="preferences_advanced__use_system_emoji">Використовувати системні emoji</string>
   <string name="preferences_advanced__disable_signal_built_in_emoji_support">Вимкнути вбудовану в Signal підтримку emoji</string>
+  <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Ретранслювати всі дзвінки через сервер Signal щоб уникнути розкриття вашого IP-адреси контакту. Включення знизить якість дзвінка.</string>
+  <string name="preferences_advanced__always_relay_calls">Завжди ретранслювати дзвінки</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -1036,8 +1079,11 @@ Signal не дочекався перевірочного SMS.
   <string name="conversation_unmuted__mute_notifications">Вимкнути звук сповіщень</string>
   <!--conversation-->
   <string name="conversation__menu_add_attachment">Додати вкладення</string>
+  <string name="conversation__menu_edit_group">Редагувати групу</string>
   <string name="conversation__menu_leave_group">Вийти з групи</string>
   <string name="conversation__menu_delete_thread">Видалити розмову</string>
+  <string name="conversation__menu_view_all_media">Всі медіа-файли
+Всі зображення</string>
   <string name="conversation__menu_conversation_settings">Налаштування розмови</string>
   <!--conversation_popup-->
   <string name="conversation_popup__menu_expand_popup">Розгорнути спливаюче вікно</string>
@@ -1093,6 +1139,8 @@ Signal не дочекався перевірочного SMS.
   <!--media_preview-->
   <string name="media_preview__save_title">Зберегти</string>
   <string name="media_preview__forward_title">Переслати</string>
+  <string name="media_preview__all_media_title">Всі медіа-файли
+Всі зображення</string>
   <!--media_overview-->
   <string name="media_overview__save_all">Зберегти все</string>
   <!--media_preview_activity-->

res/values-vi/strings.xml

@@ -523,9 +523,6 @@ Nhận thông tin trao đổi chìa khóa về phiên bản giao thức không h
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Chuyện trò tạm im</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Gửi thông điệp Signal</string>
-  <string name="conversation_activity__type_message_sms_insecure">Gửi SMS không mã hóa</string>
-  <string name="conversation_activity__type_message_mms_insecure">Gửi MMS không mã hóa</string>
   <string name="conversation_activity__from_sim_name">Từ %1$s</string>
   <string name="conversation_activity__send">Gửi</string>
   <string name="conversation_activity__remove">Bỏ</string>
@@ -736,6 +733,7 @@ SMS thất bại.
   <string name="arrays__images">Hình ảnh</string>
   <string name="arrays__audio">Nhạc</string>
   <string name="arrays__video">Đoạn phim</string>
+  <string name="arrays__normal">Bình thường</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d tiếng</item>
@@ -776,7 +774,6 @@ SMS thất bại.
   <string name="preferences__pref_led_blink_custom_pattern_off_for">Tắt trong vòng:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Mô hình chớp nháy LED tùy chỉnh thiết lập xong!</string>
   <string name="preferences__sound">Âm thanh</string>
-  <string name="preferences__change_notification_sound">Đổi âm thanh thông báo</string>
   <string name="preferences__silent">Yên lặng</string>
   <string name="preferences__in_conversation_notifications">Thông báo ngay trong hội thoại</string>
   <string name="preferences__play_inthread_notifications">Phát âm thanh thông báo khi xem một chuyện trò đang diễn ra</string>

res/values-zh-rCN/strings.xml

@@ -616,9 +616,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">会话已静音</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">发送暗号信息</string>
-  <string name="conversation_activity__type_message_sms_insecure">发送未加密的短信</string>
-  <string name="conversation_activity__type_message_mms_insecure">发送未加密的彩信</string>
   <string name="conversation_activity__from_sim_name">来自 %1$s</string>
   <string name="conversation_activity__send">发送</string>
   <string name="conversation_activity__remove">删除</string>
@@ -865,6 +862,7 @@
   <string name="arrays__images">图片</string>
   <string name="arrays__audio">音频</string>
   <string name="arrays__video">视频</string>
+  <string name="arrays__normal">正常</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d 小时</item>
@@ -905,7 +903,6 @@
   <string name="preferences__pref_led_blink_custom_pattern_off_for">此情况下关闭：</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">自定义LED闪烁模式已设定！</string>
   <string name="preferences__sound">声音</string>
-  <string name="preferences__change_notification_sound">改变提示音</string>
   <string name="preferences__silent">静音</string>
   <string name="preferences__in_conversation_notifications">会话内通知</string>
   <string name="preferences__play_inthread_notifications">在查看活动的会话时播放提示音</string>

res/values-zh-rTW/strings.xml

@@ -211,6 +211,7 @@
   <string name="DeviceListItem_last_active_s">最後活躍 %s</string>
   <string name="DeviceListItem_today">今天</string>
   <!--DocumentView-->
+  <string name="DocumentView_unknown_file">未知的檔案</string>
   <!--DozeReminder-->
   <string name="DozeReminder_optimize_for_missing_play_services">為缺少的 Play 服務優化</string>
   <string name="DozeReminder_this_device_does_not_support_play_services_tap_to_disable_system_battery">這個裝置不支援 Play 服務。輕觸關閉，因為系統電池效能最佳化會防止 Signal 在閒置時取得訊息。</string>
@@ -348,6 +349,7 @@
   <string name="MessageRecord_s_called_you">%s 呼叫您</string>
   <string name="MessageRecord_called_s">已呼叫 %s</string>
   <string name="MessageRecord_missed_call_from">來自 %s 的未接來電</string>
+  <string name="MessageRecord_s_joined_signal">%s 已加入 Signal!</string>
   <string name="MessageRecord_you_set_disappearing_message_time_to_s">您將訊息銷毀時間設置爲 %1$s。</string>
   <string name="MessageRecord_s_set_disappearing_message_time_to_s">%1$s 將訊息銷毀時間設置爲 %2$s。</string>
   <string name="MessageRecord_your_safety_number_with_s_has_changed">您與 %s 的安全碼已改變。</string>
@@ -498,6 +500,7 @@
   <string name="ThreadRecord_called_you">呼叫您</string>
   <string name="ThreadRecord_missed_call">未接來電</string>
   <string name="ThreadRecord_media_message">媒體訊息</string>
+  <string name="ThreadRecord_s_joined_signal">%s 已加入 Signal!</string>
   <string name="ThreadRecord_disappearing_message_time_updated_to_s">訊息銷毀時間設置爲 %s</string>
   <string name="ThreadRecord_your_safety_number_with_s_has_changed">您與 %s 的安全碼已改變。</string>
   <!--UpdateApkReadyListener-->
@@ -575,6 +578,7 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">當 Signal 鎖定時無法使用快速回覆！</string>
   <string name="QuickResponseService_problem_sending_message">傳送訊息出現問題！</string>
   <!--SaveAttachmentTask-->
+  <string name="SaveAttachmentTask_open_directory">開啟目錄</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
   <string name="SingleRecipientNotificationBuilder_new_message">新訊息</string>
@@ -622,9 +626,6 @@
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">對話已靜音</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">傳送 Signal 加密訊息</string>
-  <string name="conversation_activity__type_message_sms_insecure">傳送未加密的手機簡訊</string>
-  <string name="conversation_activity__type_message_mms_insecure">傳送未加密的多媒體訊息</string>
   <string name="conversation_activity__from_sim_name">來自 %1$s</string>
   <string name="conversation_activity__send">送出</string>
   <string name="conversation_activity__remove">移除</string>
@@ -872,6 +873,7 @@ Signal 在等待簡訊驗證時超時。</string>
   <string name="arrays__audio">音訊</string>
   <string name="arrays__video">影片</string>
   <string name="arrays__documents">文件</string>
+  <string name="arrays__normal">正常</string>
   <!--plurals.xml-->
   <plurals name="hours_ago">
     <item quantity="other">%d 小時</item>
@@ -912,7 +914,6 @@ Signal 在等待簡訊驗證時超時。</string>
   <string name="preferences__pref_led_blink_custom_pattern_off_for">關閉，當:</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">自訂 LED 閃爍模式設定完成！</string>
   <string name="preferences__sound">提示音效</string>
-  <string name="preferences__change_notification_sound">變更通知音效</string>
   <string name="preferences__silent">靜音</string>
   <string name="preferences__in_conversation_notifications">對話中的提示音效</string>
   <string name="preferences__play_inthread_notifications">檢視對話時播放提示音</string>

res/values/arrays.xml

@@ -277,4 +277,18 @@
         <item>#ff00ff</item>
     </array>
 
+    <string-array name="pref_message_font_size_entries">
+        <item>@string/arrays__small</item>
+        <item>@string/arrays__normal</item>
+        <item>@string/arrays__large</item>
+        <item>@string/arrays__extra_large</item>
+    </string-array>
+
+    <string-array name="pref_message_font_size_values">
+        <item>13</item>
+        <item>16</item>
+        <item>20</item>
+        <item>30</item>
+    </string-array>
+
 </resources>

res/values/strings.xml

@@ -745,9 +745,9 @@
     <string name="conversation_title_view__conversation_muted">Conversation muted</string>
 
     <!-- conversation_activity -->
-    <string name="conversation_activity__type_message_push">Send Signal message</string>
-    <string name="conversation_activity__type_message_sms_insecure">Send unsecured SMS</string>
-    <string name="conversation_activity__type_message_mms_insecure">Send unsecured MMS</string>
+    <string name="conversation_activity__type_message_push">Signal message</string>
+    <string name="conversation_activity__type_message_sms_insecure">Unsecured SMS</string>
+    <string name="conversation_activity__type_message_mms_insecure">Unsecured MMS</string>
     <string name="conversation_activity__from_sim_name">From %1$s</string>
     <string name="conversation_activity__send">Send</string>
     <string name="conversation_activity__remove">Remove</string>
@@ -1073,6 +1073,11 @@
     <string name="arrays__video">Video</string>
     <string name="arrays__documents">Documents</string>
 
+    <string name="arrays__small">Small</string>
+    <string name="arrays__normal">Normal</string>
+    <string name="arrays__large">Large</string>
+    <string name="arrays__extra_large">Extra large</string>
+
     <!-- plurals.xml -->
     <plurals name="hours_ago">
         <item quantity="one">%d hour</item>
@@ -1115,7 +1120,6 @@
     <string name="preferences__pref_led_blink_custom_pattern_off_for">Off for:</string>
     <string name="preferences__pref_led_blink_custom_pattern_set">Custom LED blink pattern set!</string>
     <string name="preferences__sound">Sound</string>
-    <string name="preferences__change_notification_sound">Change notification sound</string>
     <string name="preferences__silent">Silent</string>
     <string name="preferences__in_conversation_notifications">In-conversation notifications</string>
     <string name="preferences__play_inthread_notifications">Play notification sound when viewing an active conversation</string>
@@ -1188,8 +1192,14 @@
     <string name="preferences_advanced__enable_support_for_next_generation_video_and_voice_calls">Support for next-generation video and voice calls when enabled by both parties. This feature is in beta.</string>
     <string name="preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address">Relay all calls through the Signal server to avoid revealing your IP address to your contact. Enabling will reduce call quality.</string>
     <string name="preferences_advanced__always_relay_calls">Always relay calls</string>
-
-
+    <string name="preferences_app_protection__app_access">App access</string>
+    <string name="preferences_app_protection__communication">Communication</string>
+    <string name="preferences_chats__chats">Chats</string>
+    <string name="preferences_notifications__message_notifications">Message notifications</string>
+    <string name="preferences_notifications__events">Events</string>
+    <string name="preferences_chats__show_invitation_prompts">Show invitation prompts</string>
+    <string name="preferences_chats__display_invitation_prompts_for_contacts_without_signal">Display invitation prompts for contacts without Signal</string>
+    <string name="preferences_chats__message_text_size">Message font size</string>
 
     <!-- **************************************** -->
     <!-- menus -->
@@ -1353,6 +1363,7 @@
     <!-- transport_selection_list_item -->
     <string name="transport_selection_list_item__transport_icon">Transport icon</string>
 
+
     <!-- EOF -->
 
 </resources>

res/xml/preferences_advanced.xml

@@ -7,24 +7,6 @@
                         android:title="@string/preferences__signal_messages_and_calls"
                         android:summary="@string/preferences__free_private_messages_and_calls"/>
 
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                        android:defaultValue="false"
-                        android:key="pref_enter_sends"
-                        android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
-                        android:title="@string/preferences__pref_enter_sends_title"/>
-
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                        android:defaultValue="false"
-                        android:key="pref_system_emoji"
-                        android:title="@string/preferences_advanced__use_system_emoji"
-                        android:summary="@string/preferences_advanced__disable_signal_built_in_emoji_support" />
-
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-            android:defaultValue="false"
-            android:key="pref_turn_only"
-            android:title="@string/preferences_advanced__always_relay_calls"
-            android:summary="@string/preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address"/>
-
     <Preference android:key="pref_choose_identity"
                 android:title="@string/preferences__choose_identity"
                 android:summary="@string/preferences__choose_your_contact_entry_from_the_contacts_list"/>

res/xml/preferences_app_protection.xml

@@ -1,39 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                        android:key="pref_enable_passphrase_temporary"
-                        android:defaultValue="true"
-                        android:title="@string/preferences__enable_passphrase"
-                        android:summary="@string/preferences__lock_signal_and_message_notifications_with_a_passphrase"/>
+    <PreferenceCategory android:title="@string/preferences_app_protection__app_access">
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+                            android:key="pref_enable_passphrase_temporary"
+                            android:defaultValue="true"
+                            android:title="@string/preferences__enable_passphrase"
+                            android:summary="@string/preferences__lock_signal_and_message_notifications_with_a_passphrase"/>
 
-    <Preference android:key="pref_change_passphrase"
-                android:title="@string/preferences__change_passphrase"
-                android:summary="@string/preferences__change_your_passphrase"
-                android:dependency="pref_enable_passphrase_temporary"/>
+        <Preference android:key="pref_change_passphrase"
+                    android:title="@string/preferences__change_passphrase"
+                    android:summary="@string/preferences__change_your_passphrase"
+                    android:dependency="pref_enable_passphrase_temporary"/>
 
-    <CheckBoxPreference android:defaultValue="false"
-                        android:key="pref_timeout_passphrase"
-                        android:title="@string/preferences__inactivity_timeout_passphrase"
-                        android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
-                        android:dependency="pref_enable_passphrase_temporary"/>
+        <CheckBoxPreference android:defaultValue="false"
+                            android:key="pref_timeout_passphrase"
+                            android:title="@string/preferences__inactivity_timeout_passphrase"
+                            android:summary="@string/preferences__auto_lock_signal_after_a_specified_time_interval_of_inactivity"
+                            android:dependency="pref_enable_passphrase_temporary"/>
 
-    <Preference android:title="@string/preferences__inactivity_timeout_interval"
-                android:key="pref_timeout_interval"
-                android:dependency="pref_timeout_passphrase"/>
+        <Preference android:title="@string/preferences__inactivity_timeout_interval"
+                    android:key="pref_timeout_interval"
+                    android:dependency="pref_timeout_passphrase"/>
 
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                        android:defaultValue="true"
-                        android:key="pref_screen_security"
-                        android:title="@string/preferences__screen_security"
-                        android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+                            android:defaultValue="true"
+                            android:key="pref_screen_security"
+                            android:title="@string/preferences__screen_security"
+                            android:summary="@string/preferences__disable_screen_security_to_allow_screen_shots" />
+    </PreferenceCategory>
+
+    <PreferenceCategory android:layout="@layout/preference_divider"/>
+
+    <PreferenceCategory android:title="@string/preferences_app_protection__communication">
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+                android:defaultValue="true"
+                android:key="pref_blocking_identity_changes"
+                android:title="@string/preferences_app_protection__safety_numbers_approval"
+                android:summary="@string/preferences_app_protecting__require_approval_of_new_safety_numbers_when_they_change"/>
+
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+                android:defaultValue="false"
+                android:key="pref_turn_only"
+                android:title="@string/preferences_advanced__always_relay_calls"
+                android:summary="@string/preferences_advanced__relay_all_calls_through_the_signal_server_to_avoid_revealing_your_ip_address"/>
+
+        <Preference android:key="preference_category_blocked"
+                    android:title="@string/preferences_app_protection__blocked_contacts" />
+    </PreferenceCategory>
 
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-            android:defaultValue="true"
-            android:key="pref_blocking_identity_changes"
-            android:title="@string/preferences_app_protection__safety_numbers_approval"
-            android:summary="@string/preferences_app_protecting__require_approval_of_new_safety_numbers_when_they_change"/>
-    
-    <Preference android:key="preference_category_blocked"
-                android:title="@string/preferences_app_protection__blocked_contacts" />
 </PreferenceScreen>

res/xml/preferences_chats.xml

@@ -27,6 +27,37 @@
                 android:entryValues="@array/pref_media_download_entries" />
     </PreferenceCategory>
 
+    <PreferenceCategory android:layout="@layout/preference_divider"/>
+
+    <PreferenceCategory android:title="@string/preferences_chats__chats">
+        <ListPreference android:key="pref_message_body_text_size"
+                        android:title="@string/preferences_chats__message_text_size"
+                        android:entries="@array/pref_message_font_size_entries"
+                        android:entryValues="@array/pref_message_font_size_values"
+                        android:defaultValue="16">
+        </ListPreference>
+
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+                android:defaultValue="true"
+                android:key="pref_show_invite_reminder"
+                android:title="@string/preferences_chats__show_invitation_prompts"
+                android:summary="@string/preferences_chats__display_invitation_prompts_for_contacts_without_signal" />
+
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+                android:defaultValue="false"
+                android:key="pref_system_emoji"
+                android:title="@string/preferences_advanced__use_system_emoji"
+                android:summary="@string/preferences_advanced__disable_signal_built_in_emoji_support" />
+
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+                android:defaultValue="false"
+                android:key="pref_enter_sends"
+                android:summary="@string/preferences__pressing_the_enter_key_will_send_text_messages"
+                android:title="@string/preferences__pref_enter_sends_title"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory android:layout="@layout/preference_divider"/>
+
     <PreferenceCategory android:key="message_trimming" android:title="@string/preferences_chats__message_trimming">
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="false"

res/xml/preferences_notifications.xml

@@ -1,66 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-                        android:key="pref_key_enable_notifications"
-                        android:title="@string/preferences__notifications"
-                        android:summary="@string/preferences__enable_message_notifications"
-                        android:defaultValue="true" />
 
-    <RingtonePreference android:dependency="pref_key_enable_notifications"
-                        android:key="pref_key_ringtone"
-                        android:title="@string/preferences__sound"
-                        android:summary="@string/preferences__change_notification_sound"
-                        android:ringtoneType="notification"
-                        android:defaultValue="content://settings/system/notification_sound" />
+    <PreferenceCategory android:title="@string/preferences_notifications__message_notifications">
 
-    <CheckBoxPreference android:dependency="pref_key_enable_notifications"
-                        android:key="pref_key_vibrate"
-                        android:defaultValue="true"
-                        android:title="@string/preferences__vibrate"
-                        android:summary="@string/preferences__also_vibrate_when_notified" />
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+                            android:key="pref_key_enable_notifications"
+                            android:title="@string/preferences__notifications"
+                            android:summary="@string/preferences__enable_message_notifications"
+                            android:defaultValue="true" />
 
-    <ListPreference
-        android:key="pref_led_color"
-        android:defaultValue="blue"
-        android:title="@string/preferences__led_color"
-        android:dependency="pref_key_enable_notifications"
-        android:entries="@array/pref_led_color_entries"
-        android:entryValues="@array/pref_led_color_values" />
+        <RingtonePreference android:dependency="pref_key_enable_notifications"
+                            android:key="pref_key_ringtone"
+                            android:title="@string/preferences__sound"
+                            android:ringtoneType="notification"
+                            android:defaultValue="content://settings/system/notification_sound" />
 
-    <org.thoughtcrime.securesms.preferences.LedBlinkPatternListPreference
-        android:key="pref_led_blink"
-        android:defaultValue="500,2000"
-        android:title="@string/preferences__pref_led_blink_title"
-        android:dependency="pref_key_enable_notifications"
-        android:entries="@array/pref_led_blink_pattern_entries"
-        android:entryValues="@array/pref_led_blink_pattern_values" />
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+                            android:dependency="pref_key_enable_notifications"
+                            android:key="pref_key_vibrate"
+                            android:defaultValue="true"
+                            android:title="@string/preferences__vibrate"
+                            android:summary="@string/preferences__also_vibrate_when_notified" />
 
-    <CheckBoxPreference android:key="pref_key_inthread_notifications"
-                        android:title="@string/preferences__in_conversation_notifications"
-                        android:summary="@string/preferences__play_inthread_notifications"
-                        android:dependency="pref_key_enable_notifications"
-                        android:defaultValue="true" />
-
-    <ListPreference
-            android:key="pref_repeat_alerts"
-            android:defaultValue="0"
-            android:title="@string/preferences__repeat_alerts"
+        <org.thoughtcrime.securesms.preferences.LEDColorListPreference
+            android:key="pref_led_color"
+            android:defaultValue="blue"
+            android:title="@string/preferences__led_color"
             android:dependency="pref_key_enable_notifications"
-            android:entries="@array/pref_repeat_alerts_entries"
-            android:entryValues="@array/pref_repeat_alerts_values" />
+            android:entries="@array/pref_led_color_entries"
+            android:entryValues="@array/pref_led_color_values" />
 
-    <ListPreference android:key="pref_notification_privacy"
-                    android:title="@string/preferences_notifications__display_in_notifications"
-                    android:dependency="pref_key_enable_notifications"
-                    android:defaultValue="all"
-                    android:entries="@array/pref_notification_privacy_entries"
-                    android:entryValues="@array/pref_notification_privacy_values"/>
+        <org.thoughtcrime.securesms.preferences.LedBlinkPatternListPreference
+            android:key="pref_led_blink"
+            android:defaultValue="500,2000"
+            android:title="@string/preferences__pref_led_blink_title"
+            android:dependency="pref_led_color"
+            android:entries="@array/pref_led_blink_pattern_entries"
+            android:entryValues="@array/pref_led_blink_pattern_values" />
 
-    <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
-        android:key="pref_enable_new_contacts_notifications"
-        android:title="@string/preferences__new_contacts_notifications"
-        android:summary="@string/preferences__show_a_notification_for_new_signal_contacts"
-        android:defaultValue="true" />
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+                            android:key="pref_key_inthread_notifications"
+                            android:title="@string/preferences__in_conversation_notifications"
+                            android:summary="@string/preferences__play_inthread_notifications"
+                            android:dependency="pref_key_enable_notifications"
+                            android:defaultValue="true" />
+
+        <ListPreference
+                android:key="pref_repeat_alerts"
+                android:defaultValue="0"
+                android:title="@string/preferences__repeat_alerts"
+                android:dependency="pref_key_enable_notifications"
+                android:entries="@array/pref_repeat_alerts_entries"
+                android:entryValues="@array/pref_repeat_alerts_values" />
+
+        <ListPreference android:key="pref_notification_privacy"
+                        android:title="@string/preferences_notifications__display_in_notifications"
+                        android:dependency="pref_key_enable_notifications"
+                        android:defaultValue="all"
+                        android:entries="@array/pref_notification_privacy_entries"
+                        android:entryValues="@array/pref_notification_privacy_values"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory android:layout="@layout/preference_divider"/>
+
+    <PreferenceCategory android:title="@string/preferences_notifications__events">
+        <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
+            android:key="pref_enable_new_contacts_notifications"
+            android:title="Contact joined Signal"
+            android:summary="@string/preferences__show_a_notification_for_new_signal_contacts"
+            android:defaultValue="true" />
+    </PreferenceCategory>
 
 </PreferenceScreen>

src/org/thoughtcrime/securesms/ApplicationContext.java

@@ -178,21 +178,7 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
   }
 
   private void initializeWebRtc() {
-    Set<String> HARDWARE_AEC_BLACKLIST = new HashSet<String>() {{
-      add("D6503"); // Sony Xperia Z2 D6503
-      add("ONE A2005"); // OnePlus 2
-      add("MotoG3"); // Moto G (3rd Generation)
-      add("Nexus 6P"); // Nexus 6p
-      add("Pixel"); // Pixel #6241
-      add("Pixel XL"); // Pixel XL #6241
-      add("MI 4LTE"); // Xiami Mi4 #6241
-      add("Redmi Note 3"); // Redmi Note 3 #6241
-      add("SM-G900F"); // Samsung Galaxy S5 #6241
-      add("g3_kt_kr"); // LG G3 #6241
-      add("SM-G930F"); // Samsung Galaxy S7 #6241
-      add("Xperia SP"); // Sony Xperia SP #6241
-      add("Nexus 6"); // Nexus 6
-      add("ONE E1003"); // OnePlus X
+    Set<String> HARDWARE_AEC_WHITELIST = new HashSet<String>() {{
     }};
 
     Set<String> OPEN_SL_ES_BLACKLIST = new HashSet<String>() {{
@@ -200,7 +186,9 @@ public class ApplicationContext extends MultiDexApplication implements Dependenc
     }};
 
     if (Build.VERSION.SDK_INT >= 11) {
-      if (HARDWARE_AEC_BLACKLIST.contains(Build.MODEL)) {
+      if (HARDWARE_AEC_WHITELIST.contains(Build.MODEL)) {
+        WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(false);
+      } else {
         WebRtcAudioUtils.setWebRtcBasedAcousticEchoCanceler(true);
       }
 

src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java

@@ -26,11 +26,13 @@ import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v4.preference.PreferenceFragment;
+import android.view.View;
 
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.preferences.AdvancedPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.AppProtectionPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.AppearancePreferenceFragment;
+import org.thoughtcrime.securesms.preferences.CorrectedPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.NotificationsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.SmsMmsPreferenceFragment;
 import org.thoughtcrime.securesms.preferences.ChatsPreferenceFragment;
@@ -121,7 +123,8 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredActionBarA
     }
   }
 
-  public static class ApplicationPreferenceFragment extends PreferenceFragment {
+  public static class ApplicationPreferenceFragment extends CorrectedPreferenceFragment {
+
     @Override
     public void onCreate(Bundle icicle) {
       super.onCreate(icicle);

src/org/thoughtcrime/securesms/ConversationActivity.java

@@ -978,11 +978,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   protected void updateInviteReminder(boolean seenInvite) {
     Log.w(TAG, "updateInviteReminder(" + seenInvite+")");
-    if (TextSecurePreferences.isPushRegistered(this) &&
-        !isSecureText                                &&
-        !seenInvite                                  &&
-        recipients.isSingleRecipient()               &&
-        recipients.getPrimaryRecipient() != null     &&
+    if (TextSecurePreferences.isPushRegistered(this)      &&
+        TextSecurePreferences.isShowInviteReminders(this) &&
+        !isSecureText                                     &&
+        !seenInvite                                       &&
+        recipients.isSingleRecipient()                    &&
+        recipients.getPrimaryRecipient() != null          &&
         recipients.getPrimaryRecipient().getContactUri() != null)
     {
       InviteReminder reminder = new InviteReminder(this, recipients);

src/org/thoughtcrime/securesms/ConversationItem.java

@@ -32,6 +32,7 @@ import android.text.TextUtils;
 import android.text.util.Linkify;
 import android.util.AttributeSet;
 import android.util.Log;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewStub;
@@ -304,6 +305,7 @@ public class ConversationItem extends LinearLayout
   private void setBodyText(MessageRecord messageRecord) {
     bodyText.setClickable(false);
     bodyText.setFocusable(false);
+    bodyText.setTextSize(TypedValue.COMPLEX_UNIT_SP, TextSecurePreferences.getMessageBodyTextSize(context));
 
     if (isCaptionlessMms(messageRecord)) {
       bodyText.setVisibility(View.GONE);

src/org/thoughtcrime/securesms/components/ComposeText.java

@@ -30,7 +30,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 public class ComposeText extends EmojiEditText {
 
-  private SpannableString hint;
+  private CharSequence    hint;
   private SpannableString subHint;
 
   @Nullable private InputPanel.MediaListener mediaListener;
@@ -70,12 +70,11 @@ public class ComposeText extends EmojiEditText {
   }
 
   public void setHint(@NonNull String hint, @Nullable CharSequence subHint) {
-    this.hint = new SpannableString(hint);
-    this.hint.setSpan(new RelativeSizeSpan(0.8f), 0, hint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+    this.hint = hint;
 
     if (subHint != null) {
       this.subHint = new SpannableString(subHint);
-      this.subHint.setSpan(new RelativeSizeSpan(0.8f), 0, subHint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
+      this.subHint.setSpan(new RelativeSizeSpan(0.5f), 0, subHint.length(), Spannable.SPAN_INCLUSIVE_INCLUSIVE);
     } else {
       this.subHint = null;
     }

src/org/thoughtcrime/securesms/contacts/avatars/GeneratedContactPhoto.java

@@ -42,7 +42,7 @@ public class GeneratedContactPhoto implements ContactPhoto {
     if (cleanedName.isEmpty()) {
       return "#";
     } else {
-      return String.valueOf(cleanedName.charAt(0));
+      return new StringBuilder().appendCodePoint(cleanedName.codePointAt(0)).toString();
     }
   }
 

src/org/thoughtcrime/securesms/crypto/DecryptingPartInputStream.java

@@ -19,6 +19,7 @@ package org.thoughtcrime.securesms.crypto;
 import android.util.Log;
 
 import org.thoughtcrime.securesms.util.LimitedInputStream;
+import org.thoughtcrime.securesms.util.Util;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -139,5 +140,30 @@ public class DecryptingPartInputStream {
         Log.w(TAG, t);
       }
     }
+
+    @Override
+    public long skip(long skipAmount)
+        throws IOException
+    {
+      long remaining = skipAmount;
+
+      if (skipAmount <= 0) {
+        return 0;
+      }
+
+      byte[] skipBuffer = new byte[4092];
+
+      while (remaining > 0) {
+        int read = super.read(skipBuffer, 0, Util.toIntExact(Math.min(skipBuffer.length, remaining)));
+
+        if (read < 0) {
+          break;
+        }
+
+        remaining -= read;
+      }
+
+      return skipAmount - remaining;
+    }
   }
 }

src/org/thoughtcrime/securesms/jobs/UpdateApkJob.java

@@ -26,6 +26,7 @@ import org.whispersystems.jobqueue.requirements.NetworkRequirement;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.security.MessageDigest;
+import java.util.concurrent.TimeUnit;
 
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -39,7 +40,7 @@ public class UpdateApkJob extends ContextJob {
     super(context, JobParameters.newBuilder()
                                 .withGroupId(UpdateApkJob.class.getSimpleName())
                                 .withRequirement(new NetworkRequirement(context))
-                                .withWakeLock(true)
+                                .withWakeLock(true, 30, TimeUnit.SECONDS)
                                 .withRetryCount(2)
                                 .create());
   }

src/org/thoughtcrime/securesms/preferences/AppProtectionPreferenceFragment.java

@@ -27,7 +27,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
 
 import java.util.concurrent.TimeUnit;
 
-public class AppProtectionPreferenceFragment extends PreferenceFragment {
+public class AppProtectionPreferenceFragment extends CorrectedPreferenceFragment {
 
   private static final String PREFERENCE_CATEGORY_BLOCKED = "preference_category_blocked";
 

src/org/thoughtcrime/securesms/preferences/ChatsPreferenceFragment.java

@@ -4,12 +4,14 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
 import android.preference.EditTextPreference;
+import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.Preference.OnPreferenceChangeListener;
 import android.support.v4.preference.PreferenceFragment;
 import android.support.v7.app.AlertDialog;
 import android.text.TextUtils;
 import android.util.Log;
+import android.view.View;
 
 import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
 import org.thoughtcrime.securesms.R;
@@ -20,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-public class ChatsPreferenceFragment extends PreferenceFragment {
+public class ChatsPreferenceFragment extends ListSummaryPreferenceFragment {
   private static final String TAG = ChatsPreferenceFragment.class.getSimpleName();
 
   @Override
@@ -34,12 +36,15 @@ public class ChatsPreferenceFragment extends PreferenceFragment {
         .setOnPreferenceChangeListener(new MediaDownloadChangeListener());
     findPreference(TextSecurePreferences.MEDIA_DOWNLOAD_ROAMING_PREF)
         .setOnPreferenceChangeListener(new MediaDownloadChangeListener());
+    findPreference(TextSecurePreferences.MESSAGE_BODY_TEXT_SIZE_PREF)
+        .setOnPreferenceChangeListener(new ListSummaryListener());
 
     findPreference(TextSecurePreferences.THREAD_TRIM_NOW)
         .setOnPreferenceClickListener(new TrimNowClickListener());
     findPreference(TextSecurePreferences.THREAD_TRIM_LENGTH)
         .setOnPreferenceChangeListener(new TrimLengthValidationListener());
 
+    initializeListSummary((ListPreference) findPreference(TextSecurePreferences.MESSAGE_BODY_TEXT_SIZE_PREF));
   }
 
   @Override

src/org/thoughtcrime/securesms/preferences/CorrectedPreferenceFragment.java

@@ -0,0 +1,18 @@
+package org.thoughtcrime.securesms.preferences;
+
+
+import android.os.Bundle;
+import android.support.v4.preference.PreferenceFragment;
+import android.view.View;
+
+public class CorrectedPreferenceFragment extends PreferenceFragment {
+
+  @Override
+  public void onActivityCreated(Bundle savedInstanceState) {
+    super.onActivityCreated(savedInstanceState);
+
+    View lv = getView().findViewById(android.R.id.list);
+    if (lv != null) lv.setPadding(0, 0, 0, 0);
+  }
+
+}

src/org/thoughtcrime/securesms/preferences/LEDColorListPreference.java

@@ -0,0 +1,108 @@
+/**
+ * Copyright (C) 2017 Whisper Systems
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package org.thoughtcrime.securesms.preferences;
+
+import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
+import android.preference.ListPreference;
+import android.support.annotation.NonNull;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+import android.widget.ImageView;
+
+import org.thoughtcrime.securesms.R;
+
+/**
+ * List preference that disables dependents when set to "none", similar to a CheckBoxPreference.
+ *
+ * @author Taylor Kline
+ */
+
+public class LEDColorListPreference extends ListPreference {
+
+  private static final String TAG = LEDColorListPreference.class.getSimpleName();
+
+  private ImageView colorImageView;
+
+  public LEDColorListPreference(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    setWidgetLayoutResource(R.layout.led_color_preference_widget);
+  }
+
+  public LEDColorListPreference(Context context) {
+    super(context);
+    setWidgetLayoutResource(R.layout.led_color_preference_widget);
+  }
+
+  @Override
+  public void setValue(String value) {
+    CharSequence oldEntry = getEntry();
+    super.setValue(value);
+    CharSequence newEntry = getEntry();
+    if (oldEntry != newEntry) {
+      notifyDependencyChange(shouldDisableDependents());
+    }
+
+    if (value != null) setPreviewColor(value);
+  }
+
+  @Override
+  public boolean shouldDisableDependents() {
+    CharSequence newEntry = getValue();
+    boolean shouldDisable = newEntry.equals("none");
+    return shouldDisable || super.shouldDisableDependents();
+  }
+
+  @Override
+  protected void onBindView(View view) {
+    super.onBindView(view);
+    this.colorImageView = (ImageView)view.findViewById(R.id.color_view);
+    setPreviewColor(getValue());
+  }
+
+  @Override
+  public void setSummary(CharSequence summary) {
+    super.setSummary(null);
+  }
+
+  private void setPreviewColor(@NonNull String value) {
+    int color;
+
+    switch (value) {
+      case "green":   color = getContext().getResources().getColor(R.color.green_500);   break;
+      case "red":     color = getContext().getResources().getColor(R.color.red_500);     break;
+      case "blue":    color = getContext().getResources().getColor(R.color.blue_500);    break;
+      case "yellow":  color = getContext().getResources().getColor(R.color.yellow_500);  break;
+      case "cyan":    color = getContext().getResources().getColor(R.color.cyan_500);    break;
+      case "magenta": color = getContext().getResources().getColor(R.color.pink_500);    break;
+      case "white":   color = getContext().getResources().getColor(R.color.white);       break;
+      default:        color = getContext().getResources().getColor(R.color.transparent); break;
+    }
+
+    if (colorImageView != null) {
+      GradientDrawable drawable = new GradientDrawable();
+      drawable.setShape(GradientDrawable.OVAL);
+      drawable.setColor(color);
+
+      colorImageView.setImageDrawable(drawable);
+    }
+  }
+
+
+
+}

src/org/thoughtcrime/securesms/preferences/ListSummaryPreferenceFragment.java

@@ -8,7 +8,7 @@ import org.thoughtcrime.securesms.R;
 
 import java.util.Arrays;
 
-public abstract class ListSummaryPreferenceFragment extends PreferenceFragment {
+public abstract class ListSummaryPreferenceFragment extends CorrectedPreferenceFragment {
 
   protected class ListSummaryListener implements Preference.OnPreferenceChangeListener {
     @Override

src/org/thoughtcrime/securesms/preferences/SmsMmsPreferenceFragment.java

@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 
-public class SmsMmsPreferenceFragment extends PreferenceFragment {
+public class SmsMmsPreferenceFragment extends CorrectedPreferenceFragment {
   private static final String KITKAT_DEFAULT_PREF = "pref_set_default";
   private static final String MMS_PREF            = "pref_mms_preferences";
 

src/org/thoughtcrime/securesms/util/SaveAttachmentTask.java

@@ -181,6 +181,8 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
       fileName = base + "." + extension;
     }
 
+    fileName = new File(fileName).getName();
+
     int  i    = 0;
     File file = new File(outputDirectory, fileName);
 
@@ -189,6 +191,10 @@ public class SaveAttachmentTask extends ProgressDialogAsyncTask<SaveAttachmentTa
       file = new File(outputDirectory, fileParts[0] + "-" + (++i) + "." + fileParts[1]);
     }
 
+    if (file.isHidden()) {
+      throw new IOException("Specified name would not be visible");
+    }
+
     return file;
   }
 

src/org/thoughtcrime/securesms/util/TextSecurePreferences.java

@@ -79,6 +79,8 @@ public class TextSecurePreferences {
   private static final String SIGNED_PREKEY_ROTATION_TIME_PREF = "pref_signed_pre_key_rotation_time";
   private static final String IN_THREAD_NOTIFICATION_PREF      = "pref_key_inthread_notifications";
   private static final String BLOCKING_IDENTITY_CHANGES_PREF   = "pref_blocking_identity_changes";
+  private static final String SHOW_INVITE_REMINDER_PREF        = "pref_show_invite_reminder";
+  public  static final String MESSAGE_BODY_TEXT_SIZE_PREF      = "pref_message_body_text_size";
 
   private static final String LOCAL_REGISTRATION_ID_PREF       = "pref_local_registration_id";
   private static final String SIGNED_PREKEY_REGISTERED_PREF    = "pref_signed_prekey_registered";
@@ -107,6 +109,10 @@ public class TextSecurePreferences {
   public  static final String DIRECT_CAPTURE_CAMERA_ID         = "pref_direct_capture_camera_id";
   private static final String ALWAYS_RELAY_CALLS_PREF          = "pref_turn_only";
 
+  public static int getMessageBodyTextSize(Context context) {
+    return Integer.valueOf(getStringPreference(context, MESSAGE_BODY_TEXT_SIZE_PREF, "16"));
+  }
+
   public static boolean isTurnOnly(Context context) {
     return getBooleanPreference(context, ALWAYS_RELAY_CALLS_PREF, false);
   }
@@ -487,6 +493,10 @@ public class TextSecurePreferences {
     setBooleanPreference(context, REGISTERED_GCM_PREF, registered);
   }
 
+  public static boolean isShowInviteReminders(Context context) {
+    return getBooleanPreference(context, SHOW_INVITE_REMINDER_PREF, true);
+  }
+
   public static boolean isPassphraseTimeoutEnabled(Context context) {
     return getBooleanPreference(context, PASSPHRASE_TIMEOUT_PREF, false);
   }

src/org/thoughtcrime/securesms/video/VideoPlayer.java

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.video;
 
 
 import android.content.Context;
+import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
@@ -11,12 +12,30 @@ import android.widget.MediaController;
 import android.widget.Toast;
 import android.widget.VideoView;
 
+import com.google.android.exoplayer2.DefaultLoadControl;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.LoadControl;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
+import com.google.android.exoplayer2.extractor.ExtractorsFactory;
+import com.google.android.exoplayer2.source.ExtractorMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.TrackSelector;
+import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
+import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.attachments.AttachmentServer;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.mms.VideoSlide;
 import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.video.exo.AttachmentDataSourceFactory;
 
 import java.io.IOException;
 
@@ -24,8 +43,11 @@ public class VideoPlayer extends FrameLayout {
 
   private static final String TAG = VideoPlayer.class.getName();
 
-  @NonNull  private final VideoView        videoView;
-  @Nullable private       AttachmentServer attachmentServer;
+  @Nullable private final VideoView           videoView;
+  @Nullable private final SimpleExoPlayerView exoView;
+
+  @Nullable private       SimpleExoPlayer     exoPlayer;
+  @Nullable private       AttachmentServer    attachmentServer;
 
   public VideoPlayer(Context context) {
     this(context, null);
@@ -40,12 +62,57 @@ public class VideoPlayer extends FrameLayout {
 
     inflate(context, R.layout.video_player, this);
 
-    this.videoView = ViewUtil.findById(this, R.id.video_view);
-
-    initializeVideoViewControls(videoView);
+    if (Build.VERSION.SDK_INT >= 16) {
+      this.exoView   = ViewUtil.findById(this, R.id.video_view);
+      this.videoView = null;
+    } else {
+      this.videoView = ViewUtil.findById(this, R.id.video_view);
+      this.exoView   = null;
+      initializeVideoViewControls(videoView);
+    }
   }
 
-  public void setVideoSource(@NonNull MasterSecret masterSecret, @NonNull VideoSlide videoSource) throws IOException {
+  public void setVideoSource(@NonNull MasterSecret masterSecret, @NonNull VideoSlide videoSource)
+      throws IOException
+  {
+    if (Build.VERSION.SDK_INT >= 16) setExoViewSource(masterSecret, videoSource);
+    else                             setVideoViewSource(masterSecret, videoSource);
+  }
+
+  public void cleanup() {
+    if (this.attachmentServer != null) {
+      this.attachmentServer.stop();
+    }
+
+    if (this.exoPlayer != null) {
+      this.exoPlayer.release();
+    }
+  }
+
+  private void setExoViewSource(@NonNull MasterSecret masterSecret, @NonNull VideoSlide videoSource)
+      throws IOException
+  {
+    BandwidthMeter         bandwidthMeter             = new DefaultBandwidthMeter();
+    TrackSelection.Factory videoTrackSelectionFactory = new AdaptiveTrackSelection.Factory(bandwidthMeter);
+    TrackSelector          trackSelector              = new DefaultTrackSelector(videoTrackSelectionFactory);
+    LoadControl            loadControl                = new DefaultLoadControl();
+
+    exoPlayer = ExoPlayerFactory.newSimpleInstance(getContext(), trackSelector, loadControl);
+    exoView.setPlayer(exoPlayer);
+
+    DefaultDataSourceFactory    defaultDataSourceFactory    = new DefaultDataSourceFactory(getContext(), "GenericUserAgent", null);
+    AttachmentDataSourceFactory attachmentDataSourceFactory = new AttachmentDataSourceFactory(getContext(), masterSecret, defaultDataSourceFactory, null);
+    ExtractorsFactory           extractorsFactory           = new DefaultExtractorsFactory();
+
+    MediaSource mediaSource = new ExtractorMediaSource(videoSource.getUri(), attachmentDataSourceFactory, extractorsFactory, null, null);
+
+    exoPlayer.prepare(mediaSource);
+    exoPlayer.setPlayWhenReady(true);
+  }
+
+  private void setVideoViewSource(@NonNull MasterSecret masterSecret, @NonNull VideoSlide videoSource)
+    throws IOException
+  {
     if (this.attachmentServer != null) {
       this.attachmentServer.stop();
     }
@@ -67,12 +134,6 @@ public class VideoPlayer extends FrameLayout {
     this.videoView.start();
   }
 
-  public void cleanup() {
-    if (this.attachmentServer != null) {
-      this.attachmentServer.stop();
-    }
-  }
-
   private void initializeVideoViewControls(@NonNull VideoView videoView) {
     MediaController mediaController = new MediaController(getContext());
     mediaController.setAnchorView(videoView);

src/org/thoughtcrime/securesms/video/exo/AttachmentDataSource.java

@@ -0,0 +1,48 @@
+package org.thoughtcrime.securesms.video.exo;
+
+
+import android.net.Uri;
+
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.DefaultDataSource;
+
+import org.thoughtcrime.securesms.mms.PartAuthority;
+
+import java.io.IOException;
+
+public class AttachmentDataSource implements DataSource {
+
+  private final DefaultDataSource defaultDataSource;
+  private final PartDataSource    partDataSource;
+
+  private DataSource dataSource;
+
+  public AttachmentDataSource(DefaultDataSource defaultDataSource, PartDataSource partDataSource) {
+    this.defaultDataSource = defaultDataSource;
+    this.partDataSource    = partDataSource;
+  }
+
+  @Override
+  public long open(DataSpec dataSpec) throws IOException {
+    if (PartAuthority.isLocalUri(dataSpec.uri)) dataSource = partDataSource;
+    else                                        dataSource = defaultDataSource;
+
+    return dataSource.open(dataSpec);
+  }
+
+  @Override
+  public int read(byte[] buffer, int offset, int readLength) throws IOException {
+    return dataSource.read(buffer, offset, readLength);
+  }
+
+  @Override
+  public Uri getUri() {
+    return dataSource.getUri();
+  }
+
+  @Override
+  public void close() throws IOException {
+    dataSource.close();
+  }
+}

src/org/thoughtcrime/securesms/video/exo/AttachmentDataSourceFactory.java

@@ -0,0 +1,37 @@
+package org.thoughtcrime.securesms.video.exo;
+
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.google.android.exoplayer2.upstream.TransferListener;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+
+public class AttachmentDataSourceFactory implements DataSource.Factory {
+
+  private final Context      context;
+  private final MasterSecret masterSecret;
+
+  private final DefaultDataSourceFactory             defaultDataSourceFactory;
+  private final TransferListener<? super DataSource> listener;
+
+  public AttachmentDataSourceFactory(@NonNull Context context, @NonNull MasterSecret masterSecret,
+                                     @NonNull DefaultDataSourceFactory defaultDataSourceFactory,
+                                     @Nullable TransferListener<? super DataSource> listener)
+  {
+    this.context                  = context;
+    this.masterSecret             = masterSecret;
+    this.defaultDataSourceFactory = defaultDataSourceFactory;
+    this.listener                 = listener;
+  }
+
+  @Override
+  public AttachmentDataSource createDataSource() {
+    return new AttachmentDataSource(defaultDataSourceFactory.createDataSource(),
+                                    new PartDataSource(context, masterSecret, listener));
+  }
+}

src/org/thoughtcrime/securesms/video/exo/PartDataSource.java

@@ -0,0 +1,88 @@
+package org.thoughtcrime.securesms.video.exo;
+
+
+import android.content.Context;
+import android.net.Uri;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.TransferListener;
+
+import org.thoughtcrime.securesms.attachments.Attachment;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.AttachmentDatabase;
+import org.thoughtcrime.securesms.database.DatabaseFactory;
+import org.thoughtcrime.securesms.mms.PartUriParser;
+
+import java.io.EOFException;
+import java.io.IOException;
+import java.io.InputStream;
+
+public class PartDataSource implements DataSource {
+
+  private final @NonNull  Context      context;
+  private final @NonNull  MasterSecret masterSecret;
+  private final @Nullable TransferListener<? super PartDataSource> listener;
+
+  private Uri         uri;
+  private InputStream inputSteam;
+
+  public PartDataSource(@NonNull Context context,
+                        @NonNull MasterSecret masterSecret,
+                        @Nullable TransferListener<? super PartDataSource> listener)
+  {
+    this.context      = context.getApplicationContext();
+    this.masterSecret = masterSecret;
+    this.listener     = listener;
+  }
+
+  @Override
+  public long open(DataSpec dataSpec) throws IOException {
+    this.uri = dataSpec.uri;
+
+    AttachmentDatabase attachmentDatabase = DatabaseFactory.getAttachmentDatabase(context);
+    PartUriParser      partUri            = new PartUriParser(uri);
+    Attachment         attachment         = attachmentDatabase.getAttachment(masterSecret, partUri.getPartId());
+
+    if (attachment == null) throw new IOException("Attachment not found");
+
+    this.inputSteam = attachmentDatabase.getAttachmentStream(masterSecret, partUri.getPartId());
+
+    if (inputSteam == null) throw new IOException("InputStream not foudn");
+
+    long skipped = this.inputSteam.skip(dataSpec.position);
+
+    if (skipped != dataSpec.position) throw new IOException("Skip failed!");
+
+    if (listener != null) {
+      listener.onTransferStart(this, dataSpec);
+    }
+
+    if (attachment.getSize() - dataSpec.position <= 0) throw new EOFException("No more data");
+
+    return attachment.getSize() - dataSpec.position;
+  }
+
+  @Override
+  public int read(byte[] buffer, int offset, int readLength) throws IOException {
+    int read = inputSteam.read(buffer, offset, readLength);
+
+    if (read > 0 && listener != null) {
+      listener.onBytesTransferred(this, read);
+    }
+
+    return read;
+  }
+
+  @Override
+  public Uri getUri() {
+    return uri;
+  }
+
+  @Override
+  public void close() throws IOException {
+    inputSteam.close();
+  }
+}