Bump version to 3.7.2

// FREEBIE

AndroidManifest.xml

@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           package="org.thoughtcrime.securesms"
-      android:versionCode="173"
-      android:versionName="3.6.0">
+      android:versionCode="177"
+      android:versionName="3.7.2">
 
     <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat"/>
 
@@ -131,6 +131,12 @@
 
     <activity android:name=".DeviceProvisioningActivity"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize">
+        <intent-filter>
+            <action android:name="android.intent.action.VIEW" />
+            <category android:name="android.intent.category.DEFAULT" />
+            <category android:name="android.intent.category.BROWSABLE" />
+            <data android:scheme="tsdevice"/>
+        </intent-filter>
     </activity>
 
     <activity android:name=".preferences.MmsPreferencesActivity"
@@ -174,7 +180,7 @@
     </activity-alias>
 
     <activity android:name=".ConversationListArchiveActivity"
-              android:label="@string/AndroidManifeset_conversations_archive"
+              android:label="@string/AndroidManifest_conversations_archive"
               android:launchMode="singleTask"
               android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
               android:parentActivityName=".ConversationListActivity">

BUILDING.md

@@ -5,7 +5,8 @@ Basics
 ------
 
 Signal uses [Gradle](http://gradle.org) to build the project and to maintain
-dependencies.
+dependencies.  However, you needn't install it yourself; the
+"gradle wrapper" `gradlew`, mentioned below, will do that for you.
 
 Building Signal
 ---------------
@@ -19,12 +20,12 @@ The following steps should help you (re)build Signal from the command line.
 2. Make sure you have the [Android SDK](https://developer.android.com/sdk/index.html) installed.
 3. Ensure that the following packages are installed from the Android SDK manager:
     * Android SDK Build Tools
-    * SDK Platform
+    * SDK Platform (API level 22)
     * Android Support Repository
     * Google Repository
-4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.
+4. Create a local.properties file at the root of your source checkout and add an sdk.dir entry to it.  For example:
 
-        sdk.dir=\<path to your sdk installation\>
+        sdk.dir=/Application/android-sdk-macosx
 
 5. Execute Gradle:
 

CONTRIBUTING.md

@@ -1,6 +1,6 @@
 ##Translations
 
-Please do not submit issues or pull requests for translation fixes. Anyone can update the translations in [Transifex](https://www.transifex.com/projects/p/textsecure-official/). Please submit your corrections there.
+Please do not submit issues or pull requests for translation fixes. Anyone can update the translations in [Transifex](https://www.transifex.com/projects/p/signal-android/). Please submit your corrections there.
 
 ## Submitting useful bug reports
 1. Search our issues first to make sure this is not a duplicate.
@@ -29,3 +29,5 @@ Truths which we believe to be self-evident:
    clocks are doomed to failure. 
 
 Before you submit a pull request, please check if your code follows the [Code style Guidelines](https://github.com/WhisperSystems/Signal-Android/wiki/Code-Style-Guidelines).
+
+[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/WhisperSystems/Signal-Android?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

res/layout/alert_view.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+       xmlns:tools="http://schemas.android.com/tools">
+
+    <ImageView
+        android:id="@+id/sms_failed_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_error_red_24dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description" />
+
+    <ImageView
+        android:id="@+id/pending_approval_indicator"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_info_outline_grey600_24dp"
+        android:visibility="gone"
+        tools:visibility="visible"
+        android:layout_gravity="center_vertical"
+        android:contentDescription="@string/conversation_item_sent__pending_approval_description" />
+
+</merge>

res/layout/contact_selection_activity.xml

@@ -11,7 +11,7 @@
             android:layout_width="match_parent"
             android:minHeight="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
-            android:theme="@style/TextSecure.LightActionBar" />
+            android:theme="?attr/actionBarStyle" />
 
         <fragment android:id="@+id/contact_selection_list_fragment"
                   android:layout_width="match_parent"

res/layout/conversation_item_pending.xml

@@ -2,9 +2,8 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
     <TextView android:id="@+id/pending_indicator"
-              android:layout_width="20dp"
+              android:layout_width="match_parent"
               android:layout_height="wrap_content"
-              android:visibility="gone"
               android:textAppearance="?android:attr/textAppearanceSmall"
               android:fontFamily="sans-serif-light"
               android:textColor="?conversation_item_sent_text_secondary_color"

res/layout/conversation_item_pending_v11.xml

@@ -4,9 +4,8 @@
 
     <pl.tajchert.sample.DotsTextView
             android:id="@+id/pending_indicator"
-            android:layout_width="20dp"
+            android:layout_width="match_parent"
             android:layout_height="20dp"
-            android:visibility="gone"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:fontFamily="sans-serif-light"
             android:textColor="?conversation_item_sent_text_secondary_color"

res/layout/conversation_item_received.xml

@@ -109,16 +109,6 @@
                           android:orientation="horizontal"
                           android:gravity="left">
 
-                <ImageView android:id="@+id/sent_indicator"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:visibility="gone"/>
-
-                <ImageView android:id="@+id/delivered_indicator"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:visibility="gone" />
-
                 <ImageView android:id="@+id/secure_indicator"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
@@ -131,9 +121,11 @@
                            android:tint="?conversation_item_received_text_secondary_color"
                            android:tintMode="multiply"/>
 
-                <FrameLayout android:id="@+id/pending_indicator_stub"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"/>
+                <org.thoughtcrime.securesms.components.DeliveryStatusView
+                        android:id="@+id/delivery_status"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:visibility="gone"/>
 
                 <TextView android:id="@+id/conversation_item_date"
                           android:layout_width="wrap_content"
@@ -149,31 +141,13 @@
             </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout android:id="@+id/indicators_parent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:orientation="vertical"
-            android:gravity="center_vertical">
-
-            <ImageView android:id="@+id/sms_failed_indicator"
+        <org.thoughtcrime.securesms.components.AlertView
+                android:id="@+id/indicators_parent"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_action_warning_red"
-                android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description"
-                android:visibility="gone" />
-
-            <ImageView
-                    android:id="@+id/pending_approval_indicator"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/ic_info_outline_grey600_24dp"
-                    android:visibility="gone"
-                    android:layout_gravity="center_vertical"
-                    android:contentDescription="@string/conversation_item_sent__pending_approval_description"
-                    tools:visibility="gone" />
-
-        </LinearLayout>
+                android:layout_alignParentRight="true"
+                android:orientation="vertical"
+                android:gravity="center_vertical"/>
 
         <TextView android:id="@+id/indicator_text"
                   android:layout_width="wrap_content"

res/layout/conversation_item_sent.xml

@@ -16,35 +16,15 @@
                     android:layout_marginBottom="6dp"
                     android:layout_marginRight="0dp">
 
-        <LinearLayout android:id="@+id/indicators_parent"
-                      android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"
-                      android:orientation="vertical"
-                      android:gravity="left|center_vertical"
-                      android:layout_marginLeft="6dp"
-                      android:layout_alignParentLeft="true"
-                      android:layout_centerVertical="true">
-
-            <ImageView
-                android:id="@+id/sms_failed_indicator"
+        <org.thoughtcrime.securesms.components.AlertView
+                android:id="@+id/indicators_parent"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_error_red_24dp"
-                tools:visibility="visible"
-                android:visibility="gone"
-                android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description" />
-
-            <ImageView
-                android:id="@+id/pending_approval_indicator"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_info_outline_grey600_24dp"
-                android:visibility="gone"
-                android:layout_gravity="center_vertical"
-                android:contentDescription="@string/conversation_item_sent__pending_approval_description"
-                tools:visibility="visible" />
-
-        </LinearLayout>
+                android:orientation="vertical"
+                android:gravity="left|center_vertical"
+                android:layout_marginLeft="6dp"
+                android:layout_alignParentLeft="true"
+                android:layout_centerVertical="true"/>
 
         <LinearLayout android:id="@+id/body_bubble"
                       android:layout_width="wrap_content"
@@ -145,33 +125,11 @@
                           android:paddingBottom="2dp"
                           tools:text="30 mins" />
 
-                <FrameLayout android:id="@+id/pending_indicator_stub"
-                             android:layout_width="wrap_content"
-                             android:layout_height="wrap_content"/>
-
-                <ImageView android:id="@+id/sent_indicator"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical|end"
-                           android:src="@drawable/ic_done_white_18dp"
-                           android:paddingLeft="2dp"
-                           android:paddingBottom="2dp"
-                           android:visibility="gone"
-                           android:tint="?conversation_item_sent_text_secondary_color"
-                           android:tintMode="multiply"
-                           android:contentDescription="@string/conversation_item_sent__delivered_description" />
-
-                <ImageView android:id="@+id/delivered_indicator"
-                           android:layout_width="wrap_content"
-                           android:layout_height="wrap_content"
-                           android:layout_gravity="center_vertical|end"
-                           android:src="@drawable/ic_done_all_white_18dp"
-                           android:paddingLeft="2dp"
-                           android:paddingBottom="2dp"
-                           android:visibility="gone"
-                           android:tint="?conversation_item_sent_text_secondary_color"
-                           android:tintMode="multiply"
-                           android:contentDescription="@string/conversation_item_sent__delivered_description" />
+                <org.thoughtcrime.securesms.components.DeliveryStatusView
+                        android:id="@+id/delivery_status"
+                        android:layout_width="20dp"
+                        android:layout_height="wrap_content"
+                        app:iconColor="?conversation_item_sent_text_secondary_color"/>
 
                 <ImageView android:id="@+id/secure_indicator"
                            android:layout_width="wrap_content"

res/layout/conversation_list_item_view.xml

@@ -44,24 +44,25 @@
                   android:ellipsize="end"
                   android:drawablePadding="5dp"/>
 
-        <ImageView android:id="@+id/error"
-                   android:layout_height="20dp"
-                   android:layout_width="20dp"
-                   android:layout_alignParentLeft="true"
-                   android:layout_below="@id/from"
-                   android:paddingBottom="3dp"
-                   android:visibility="gone"
-                   tools:visibility="visible"
-                   android:src="@drawable/ic_action_warning_red"
-                   android:contentDescription="@string/conversation_list_item_view__error_alert" />
+        <org.thoughtcrime.securesms.components.AlertView
+                android:id="@+id/indicators_parent"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:paddingTop="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_alignParentLeft="true"
+                android:layout_below="@id/from"
+                app:useSmallIcon="true"
+                android:visibility="gone"
+                tools:visibility="visible"/>
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                 android:id="@+id/subject"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/from"
-                android:layout_toRightOf="@id/error"
-                android:layout_toLeftOf="@+id/archived"
+                android:layout_toRightOf="@id/indicators_parent"
+                android:layout_toLeftOf="@+id/delivery_status"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?attr/conversation_list_item_subject_color"
                 android:fontFamily="sans-serif-light"
@@ -111,6 +112,14 @@
                   android:textSize="12sp"
                 />
 
+        <org.thoughtcrime.securesms.components.DeliveryStatusView
+                  android:id="@+id/delivery_status"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_below="@+id/date"
+                  android:layout_toLeftOf="@+id/archived"
+                  android:layout_alignWithParentIfMissing="true"
+                  app:iconColor="?attr/conversation_list_item_subject_color"/>
 
     </RelativeLayout>
 </org.thoughtcrime.securesms.ConversationListItem>

res/layout/delivery_status_view.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <FrameLayout android:id="@+id/pending_indicator_stub"
+                 android:layout_width="wrap_content"
+                 android:paddingRight="2dp"
+                 android:layout_height="wrap_content" />
+
+    <ImageView android:id="@+id/sent_indicator"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_gravity="center_vertical|end"
+               android:src="@drawable/ic_done_white_18dp"
+               android:paddingLeft="2dp"
+               android:paddingBottom="2dp"
+               android:visibility="gone"
+               android:contentDescription="@string/conversation_item_sent__delivered_description" />
+
+    <ImageView android:id="@+id/delivered_indicator"
+               android:layout_width="wrap_content"
+               android:layout_height="wrap_content"
+               android:layout_gravity="center_vertical|end"
+               android:src="@drawable/ic_done_all_white_18dp"
+               android:paddingLeft="2dp"
+               android:paddingBottom="2dp"
+               android:visibility="gone"
+               android:contentDescription="@string/conversation_item_sent__delivered_description" />
+
+</merge>

res/layout/device_add_fragment.xml

@@ -43,7 +43,8 @@
 
             <TextView android:text="@string/device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link"
                       android:layout_width="wrap_content"
-                      android:layout_height="wrap_content"/>
+                      android:layout_height="wrap_content"
+                      android:textColor="#ff6d6d6d"/>
 
 
         </LinearLayout>

res/menu/conversation_list_batch_archive.xml

@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:title="@string/conversation_list_batch__archive_selected"
+    <item android:title="@string/conversation_list_batch_archive__menu_archive_selected"
           android:id="@+id/menu_archive_selected"
           android:icon="@drawable/ic_archive_white_24dp"
           app:showAsAction="always"/>

res/menu/conversation_list_batch_unarchive.xml

@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <item android:title="@string/conversation_list_batch__archive_selected"
+    <item android:title="@string/conversation_list_batch_unarchive__menu_unarchive_selected"
           android:id="@+id/menu_archive_selected"
           android:icon="@drawable/ic_unarchive_white_24dp"
           app:showAsAction="always"/>

res/values-ar/strings.xml

@@ -10,7 +10,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">لم تقم بتحديد عبارة سرية بعد!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s رسائل في المحادثة</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">احذف جميع الرسائل القديمة الآن؟</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">هل انت متأكد من تقليم جميع الرسائل بالمحادثات وإبقاء أحدث %s الرسائل فقط؟</string>
   <string name="ApplicationPreferencesActivity_delete">حذف</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">تعطيل العبارة السرية؟</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -167,9 +166,16 @@
     <item quantity="other">سوف يتم حذف %1$d رسائل مختارة بشكل نهائي.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">حذف</string>
-  <string name="ConversationListFragment_deleting_selected_threads">حذف المحادثات المختارة</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">حذف المحادثات المختاره </string>
+  <string name="ConversationListFragment_archived_conversations">أرشيف المحادثات</string>
+  <string name="ConversationListFragment_undo">تراجع</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">نقل المحادثة إلى صندوق الوارد</string>
+  <string name="ConversationListFragment_archived_conversation">أرشيف المحادثة</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">نقل المحادثات إلى صندوق الوارد</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">رسالة تبادل المفاتيح</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">المحادثات المؤرشفة (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">استخدام التخصيص: %s</string>
   <string name="CustomDefaultPreference_using_default">الاستخدام الافتراضي: %s</string>
@@ -189,6 +195,7 @@
   <string name="DeviceListItem_unnamed_device">جهاز غير مسمى</string>
   <string name="DeviceListItem_linked_s">مقترن %s</string>
   <string name="DeviceListItem_last_active_s">آخر مرة %s</string>
+  <string name="DeviceListItem_today">اليوم</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">شارك مع</string>
   <!--ExperienceUpgradeActivity-->
@@ -210,14 +217,14 @@
   <string name="ExportFragment_success">تم بنجاح!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">فشل دائما في اتصال سيجنال!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">عملية تسجيل سيجنال مع خدمات جوجل بلاي لم تتم. اتصال البيانات عبر شبكة الجوال معطلة، رجاء محاولة إعادة التسجيل من خلال قائمة إعدادات سيجنال.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">سيجنال لم يتمكن من التسجيل مع خدمات جوجل بلاي، وتم تعطيل رسائل ومكالمات سيجنال. رجاء محاولة إعادة التسجيل عبر قائمة الإعدادات بالتطبيق ثم اختيار متقدم.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">مجموعة جديدة</string>
   <string name="GroupCreateActivity_actionbar_update_title">تحديث المجموعة</string>
   <string name="GroupCreateActivity_group_name_hint">أسم المجموعة</string>
   <string name="GroupCreateActivity_actionbar_mms_title">مجموعة وسائط متعددة جديدة</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">قمت باختيار شخص لا يدعم مجوعات سيجنال وبالتالي ستكون مجموعة وسائط متعددة.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">أنت غير مسجل لاستخدام بيانات شبكة الجوال لذلك فإن مجموعات سيجنال معطلة.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">أنت غير مسجل في رسائل ومكالمات سيجنال وبالتالي فإن مجموعات سيجنال معطلة. حاول إعادة التسجيل عبر قائمة الإعدادات بالتطبيق ثم اختيار متقدم.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">خطأ غير متوقع تسبب في تعذر إنشاء المجموعة.</string>
   <string name="GroupCreateActivity_contacts_no_members">تحتاج إلى شخص واحد على الأقل في المجموعة!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">لا يمكن قراءة رقم أحد أعضاء المجموعة بشكل صحيح. رجاء تصحيح أو حذف هذا العضو والمحاولة مرة أخرى.</string>
@@ -333,6 +340,9 @@
   <string name="DeviceProvisioningActivity_content_progress_network_error">خطأ في الشبكة.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">الرمز غير سليم.</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">عذرا، الرابط غير صحيح.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">ربط جهاز سيجنال؟</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">أنت تحاول ربط الجهاز باستخدام ماسح ضوئي كوسيط خارجي 3. للأمان، الرجاء قم بعمليه مسح الرمز من خلال جهاز السيجنال</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">أدخل العبارة السرية</string>
   <string name="PassphrasePromptActivity_watermark_content_description">أيقونة سيجنال</string>
@@ -509,6 +519,8 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">الردود السريعة غير متاحة عند قفل سيجنال!</string>
   <string name="QuickResponseService_problem_sending_message">مشكلة في الإرسال!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">سيجنال</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">رسالة جديدة</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">صورة</string>
   <string name="attachment_type_selector__audio">صوت</string>
@@ -673,11 +685,11 @@
   <string name="registration_progress_activity__call_me">أتصل بي</string>
   <string name="registration_progress_activity__edit_number">تعديل الرقم</string>
   <string name="registration_progress_activity__connectivity_error">خطأ في الاتصال</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-سيجنال غير قادر على الاتصال بخدمة دفع الوصول إلى الرسائل.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">لم يتمكن سيجنال من الاتصال بالخادم.</string>
   <string name="registration_progress_activity__some_possible_problems_include">بعض المشاكل 
 المحتملة وتتضمن:</string>
   <string name="registration_progress_activity__no_network_connectivity">لا يوجد شبكة اتصال.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">الجهاز في حاجة إلى الاتصال بالإترنت من أجل استخدام هذه الخاصية من سيجنال. تأكد من الاتصال ببيانات شبكة الجوال أو Wi-Fi. </string>
   <string name="registration_progress_activity__restrictive_firewall">تقييد بواسطة جدار ناري.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
  إذا كنت متصل عبر Wi-Fi فإنه من الوارد وجود جدار ناري يمنع النفاذ إلى خادم سيجنال. قم بتجربة شبكة أخرى أو بيانات شبكة الجوال.</string>
@@ -717,11 +729,12 @@
   <string name="AndroidManifest__change_passphrase">غير العبارة السرية</string>
   <string name="AndroidManifest__verify_identity">تحقق من الهوية</string>
   <string name="AndroidManifest__log_submit">أرسل سجلات التصحيح</string>
-  <string name="AndroidManifest__media_preview">معاينة الوسائط</string>
   <string name="AndroidManifest__media_overview">جميع الصور</string>
   <string name="AndroidManifest__media_overview_named">جميع الصور مع %1$s</string>
+  <string name="AndroidManifest__message_details">تفاصيل الرسالة</string>
   <string name="AndroidManifest_manage_linked_devices">إدارة الأجهزة المقترنة</string>
   <string name="AndroidManifest__invite_friends">دعوة الأصدقاء</string>
+  <string name="AndroidManifest_conversations_archive">أرشيف المحادثات</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">استيراد / تصدير</string>
   <string name="arrays__your_identity_key">متفاح الهوية الخاص بك</string>
@@ -790,7 +803,6 @@
   <string name="preferences__sound">صوت</string>
   <string name="preferences__change_notification_sound">تغيير صوت التنبيه</string>
   <string name="preferences__silent">صامت</string>
-  <string name="preferences__inthread_notifications">إشعارات داخل المحادثة</string>
   <string name="preferences__play_inthread_notifications">تفعيل تنبيه صوتي أثناء مطالعة محادثة نشطة</string>
   <string name="preferences__repeat_alerts">تكرار التنبيهات</string>
   <string name="preferences__never">أبدا</string>
@@ -828,12 +840,9 @@
   <string name="preferences__mmsc_password">كلمة السر MMSC</string>
   <string name="preferences__sms_delivery_reports">تقارير التسليم</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">طلب تقرير تسليم لكل رسالة قصيرة ترسلها</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">حذف الرسائل القديمة آليا عند تجاوز المحادثة الطول المحدد</string>
   <string name="preferences__delete_old_messages">احذف الرسائل القديمة</string>
   <string name="preferences__chats">المحادثات والوسائط</string>
   <string name="preferences__conversation_length_limit">حد طول المحادثة</string>
-  <string name="preferences__trim_all_threads_now">تقليم كل المحادثات الآن</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">افحص كل المحادثات وافرض حد الطول لكل محادثة</string>
   <string name="preferences__devices">الأجهزة</string>
   <string name="preferences__light_theme">فاتح</string>
   <string name="preferences__dark_theme">داكن</string>
@@ -871,7 +880,7 @@
   <!--refreshing push directory from menu-->
   <string name="push_directory__menu_refresh">تحيدث قائمة الاتصال</string>
   <!--conversation_callable_insecure-->
-  <string name="conversation_callable_insecure__menu_call">أتصل</string>
+  <string name="conversation_callable_insecure__menu_call">اتصل</string>
   <!--conversation_callable_secure-->
   <string name="conversation_callable_secure__menu_call">مكالمة سيجنال</string>
   <!--conversation_context-->
@@ -889,11 +898,14 @@
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">احذف المختار</string>
   <string name="conversation_list_batch__menu_select_all">اختر الكل</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">تم اختيار الأرشيف</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">اختيار الغير مأرشف</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">بحث</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">صورة جهة الاتصال</string>
   <string name="conversation_list_item_view__error_alert">تنبيه بخطأ</string>
+  <string name="conversation_list_item_view__archived">الأرشيف</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">محادثة جديدة</string>
   <!--conversation_secure_verified-->
@@ -931,6 +943,7 @@
   <string name="text_secure_normal__menu_clear_passphrase">أقفل</string>
   <string name="text_secure_normal__mark_all_as_read">اعتبارها رسائل مقروءة</string>
   <string name="text_secure_normal__invite_friends">دعوة الأصدقاء</string>
+  <string name="text_secure_normal__help">مساعدة</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">لقد انتهت صلاحية هذه النسخة من سيجنال!</string>
   <string name="reminder_header_expired_build_details">رجاء التحديث لآخر إصداره من التطبيق. لن ترسل الرسائل بنجاح بعد الآن.</string>
@@ -942,7 +955,7 @@
   <string name="reminder_header_sms_import_text">أضغط لنسخ الرسائل النصية القصيرة على الهاتف إلى قاعدة البيانات المشفرة.</string>
   <string name="reminder_header_sms_import_button">استيراد</string>
   <string name="reminder_header_push_title">تفعيل رسائل ومكالمات سيجنال</string>
-  <string name="reminder_header_push_text">ترقية تجربتك في التواصل.</string>
+  <string name="reminder_header_push_text">ترقية التطبيق من أجل تواصل أفضل.</string>
   <string name="reminder_header_push_button">تفعيل</string>
   <string name="reminder_header_invite_title">دعوة إلى سيجنال</string>
   <string name="reminder_header_invite_text">انتقل بالمحادثة مع %1$s  للمستوى التالي.</string>
@@ -958,7 +971,7 @@
   <!--media_preview-->
   <string name="media_preview__save_title">أحفظ</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">معاينة الصورة</string>
+  <string name="media_preview_activity__image_content_description">معاينه الصوره</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">إنعاش</string>
   <!--redphone_audio_popup_menu-->

res/values-be/strings.xml

@@ -9,7 +9,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Вы яшчэ не ўсталявалі пароль</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s паведамленняў у гутарцы</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Выдаліць усе старыя паведамленні зараз?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Вы ўпэўненыя, што хочаце адразу абрэзаць усе гутаркі у %s самых апошніх паведамленняў?</string>
   <string name="ApplicationPreferencesActivity_delete">Выдаліць</string>
   <string name="ApplicationPreferencesActivity_disable">Выключыць</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Памылка падлучэння да сервера!</string>
@@ -96,9 +95,9 @@
   <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_deleting">Выдаленне</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Выдаленне абраных гутарак...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Паведамленне абмену ключамі...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Выкарыстоўваць кастомны: %s</string>
   <string name="CustomDefaultPreference_using_default">Выкарыстоўваць стандартны: %s</string>
@@ -294,6 +293,7 @@
   <string name="MessageNotifier_media_message">Мультымедыя паведамленне</string>
   <!--QuickResponseService-->
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_message">Новае паведамленне</string>
   <!--attachment_type_selector-->
   <!--change_passphrase_activity-->
   <!--contact_selection_activity-->
@@ -435,7 +435,6 @@
   <string name="AndroidManifest__change_passphrase">Змяніць пароль</string>
   <string name="AndroidManifest__verify_identity">Праверыць ідэнтыфікатар</string>
   <string name="AndroidManifest__log_submit">Даслаць логі</string>
-  <string name="AndroidManifest__media_preview">Папярэдні прагляд медыя</string>
   <string name="AndroidManifest__media_overview">Усе выявы</string>
   <string name="AndroidManifest__media_overview_named">Усе выявы з %1$s</string>
   <!--arrays.xml-->
@@ -483,7 +482,6 @@
   <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__inthread_notifications">Апавяшчэнне ў гутарцы</string>
   <string name="preferences__repeat_alerts">Паўтарыць папярэджанні</string>
   <string name="preferences__never">Ніколі</string>
   <string name="preferences__one_time">Адзін раз</string>
@@ -519,11 +517,8 @@
   <string name="preferences__mmsc_password">MMSC Password</string>
   <string name="preferences__sms_delivery_reports">Пацверджанне дастаўкі SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Патрабаваць пацверджанне дастаўкі для кожнай SMS якую вы даслалі</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Аўтаматычна выдаляць старыя паведамленні, калі размова перавышае зададзеную даўжыню</string>
   <string name="preferences__delete_old_messages">Выдаляць старыя паведамленні</string>
   <string name="preferences__conversation_length_limit">Ліміт даўжыні размовы</string>
-  <string name="preferences__trim_all_threads_now">Абрэзаць усе размовы зараз</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Прасканаваць усе размовы і прымяніць абмежаванне на іх даўжыню</string>
   <string name="preferences__light_theme">Светлы</string>
   <string name="preferences__dark_theme">Цёмны</string>
   <string name="preferences__appearance">З\'яўленне</string>
@@ -609,7 +604,6 @@
   <!--media_preview-->
   <string name="media_preview__save_title">Захаваць</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Перадпрагляд выявы</string>
   <!--new_conversation_activity-->
   <!--redphone_audio_popup_menu-->
   <!--Trimmer-->

res/values-bg/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Все още не си сложил парола!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s съобщения на разговор</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Изтрий всички стари съобщения сега?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Сигурен ли си, че искаш скъсиш всички разговори до %s съобщения във всяка?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Това ще скъси всички разговори до %sте най-нови съобщения.</string>
   <string name="ApplicationPreferencesActivity_delete">Изтрий</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Изключи паролата?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -152,9 +152,16 @@
     <item quantity="other">Това ще изтрие невъзвращаемо всичките  %1$d избрани разговори.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Изтриване</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Изтриване на избраните разговори...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Изтриване на избраните разговори...</string>
+  <string name="ConversationListFragment_archived_conversations">Архивирани разговори</string>
+  <string name="ConversationListFragment_undo">ВЪЗСТАНОВИ</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Разговорът е преместен във входящата кутия</string>
+  <string name="ConversationListFragment_archived_conversation">Разговорът е архивиран</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Разговорът е преместен във входящата кутия</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Съобщение за обмяна на ключовете...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Архивирани разговори (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Използване на специален:  %s</string>
   <string name="CustomDefaultPreference_using_default">Използване на подразбиращ се: %s</string>
@@ -174,6 +181,7 @@
   <string name="DeviceListItem_unnamed_device">Некръстено устройство</string>
   <string name="DeviceListItem_linked_s">Свързан с %s</string>
   <string name="DeviceListItem_last_active_s">Последна активност %s</string>
+  <string name="DeviceListItem_today">Днес</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Сподели с</string>
   <!--ExperienceUpgradeActivity-->
@@ -194,14 +202,14 @@
   <string name="ExportFragment_success">Успех!</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 Services. Комуникация през канала с данни е забранен, моля опитайте да се пререгистрирате през менюто с настройки на Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal не успя да се регистрира с Google Play Services. Signal съообщения и разговори са деактивирани, моля пререгистрирайте през менюто Настройки &gt; Допълнителние.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Нова група</string>
   <string name="GroupCreateActivity_actionbar_update_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_you_dont_support_push">Не сте регистриран, за да използвате канала за данни, така че Signal групите ще бъдат за деактивирани.</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>
   <string name="GroupCreateActivity_contacts_invalid_number">Един от членовете на групата има номер, който не може да бъде разпознат правилно. Моля, оправи номера на контакта или го премахни.</string>
@@ -316,6 +324,8 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <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>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Въведи паролата</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signal икона</string>
@@ -499,7 +509,7 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <string name="QuickResponseService_problem_sending_message">Проблем при изпрашане на съобщение!</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Ново съобщение!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Ново съобщение</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Изображение</string>
   <string name="attachment_type_selector__audio">Аудио</string>
@@ -665,8 +675,7 @@ Signal може да ти се обади, за да потвърди номер
   <string name="registration_progress_activity__call_me">Обади ми се</string>
   <string name="registration_progress_activity__edit_number">Промени номера</string>
   <string name="registration_progress_activity__connectivity_error">Грешка при свързването.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal не успя да се свъже с пуш интернет услугата.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal не успя да се свърже със сървъра.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Няколко вероятни
 проблема включват:
 </string>
@@ -718,12 +727,13 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <string name="AndroidManifest__change_passphrase">Смени паролата</string>
   <string name="AndroidManifest__verify_identity">Провери самоличността</string>
   <string name="AndroidManifest__log_submit">Изпрати доклад</string>
-  <string name="AndroidManifest__media_preview">Преглед на файла</string>
+  <string name="AndroidManifest__media_preview">Преглед на медията</string>
   <string name="AndroidManifest__media_overview">Всички изображения</string>
   <string name="AndroidManifest__media_overview_named">Всички изображения с %1$s</string>
   <string name="AndroidManifest__message_details">Информация за съобщението</string>
   <string name="AndroidManifest_manage_linked_devices">Управление на свързани устройства</string>
   <string name="AndroidManifest__invite_friends">Поканете приятели</string>
+  <string name="AndroidManifest_conversations_archive">Разговорите са архивирани</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Внасяне / изнасяне</string>
   <string name="arrays__your_identity_key">Вашият ключ за самоличност</string>
@@ -788,7 +798,7 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <string name="preferences__sound">Мелодия</string>
   <string name="preferences__change_notification_sound">Промени звуков сигнал за известие</string>
   <string name="preferences__silent">Тих</string>
-  <string name="preferences__inthread_notifications">Известия по време на разговор</string>
+  <string name="preferences__in_conversation_notifications">Известия по време на разговор</string>
   <string name="preferences__play_inthread_notifications">Пускай звук за известие докато гледаш активен чат</string>
   <string name="preferences__repeat_alerts">Повтарящи се аларми</string>
   <string name="preferences__never">Никога</string>
@@ -826,12 +836,12 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <string name="preferences__mmsc_password">MMSC Парола</string>
   <string name="preferences__sms_delivery_reports">SMS потвърждения за получаване</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Поискай потвърждение при получаване за всяко изпратено SMS съобщение</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Автоматично изтрий най-старите съобщения, когато разговорът превиши определена дължина</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Автоматично изтрий най-старите съобщения, когато разговорът достигне определена дължина.</string>
   <string name="preferences__delete_old_messages">Изтрий старите съобщения</string>
   <string name="preferences__chats">Чат и мултимедия</string>
   <string name="preferences__conversation_length_limit">Граница за дължина на разговора</string>
-  <string name="preferences__trim_all_threads_now">Скъси всички разговори сега</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Сканирай всички разговори и приложи ограничението за дължина</string>
+  <string name="preferences__trim_all_conversations_now">Скъси всички разговори сега</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Сканирай всички разговори и приложи ограничението за дължина на разговори</string>
   <string name="preferences__devices">Устройства</string>
   <string name="preferences__light_theme">Светла</string>
   <string name="preferences__dark_theme">Тъмна</string>
@@ -887,11 +897,14 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Изтрий избраното</string>
   <string name="conversation_list_batch__menu_select_all">Избери всичко</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Архивът е избран</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Деархивирай изрбания</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Търси</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Изображение на контакта</string>
   <string name="conversation_list_item_view__error_alert">Известие за грешка</string>
+  <string name="conversation_list_item_view__archived">Архивиран</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Нов разговор</string>
   <!--conversation_secure_verified-->
@@ -957,7 +970,7 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <!--media_preview-->
   <string name="media_preview__save_title">Запази</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Преглед на изображение</string>
+  <string name="media_preview_activity__image_content_description">Преглед на изображението</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Освежи</string>
   <!--redphone_audio_popup_menu-->

res/values-cs/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Dosud nemáte nastavené heslo!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s zpráv na konverzaci</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Smazat všechny staré zprávy?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Opravdu chcete všechny konverzace zkrátit na posledních %s zpráv?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Tímto zkrátíte všechny konverzace na posledních %s zpráv.</string>
   <string name="ApplicationPreferencesActivity_delete">Smazat</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Zakázat heslo?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -157,9 +157,16 @@ kontakt</string>
     <item quantity="other">Tímto trvale smažete všech %1$d označených konverzací.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Mažu</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Mažu označené konverzace...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Mažu označené konverzace...</string>
+  <string name="ConversationListFragment_archived_conversations">Archivované konverzace</string>
+  <string name="ConversationListFragment_undo">ZPĚT</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Přesunuta konverzace do složky příchozích zpráv</string>
+  <string name="ConversationListFragment_archived_conversation">Archivovaná konverzace</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Přesunuty konverzace do složky příchozích zpráv</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Předávání klíčů...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Archivované konverzace (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Používá se vlastní: %s</string>
   <string name="CustomDefaultPreference_using_default">Používá se výchozí: %s</string>
@@ -179,6 +186,7 @@ kontakt</string>
   <string name="DeviceListItem_unnamed_device">Nepojmenované zřízení</string>
   <string name="DeviceListItem_linked_s">Provázáno %s</string>
   <string name="DeviceListItem_last_active_s">Naposled aktivní %s</string>
+  <string name="DeviceListItem_today">Dnes</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Sdílet s</string>
   <!--ExperienceUpgradeActivity-->
@@ -199,14 +207,14 @@ kontakt</string>
   <string name="ExportFragment_success">Úspěšně dokončeno!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trvalá chyba komunikace Signal!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal se nemůže registrovat k službě Google Play. Datová komunikace byla zakázána, prosím zkuste se znovu registrovat v menu nastavení Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Sginal se nemůže registrovat k službě Google Play. Zprávy a volání jsou proto zakázány: Prosím zkuste se znovu registrovat v menu Nastavení &gt; Rozšířené.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nová skupina</string>
   <string name="GroupCreateActivity_actionbar_update_title">Upravit skupinu</string>
   <string name="GroupCreateActivity_group_name_hint">Název skupiny</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nová MMS skupina</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Vybrali jste kontakt</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Nejste zaregistrován k použití datové komunikace, takže jsou skupiny Signal zakázány.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Nejste zaregistrován k použití Signalu pro zprávy a volání, takže jsou skupiny Signal zakázány. Prosím registrujte se v Nastavení &gt; Rozšířené</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Došlo k neočekávané chybě, která znemožnila vytvoření skupiny.</string>
   <string name="GroupCreateActivity_contacts_no_members">Ve vaší skupině musí být alespoň jeden kontakt.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Jeden z členů Vaší skupiny má číslo, které se nedaří správně zpracovat. Prosím opravte jej nebo odstraňte a zkuste znovu.</string>
@@ -319,6 +327,8 @@ tuto zálohu importovali, mohou se některé zprávy objevit vícekrát.</string
   <string name="DeviceProvisioningActivity_content_progress_key_error">Neplatný QR kód.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Omlouváme se, ale máte provázáno příliš mnoho zařízení, pokuste se některé odpojit...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Omlouváme se, ale toto není platný QR kód pro provázání zařízení</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Provázat zařízení Signal?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Zdá se se snažíte provázat zařízení Signal použitím jiné skennovací aplikace. Pro vaši ochranu, prosím oskenujete kód ještě jednou z aplikace Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Zadat heslo</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona Signal</string>
@@ -496,7 +506,7 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="QuickResponseService_problem_sending_message">Problém při odesílání zprávy!</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Nová zpráva!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Nová zpráva</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Obrázek</string>
   <string name="attachment_type_selector__audio">Audio</string>
@@ -662,8 +672,7 @@ Je možné také použít telefonní ověření. Signal vám může zavolat a ov
   <string name="registration_progress_activity__call_me">Zavolej mi</string>
   <string name="registration_progress_activity__edit_number">Upravit číslo</string>
   <string name="registration_progress_activity__connectivity_error">Chyba připojení.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal se nemůže připojit ke službe push.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal se nemůže připojit k serveru.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Příčiny mohou být:</string>
   <string name="registration_progress_activity__no_network_connectivity">Není připojení
         k síti.
@@ -715,12 +724,13 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="AndroidManifest__change_passphrase">Změnit heslo</string>
   <string name="AndroidManifest__verify_identity">Ověření identity</string>
   <string name="AndroidManifest__log_submit">Odeslat ladící logy</string>
-  <string name="AndroidManifest__media_preview">Náhled dat</string>
+  <string name="AndroidManifest__media_preview">Náhled multimedií</string>
   <string name="AndroidManifest__media_overview">Všechny obrázky</string>
   <string name="AndroidManifest__media_overview_named">Všechny obrázky s %1$s</string>
   <string name="AndroidManifest__message_details">Podrobnosti zprávy</string>
   <string name="AndroidManifest_manage_linked_devices">Spravovat provázaná zařízení</string>
   <string name="AndroidManifest__invite_friends">Pozvat přátele</string>
+  <string name="AndroidManifest_conversations_archive">Archiv konverzací</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / export</string>
   <string name="arrays__your_identity_key">Váš identifikační klíč</string>
@@ -756,7 +766,7 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="preferences__input_settings">Nastavení vstupu</string>
   <string name="preferences__enable_enter_key_title">Používat Enter</string>
   <string name="preferences__replace_smiley_with_enter_key">Nahradit klávesu smajlík klávesou enter</string>
-  <string name="preferences__pref_enter_sends_title">Klávesa \'Enter\' odesílá</string>
+  <string name="preferences__pref_enter_sends_title">Klávesa Enter odesílá</string>
   <string name="preferences__pressing_the_enter_key_will_send_text_messages">Stisk tlačítka \'enter\' na klávesnici odešle zprávu</string>
   <string name="preferences__display_settings">Nastavení zobrazení</string>
   <string name="preferences__choose_identity">Zvolit identitu</string>
@@ -786,7 +796,7 @@ Signal se nedočkal přijetí ověřovací SMS. </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__inthread_notifications">Upozornění v konverzaci</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>
   <string name="preferences__repeat_alerts">Opakovat upozornění</string>
   <string name="preferences__never">Nikdy</string>
@@ -824,12 +834,12 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="preferences__mmsc_password">MMSC Heslo</string>
   <string name="preferences__sms_delivery_reports">Doručenky SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">U každé odeslané zprávy požadovat potvrzení o doručení</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticky mazat starší zprávy jakmile konverzace přesáhne určitou délku</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Automaticky mazat starší zprávy jakmile konverzace přesáhne nastavenou délku</string>
   <string name="preferences__delete_old_messages">Smazat staré zprávy</string>
   <string name="preferences__chats">Konverzace a media</string>
   <string name="preferences__conversation_length_limit">Limit délky konverzací</string>
-  <string name="preferences__trim_all_threads_now">Zkrátit konverzace</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Pohledat všechny konverzace a uplatnit limit délky.</string>
+  <string name="preferences__trim_all_conversations_now">Zkrátit všechny konverzace teď</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Prohledat všechny konverzace a uplatnit limit délky.</string>
   <string name="preferences__devices">Zařízení</string>
   <string name="preferences__light_theme">Světlý</string>
   <string name="preferences__dark_theme">Tmavý</string>
@@ -885,11 +895,14 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Smazat označené</string>
   <string name="conversation_list_batch__menu_select_all">Označit vše</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Vybrán archiv</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Obnovit vybrané z archivu</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Hledat</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Fotografie kontaktu</string>
   <string name="conversation_list_item_view__error_alert">Upozornění na chybu</string>
+  <string name="conversation_list_item_view__archived">Archivováno</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nová konverzace</string>
   <!--conversation_secure_verified-->

res/values-da/strings.xml

@@ -10,7 +10,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har endnu ikke indtastet et kodeord!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s beskeder pr. samtale</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Slet alle gamle beskeder?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Er du sikker på, du vil trimme ALLE samtaletråde til de sidste %s beskeder?</string>
   <string name="ApplicationPreferencesActivity_delete">Slet</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Deaktivér kodeord?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -156,9 +155,9 @@ denne kontakt.</string>
     <item quantity="other">Dette vil slette alle %1$d valgte samtaler permanent.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Sletter</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Sletter valgte tråde...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Udvekslingsnøgle...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Anvender tilpasset: %s</string>
   <string name="CustomDefaultPreference_using_default">Anvender standard: %s</string>
@@ -198,14 +197,12 @@ denne kontakt.</string>
   <string name="ExportFragment_success">Fuldført!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent fejl i Signal-kommunikationen!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal kunne ikke registreres hos Google Play Services. Kommunikation over data-kanalen er deaktiveret. Prøv at genregistrere via indstillingerne i Signal.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ny gruppe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Opdatér gruppe</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppenavn</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Ny MMS-gruppe</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Du har valgt en person der ikke understøtter Signal-grupper. Denne gruppe vil være en MMS-gruppe.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Du er ikke registreret som bruger af datakanalen, så Signal-grupper er deaktiveret.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">En ukendt fejl har medført, at oprettelse af gruppen mislykkedes.</string>
   <string name="GroupCreateActivity_contacts_no_members">Der skal være mindst én person i gruppen!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">En kontakt i gruppen har et nummer, der ikke kan læses. Ret nummeret eller fjern kontakten og prøv igen.</string>
@@ -506,6 +503,7 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Hurtig-svar utilgængelig når Signal er låst!</string>
   <string name="QuickResponseService_problem_sending_message">Problem med at sende besked!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_message">Ny besked</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Billede</string>
   <string name="attachment_type_selector__audio">Lyd</string>
@@ -667,8 +665,6 @@ Signal kan også ringe til dig og verificere dit telefonnummer. Tryk på \'Ring
   <string name="registration_progress_activity__call_me">Ring mig op</string>
   <string name="registration_progress_activity__edit_number">Redigér nummer</string>
   <string name="registration_progress_activity__connectivity_error">Forbindelsesfejl.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal kunne ikke forbinde til push-service.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Mulige problemer:</string>
   <string name="registration_progress_activity__no_network_connectivity">Ingen netværksforbindelse.</string>
   <string name="registration_progress_activity__restrictive_firewall">Restriktiv firewall.</string>
@@ -711,7 +707,6 @@ mislykkedes.</string>
   <string name="AndroidManifest__change_passphrase">Ændr kodeord</string>
   <string name="AndroidManifest__verify_identity">Verificér identitet</string>
   <string name="AndroidManifest__log_submit">Indsend fejlfindingslogge</string>
-  <string name="AndroidManifest__media_preview">Forhåndsvisning af multimedie</string>
   <string name="AndroidManifest__media_overview">Alle billeder</string>
   <string name="AndroidManifest__media_overview_named">Alle billeder med %1$s</string>
   <string name="AndroidManifest_manage_linked_devices">Håndtér tilkoblede enheder</string>
@@ -780,7 +775,6 @@ mislykkedes.</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__inthread_notifications">I beskeder</string>
   <string name="preferences__play_inthread_notifications">Afspil notifikationslyd, når en aktiv samtale vises</string>
   <string name="preferences__repeat_alerts">Gentag notifikationer</string>
   <string name="preferences__never">Aldrig</string>
@@ -818,12 +812,9 @@ mislykkedes.</string>
   <string name="preferences__mmsc_password">MMSC-kodeord</string>
   <string name="preferences__sms_delivery_reports">Leveringsrapport for SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Bed om en leveringsrapport for hver SMS-besked, du sender</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Slet gamle beskeder automatisk, når en samtaletråd overskrider en specificeret størrelse</string>
   <string name="preferences__delete_old_messages">Slet gamle beskeder</string>
   <string name="preferences__chats">Chat og medier</string>
   <string name="preferences__conversation_length_limit">Grænse på samtaler</string>
-  <string name="preferences__trim_all_threads_now">Trim alle samtaletråde nu</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skan alle samtaletråde og håndhæv grænsen for størrelsen af samtaler</string>
   <string name="preferences__devices">Enheder</string>
   <string name="preferences__light_theme">Lys</string>
   <string name="preferences__dark_theme">Mørk</string>
@@ -948,7 +939,6 @@ mislykkedes.</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Gem</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Forhåndsvisning af billede</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Opdater</string>
   <!--redphone_audio_popup_menu-->

res/values-de/strings.xml

@@ -8,18 +8,18 @@
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Momentan: %s</string>
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Sie haben noch kein Passwort festgelegt!</string>
-  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s Nachrichten pro Unterhaltung</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">%s Nachrichten je Unterhaltung</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Alle alten Nachrichten löschen?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Wollen Sie wirklich alle Nachrichten in sämtlichen Unterhaltungen bis auf die letzten %s Nachrichten löschen?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Alle Unterhaltungen bis auf die %s letzten Nachrichten kürzen.</string>
   <string name="ApplicationPreferencesActivity_delete">Löschen</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Passwort deaktivieren?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
 Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="ApplicationPreferencesActivity_disable">Deaktivieren</string>
   <string name="ApplicationPreferencesActivity_unregistering">Registrierung löschen</string>
-  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Signal-Registrierung wird gelöscht …</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Signal-Nachrichten und -Telefonie deaktivieren?</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Signal-Nachrichten und -Telefonie durch Löschen Ihrer Registrierung vom Server deaktivieren. Sie werden Ihre Rufnummer erneut registrieren müssen, um zukünftig wieder verschlüsselt zu kommunizieren.</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Registrierung für Signal-Nachrichten und -Anrufe wird gelöscht …</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Signal-Nachrichten und -Anrufe deaktivieren?</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Signal-Nachrichten und -Anrufe durch Löschen Ihrer Registrierung vom Server deaktivieren. Sie werden Ihre Rufnummer erneut registrieren müssen, um zukünftig wieder verschlüsselt zu kommunizieren.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fehler beim Verbinden zum Server!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS aktiviert</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Standard-SMS-App ändern</string>
@@ -77,7 +77,7 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Hilfreich bei Problemen mit der Verschlüsselung in dieser Unterhaltung. Ihre Nachrichten bleiben erhalten.</string>
   <string name="ConversationActivity_reset">Neu starten</string>
   <string name="ConversationActivity_delete_thread_question">Unterhaltung löschen?</string>
-  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Alle Nachrichten dieser Unterhaltung dauerhaft löschen.</string>
+  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Alle Nachrichten dieser Unterhaltung unwiderruflich löschen.</string>
   <string name="ConversationActivity_add_attachment">Anhang hinzufügen</string>
   <string name="ConversationActivity_select_contact_info">Kontaktinfo wählen</string>
   <string name="ConversationActivity_compose_message">Nachricht verfassen</string>
@@ -151,9 +151,16 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
     <item quantity="other">Unwiderruflich alle %1$d ausgewählten Unterhaltungen löschen.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Löschen</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Ausgewählte Unterhaltungen werden gelöscht …</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Ausgewählte Unterhaltungen werden gelöscht …</string>
+  <string name="ConversationListFragment_archived_conversations">Unterhaltungen archiviert</string>
+  <string name="ConversationListFragment_undo">RÜCKGÄNGIG</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Unterhaltung zum Eingang verschoben</string>
+  <string name="ConversationListFragment_archived_conversation">Unterhaltung archiviert</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Unterhaltungen zum Eingang verschoben</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Schlüsselaustausch-Nachricht …</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Archivierte Unterhaltungen (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Benutzerdefiniert: %s</string>
   <string name="CustomDefaultPreference_using_default">Standard: %s</string>
@@ -173,6 +180,7 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="DeviceListItem_unnamed_device">Unbenanntes Gerät</string>
   <string name="DeviceListItem_linked_s">%s verknüpft</string>
   <string name="DeviceListItem_last_active_s">Zuletzt aktiv %s</string>
+  <string name="DeviceListItem_today">Heute</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Teilen mit</string>
   <!--ExperienceUpgradeActivity-->
@@ -184,7 +192,7 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Exportieren</string>
   <string name="ExportFragment_export_plaintext_to_storage">Klartextsicherung exportieren?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Achtung: Exportiert Ihre Signal-Nachrichten unverschlüsselt in den Gerätespeicher.</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Achtung: Exportiert Ihre Signal-Inhalte unverschlüsselt in den Gerätespeicher.</string>
   <string name="ExportFragment_cancel">Abbruch</string>
   <string name="ExportFragment_exporting">Exportieren</string>
   <string name="ExportFragment_exporting_plaintext_to_storage">Klartext wird in Gerätespeicher exportiert …</string>
@@ -193,14 +201,14 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="ExportFragment_success">Erfolgreich!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Dauerhafter Signal-Kommunikationsfehler!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal konnte keine Verbindung zu den Google Play-Diensten herstellen. Signal-Nachrichten wurden daher deaktiviert. Bitte über das Menü „Einstellungen“ erneut registrieren.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal konnte nicht für die Google Play-Dienste registriert werden. Signal-Nachrichten und -Anrufe wurden daher deaktiviert. Bitte registrieren Sie Signal im Menü „Einstellungen“ &gt; „Weitere Einstellungen“ erneut.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Neue Gruppe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Gruppe bearbeiten</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppenname</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Neue MMS-Gruppe</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Sie haben einen Kontakt ausgewählt, der Signal-Gruppen nicht unterstützt. Daher wird dies eine MMS-Gruppe sein.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Sie sind nicht für Signal-Nachrichten registriert. Signal-Gruppen sind daher deaktiviert.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Sie sind nicht für Signal-Nachrichten und -Anrufe registriert, daher sind Signal-Gruppen deaktiviert. Bitte registrieren Sie Signal im Menü „Einstellungen“ &gt; „Weitere Einstellungen“.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Gruppe konnte aufgrund eines unerwartet aufgetretenen Fehlers nicht erstellt werden.</string>
   <string name="GroupCreateActivity_contacts_no_members">Sie brauchen mindestens eine Person in Ihrer Gruppe!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Eines der Gruppenmitglieder hat eine nicht korrekt lesbare Rufnummer. Bitte beheben oder Kontakt entfernen und erneut versuchen.</string>
@@ -306,6 +314,8 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ungültiger QR-Code.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Es sind bereits zu viele Geräte verknüpft. Versuchen Sie, mindestens eines zu entfernen …</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Dies ist leider kein gültiger QR-Code zur Geräteverknüpfung.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Signal-Gerät verknüpfen?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Sie versuchen offenbar, ein Signal-Gerät mithilfe einer Scanner-App eines Drittanbieters zu verknüpfen. Scannen Sie den QR-Code zu Ihrem Schutz noch einmal direkt aus Signal ein.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Passwort eingeben</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signal-Symbol</string>
@@ -347,7 +357,7 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   <string name="RedPhone_login_failed">Anmeldung fehlgeschlagen!</string>
   <string name="RedPhone_message_from_the_server">Nachricht vom Server</string>
   <string name="RedPhone_number_not_registered">Rufnummer nicht registriert!</string>
-  <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Die gewählte Rufnummer unterstützt keine sichere Telefonie!</string>
+  <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Die gewählte Rufnummer unterstützt keine sicheren Anrufe!</string>
   <string name="RedPhone_got_it">OK</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_signal">Mit Signal verbinden</string>
@@ -482,7 +492,7 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="QuickResponseService_problem_sending_message">Problem beim Senden der Nachricht!</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Neue Nachricht!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Neue Nachricht</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Bild</string>
   <string name="attachment_type_selector__audio">Audio</string>
@@ -509,9 +519,9 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <!--conversation_title_view-->
   <string name="conversation_title_view__conversation_muted">Unterhaltung stummgeschaltet</string>
   <!--conversation_activity-->
-  <string name="conversation_activity__type_message_push">Signal-Nachricht schreiben</string>
-  <string name="conversation_activity__type_message_sms_insecure">Unsichere SMS schreiben</string>
-  <string name="conversation_activity__type_message_mms_insecure">Unsichere MMS schreiben</string>
+  <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__send">Senden</string>
   <string name="conversation_activity__remove">Entfernen</string>
   <string name="conversation_activity__window_description">Unterhaltung mit %1$s</string>
@@ -644,8 +654,7 @@ Signal kann Sie zur Überprüfung Ihrer Rufnummer auch anrufen. Tippen Sie auf
   <string name="registration_progress_activity__call_me">Mich anrufen</string>
   <string name="registration_progress_activity__edit_number">Rufnummer bearbeiten</string>
   <string name="registration_progress_activity__connectivity_error">Verbindungsfehler.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Verbindung zum Signal-Dienst konnte nicht hergestellt werden.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Verbindung mit Signal-Server konnte nicht hergestellt werden.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Einige der möglichen Probleme beinhalten:</string>
   <string name="registration_progress_activity__no_network_connectivity">Keine Netzwerkverbindung.</string>
   <string name="registration_progress_activity__your_device_needs_network_connectivity">Um diese Signal-Funktion nutzen zu können, benötigt Ihr Gerät eine Netzverbindung, Stellen Sie sicher, dass eine mobile Daten- oder WLAN-Verbindung besteht.</string>
@@ -688,12 +697,13 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="AndroidManifest__change_passphrase">Passwort ändern</string>
   <string name="AndroidManifest__verify_identity">Kontakt überprüfen</string>
   <string name="AndroidManifest__log_submit">Diagnoseprotokoll übermitteln</string>
-  <string name="AndroidManifest__media_preview">Dateivorschau</string>
+  <string name="AndroidManifest__media_preview">Medienvorschau</string>
   <string name="AndroidManifest__media_overview">Alle Bilder</string>
   <string name="AndroidManifest__media_overview_named">Alle Bilder mit %1$s</string>
   <string name="AndroidManifest__message_details">Nachrichtendetails</string>
   <string name="AndroidManifest_manage_linked_devices">Verknüpfte Geräte verwalten</string>
   <string name="AndroidManifest__invite_friends">Freunde einladen</string>
+  <string name="AndroidManifest_conversations_archive">Archivierte Unterhaltungen</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Datensicherung</string>
   <string name="arrays__your_identity_key">Ihr Schlüssel</string>
@@ -755,10 +765,10 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__pref_led_blink_custom_pattern_on_for">Aktiviert für:</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">Benachrichtigungston</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__inthread_notifications">Immer benachrichtigen</string>
+  <string name="preferences__in_conversation_notifications">Immer benachrichtigen</string>
   <string name="preferences__play_inthread_notifications">Benachrichtigungston während aktiver Unterhaltungen wiedergeben</string>
   <string name="preferences__repeat_alerts">Benachrichtigungen wiederholen</string>
   <string name="preferences__never">Nie</string>
@@ -796,12 +806,12 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__mmsc_password">MMSC-Passwort</string>
   <string name="preferences__sms_delivery_reports">SMS-Zustellberichte</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zustellbericht für jede gesendete SMS anfordern</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, sobald die Unterhaltung eine bestimmte Länge überschreitet</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Alte Nachrichten automatisch löschen, sobald eine Unterhaltung die angegebene Länge überschreitet</string>
   <string name="preferences__delete_old_messages">Alte Nachrichten löschen</string>
   <string name="preferences__chats">Unterhaltungen und Multimedia</string>
   <string name="preferences__conversation_length_limit">Höchstzahl an Nachrichten</string>
-  <string name="preferences__trim_all_threads_now">Alle Unterhaltungen jetzt kürzen</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle Unterhaltungen prüfen und deren Längenbegrenzung sicherstellen</string>
+  <string name="preferences__trim_all_conversations_now">Alle Unterhaltungen jetzt kürzen</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Alle Unterhaltungen prüfen und deren Längenbegrenzung sicherstellen</string>
   <string name="preferences__devices">Geräte</string>
   <string name="preferences__light_theme">Hell</string>
   <string name="preferences__dark_theme">Dunkel</string>
@@ -811,7 +821,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__default">Standard</string>
   <string name="preferences__language">Sprache</string>
   <string name="preferences__language_summary">Sprache %s</string>
-  <string name="preferences__signal_messages_and_calls">Signal-Nachrichten und -Telefonie</string>
+  <string name="preferences__signal_messages_and_calls">Signal-Nachrichten und -Anrufe</string>
   <string name="preferences__free_private_messages_and_calls">Kostenlos und verschlüsselt mit Signal-Nutzern Nachrichten austauschen und telefonieren</string>
   <string name="preferences__submit_debug_log">Diagnoseprotokoll übermitteln</string>
   <string name="preferences__support_wifi_calling">Kompatibilität WLAN-Telefonie</string>
@@ -857,11 +867,14 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Ausgewählte löschen</string>
   <string name="conversation_list_batch__menu_select_all">Alle auswählen</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Ausgewählte archivieren</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Ausgewählte zum Eingang verschieben</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Suchen</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Kontaktbild</string>
   <string name="conversation_list_item_view__error_alert">Fehlerbenachrichtigung</string>
+  <string name="conversation_list_item_view__archived">Archiviert</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Neue Unterhaltung</string>
   <!--conversation_secure_verified-->
@@ -910,7 +923,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="reminder_header_sms_import_title">System-SMS importieren</string>
   <string name="reminder_header_sms_import_text">Antippen, um auf dem Telefon gespeicherte SMS-Nachrichten in die verschlüsselte Datenbank zu importieren.</string>
   <string name="reminder_header_sms_import_button">IMPORTIEREN</string>
-  <string name="reminder_header_push_title">Signal-Nachrichten und -Telefonie aktivieren</string>
+  <string name="reminder_header_push_title">Signal-Nachrichten und -Anrufe aktivieren</string>
   <string name="reminder_header_push_text">Verbessern Sie Ihr Kommunikationserlebnis.</string>
   <string name="reminder_header_push_button">AKTIVIEREN</string>
   <string name="reminder_header_invite_title">Zu Signal einladen</string>

res/values-el/strings.xml

@@ -10,7 +10,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Δεν έχεις ορίσει συνθηματικό!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s μηνύματα ανά συζήτηση</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Διαγραφή όλων των παλιών μηνυμάτων τώρα;</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Είσαι σίγουρος/η πως θέλεις να μειωθούν όλες οι συζητήσεις στα %s πιο πρόσφατα μηνύματα;</string>
   <string name="ApplicationPreferencesActivity_delete">Διαγραφή</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Απενεργοποίηση συνθηματικού;</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -160,9 +159,15 @@
     <item quantity="other">Αυτό θα διαγράψει οριστικά όλες τις %1$d επιλεγμένες συζητήσεις.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Διαγραφή</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Διαγραφή επιλεγμένων συζητήσεων...</string>
+  <string name="ConversationListFragment_archived_conversations">Αρχειοθετημένες συζητήσεις</string>
+  <string name="ConversationListFragment_undo">ΑΝΑΙΡΕΣΗ</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Η συζήτηση μετακινήθηκε στα εισερχόμενα</string>
+  <string name="ConversationListFragment_archived_conversation">Η συζήτηση αρχειοθετήθηκε</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Οι συζητήσεις μετακινήθηκαν στα εισερχόμενα</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Μήνυμα ανταλλαγής κλειδιών...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Αρχειοθετήθηκαν οι συζητήσεις (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Χρησιμοποιείται το προσαρμοσμένο: %s</string>
   <string name="CustomDefaultPreference_using_default">Χρησιμοποιείται το προκαθορισμένο: %s</string>
@@ -202,14 +207,14 @@
   <string name="ExportFragment_success">Επιτυχία!</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.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Το Signal δεν μπόρεσε να εγγραφτεί στις Υπηρεσίες Google Play. Τα μηνύματα και οι κλήσεις του Signal έχουν απενεργοποιηθεί. Παρακαλώ προσπάθησε να επανεγγραφτείς στις Ρυθμίσεις &gt; Προχωρημένες Ρυθμίσεις.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Νέα ομάδα</string>
   <string name="GroupCreateActivity_actionbar_update_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_you_dont_support_push">Δεν είσαι εγγεγραμμένος/η για τη χρήση του καναλιού δεδομένων, οπότε οι ομάδες Signal είναι απενεργοποιημένες.</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>
@@ -506,6 +511,8 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Η γρήγορη απάντηση δεν είναι διαθέσιμη όταν το Signal είναι κλειδωμένο!</string>
   <string name="QuickResponseService_problem_sending_message">Πρόβλημα με την αποστολή μηνύματος!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Νέο Μήνυμα</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Εικόνα</string>
   <string name="attachment_type_selector__audio">Ήχος</string>
@@ -675,14 +682,16 @@
   <string name="registration_progress_activity__call_me">Κάλεσέ με</string>
   <string name="registration_progress_activity__edit_number">Επεξεργασία αριθμού</string>
   <string name="registration_progress_activity__connectivity_error">Σφάλμα συνδεσιμότητας.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Το Signal δεν μπόρεσε να συνδεθεί στην υπηρεσία push.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Το Signal δεν μπόρεσε να συνδεθεί στον διακομιστή.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Πιθανά
         προβλήματα:
     </string>
   <string name="registration_progress_activity__no_network_connectivity">Δεν υπάρχει
 σύνδεση στο δίκτυο.
     </string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Η συσκευή
+σου πρέπει να είναι συνδεδεμένη στο δίκτυο για να χρησιμοποιήσεις αυτό το χαρακτηριστικό του Signal. 
+Επιβεβαίωσε ότι είναι συνδεδεμένη σε Wi-Fi ή 3G.</string>
   <string name="registration_progress_activity__restrictive_firewall">Περιοριστικό τείχος προστασίας.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Αν είσαι συνδεμένος/η μέσω WiFi, πιθανώς να υπάρχει ένα τείχος προστασίας που εμποδίζει
@@ -709,7 +718,7 @@
   <string name="recipients_panel__to"><small>Εισαγωγή ονόματος ή αριθμού</small></string>
   <string name="recipients_panel__add_member">Προσθήκη μέλους</string>
   <!--verify_identity_activity-->
-  <string name="verify_identity_activity__their_identity_they_read">Η ταυτότητά του/tης (αυτός/η διαβάζει):</string>
+  <string name="verify_identity_activity__their_identity_they_read">Η ταυτότητά του/της (αυτός/η διαβάζει):</string>
   <string name="verify_identity_activity__your_identity_you_read">Η ταυτότητά σου (εσύ διαβάζεις):</string>
   <!--message_details_header-->
   <string name="message_details_header__issues_need_your_attention">Ορισμένα ζητήματα χρειάζονται την προσοχή σου.</string>
@@ -728,11 +737,12 @@
   <string name="AndroidManifest__change_passphrase">Αλλαγή συνθηματικού</string>
   <string name="AndroidManifest__verify_identity">Επιβεβαίωση ταυτότητας</string>
   <string name="AndroidManifest__log_submit">Υποβολή διαγνωστικού αρχείου.</string>
-  <string name="AndroidManifest__media_preview">Προεπισκόπηση  Πολυμέσων</string>
   <string name="AndroidManifest__media_overview">Όλες οι εικόνες</string>
   <string name="AndroidManifest__media_overview_named">Όλες οι εικόνες με τον/την %1$s</string>
+  <string name="AndroidManifest__message_details">Λεπτομέρειες μηνύματος</string>
   <string name="AndroidManifest_manage_linked_devices">Διαχείριση συνδεδεμένων συσκευών</string>
   <string name="AndroidManifest__invite_friends">Πρόσκληση φίλων</string>
+  <string name="AndroidManifest_conversations_archive">Αρχείο συζητήσεων</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Εισαγωγή / εξαγωγή</string>
   <string name="arrays__your_identity_key">Το κλειδί ταυτότητάς σου</string>
@@ -797,7 +807,6 @@
   <string name="preferences__sound">Ήχος</string>
   <string name="preferences__change_notification_sound">Αλλαγή ήχου ειδοποίησης</string>
   <string name="preferences__silent">Σε σίγαση</string>
-  <string name="preferences__inthread_notifications">Ειδοποιήσεις εντός συζητήσεων</string>
   <string name="preferences__play_inthread_notifications">Αναπαραγωγή ήχου ειδοποίησης όταν βλέπεις μια ενεργή συνομιλία</string>
   <string name="preferences__repeat_alerts">Επανάληψη ειδοποιήσεων</string>
   <string name="preferences__never">Ποτέ</string>
@@ -835,12 +844,9 @@
   <string name="preferences__mmsc_password">MMSC Κωδικός`</string>
   <string name="preferences__sms_delivery_reports">Αναφορές παράδοσης SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Αίτημα αναφοράς παράδοσης για κάθε SMS που στέλνεις</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Αυτόματη διαγραφή παλιών μηνυμάτων όταν μια συζήτηση ξεπεράσει ένα προκαθορισμένο όριο μηνυμάτων</string>
   <string name="preferences__delete_old_messages">Διαγραφή παλιών μηνυμάτων</string>
   <string name="preferences__chats">Συζητήσεις και πολυμέσα</string>
   <string name="preferences__conversation_length_limit">Όριο μεγέθους συζήτησης</string>
-  <string name="preferences__trim_all_threads_now">Περικοπή όλων των συζητήσεων τώρα</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Ανάλυση όλων των συζητήσεων και επιβολή ορίου μεγέθους</string>
   <string name="preferences__devices">Συσκευές</string>
   <string name="preferences__light_theme">Φως</string>
   <string name="preferences__dark_theme">Σκοτάδι</string>
@@ -896,11 +902,13 @@
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Διαγραφή επιλεγμένων</string>
   <string name="conversation_list_batch__menu_select_all">Επιλογή Όλων</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Επιλεγμένο αρχείο</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Αναζήτηση</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Φωτογραφία επαφής</string>
   <string name="conversation_list_item_view__error_alert">Ειδοποίηση σφάλματος</string>
+  <string name="conversation_list_item_view__archived">Αρχειοθετημένα</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Νεα Συζήτηση</string>
   <!--conversation_secure_verified-->
@@ -938,6 +946,7 @@
   <string name="text_secure_normal__menu_clear_passphrase">Κλείδωμα</string>
   <string name="text_secure_normal__mark_all_as_read">Σημείωση όλων ως αναγνωσμένα</string>
   <string name="text_secure_normal__invite_friends">Πρόσκληση φίλων</string>
+  <string name="text_secure_normal__help">Βοήθεια</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Η έκδοση του Signal σου έχει λήξει!</string>
   <string name="reminder_header_expired_build_details">Τα μηνύματα δεν θα στείλνονται με επιτυχία, παρακαλώ αναβάθμισε στην πιο πρόσφατη έκδοση.</string>
@@ -965,7 +974,6 @@
   <!--media_preview-->
   <string name="media_preview__save_title">Αποθήκευση</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Προεπισκόπηση εικόνας</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Ανανέωση</string>
   <!--redphone_audio_popup_menu-->

res/values-es/strings.xml

@@ -10,16 +10,16 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">¡Todavía no ha elegido una clave de acceso!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s mensajes por conversación</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">¿Eliminar todos los mensajes antiguos?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">¿Está seguro de que quiere recortar inmediatamente todos los hilos de conversación a los %s últimos mensajes?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Esto recortará inmediatamente todas las conversaciones a los %s mensajes más recientes.</string>
   <string name="ApplicationPreferencesActivity_delete">Eliminar</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">¿Deshabilitar clave de acceso?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
 ¿Deshabilitar pantalla de bloqueo para mensajes?</string>
   <string name="ApplicationPreferencesActivity_disable">Desactivar</string>
   <string name="ApplicationPreferencesActivity_unregistering">Desregistrándose</string>
-  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Desregistrándose de mensajes y llamadas de Signal...</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Borrando cuenta Signal...</string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">¿Deshabilitar mensajes y llamadas de Signal?</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Deshabilitar los mensajes y llamadas de Signal desregistrándole del servidor. Necesitará volver a registrar su número de teléfono para usarlos de nuevo en el futuro.</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Esto deshabilitará los mensajes de Signal eliminándole del servidor. Necesitará volver a registrar su número de teléfono para usar mensajes de Signal de nuevo en el futuro.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">¡Error conectando al servidor!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS habilitados</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Pulse para cambiar la aplicación de SMS predeterminada</string>
@@ -160,9 +160,16 @@ Recibido:%4$s</string>
     <item quantity="other">Esto eliminará permanentemente las %1$d conversaciones seleccionadas.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Eliminando</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Eliminando conversaciones seleccionadas...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Borrando conversaciones seleccionadas...</string>
+  <string name="ConversationListFragment_archived_conversations">Conversaciones archivadas</string>
+  <string name="ConversationListFragment_undo">Atrás</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Conversación movida a la bandeja de entrada</string>
+  <string name="ConversationListFragment_archived_conversation">Conversación archivada</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Conversaciones movidas a la bandeja de entrada</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mensaje de intercambio de claves...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Conversaciones archivadas (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Usando personalizado: %s</string>
   <string name="CustomDefaultPreference_using_default">Usando predeterminado: %s</string>
@@ -182,6 +189,7 @@ Recibido:%4$s</string>
   <string name="DeviceListItem_unnamed_device">Dispositivo sin nombre</string>
   <string name="DeviceListItem_linked_s">Se vinculó %s</string>
   <string name="DeviceListItem_last_active_s">Activo por última vez el %s</string>
+  <string name="DeviceListItem_today">Hoy</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Compartir con</string>
   <!--ExperienceUpgradeActivity-->
@@ -202,14 +210,14 @@ Recibido:%4$s</string>
   <string name="ExportFragment_success">¡Éxito!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">¡Fallo permanente de comunicación de Signal!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal no pudo registrarse con Google Play Services. La comunicación sobre el canal de datos ha sido deshabilitada, por favor, intente volver a registrarse desde el menú de configuración de Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal fué incapaz de registrarse con Google Play Services. Los mensajes y llamadas de Signal han sido desactivados, por favor, intenta registrarte otra vez en Configuración &gt; Avanzado.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nuevo grupo</string>
   <string name="GroupCreateActivity_actionbar_update_title">Actualizar grupo</string>
   <string name="GroupCreateActivity_group_name_hint">Nombre del grupo</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nuevo grupo de MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Ha seleccionado un contacto que no soporta grupos de Signal, así que este grupo será de MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">No está registrado para usar el canal de datos, así que los grupos de Signal están deshabilitados.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">No estás registrado para los mensajes y llamadas de Signal, así que los grupos de Signal están desactivados, por favor, intenta registrarte otra vez en Configuración &gt; Avanzado.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Un error inesperado hizo fallar la creación del grupo.</string>
   <string name="GroupCreateActivity_contacts_no_members">¡Necesita al menos una persona en su grupo!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Uno de los miembros de su grupo tiene un número que no puede ser leído correctamente. Por favor arréglelo o elimine ese contacto, e inténtelo de nuevo.</string>
@@ -325,6 +333,8 @@ importarla de nuevo dará como resultado mensajes duplicados.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Código QR no válido.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Lo sentimos, ya tiene demasiados dispositivos vinculados, pruebe a eliminar alguno...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Lo sentimos , este código QR no es ​​válido .</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">¿Enlazar un dispositivo Signal?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Parece que estás intentando enlazar un dispositivo Signal usando un escáner de terceros. Para tu protección, por favor, escanea el código otra vez desde Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Introduzca clave de acceso</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icono de Signal</string>
@@ -515,6 +525,8 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">¡La respuesta rápida no está disponible cuando Signal está bloqueado!</string>
   <string name="QuickResponseService_problem_sending_message">¡Hubo un problema al enviar el mensaje!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Nuevo mensaje</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Imagen</string>
   <string name="attachment_type_selector__audio">Audio</string>
@@ -683,8 +695,7 @@ Signal también puede llamarle para verificar su número. Pulse \'Llamarme\' e i
   <string name="registration_progress_activity__call_me">Llamarme</string>
   <string name="registration_progress_activity__edit_number">Editar número</string>
   <string name="registration_progress_activity__connectivity_error">Fallo de conectividad.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal no pudo conectar con el servicio de actualización activa (push).</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal no pudo conectar con el servidor.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Algunos posibles
 problemas son:
 
@@ -692,6 +703,10 @@ problemas son:
   <string name="registration_progress_activity__no_network_connectivity">Sin conectividad 
 a la red.
     </string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Tu
+dispositivo necesita estar conectado para poder usar esta característica de Signal. Comprueba
+que está conectado a datos móviles o por Wi-Fi.
+ </string>
   <string name="registration_progress_activity__restrictive_firewall">Cortafuegos restrictivo.
 </string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
@@ -740,11 +755,13 @@ por SMS.
   <string name="AndroidManifest__change_passphrase">Cambiar clave de acceso</string>
   <string name="AndroidManifest__verify_identity">Verificar identidad</string>
   <string name="AndroidManifest__log_submit">Enviar registros de depuración</string>
-  <string name="AndroidManifest__media_preview">Previsualización del contenido</string>
+  <string name="AndroidManifest__media_preview">Previsualizar multimedia</string>
   <string name="AndroidManifest__media_overview">Todas las imágenes</string>
   <string name="AndroidManifest__media_overview_named">Todas la imágenes con %1$s</string>
+  <string name="AndroidManifest__message_details">Detalles del mensaje</string>
   <string name="AndroidManifest_manage_linked_devices">Administrar dispositivos vinculados</string>
   <string name="AndroidManifest__invite_friends">Invitar amigos</string>
+  <string name="AndroidManifest_conversations_archive">Archivo de conversaciones</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar/exportar</string>
   <string name="arrays__your_identity_key">Su clave de identidad</string>
@@ -809,7 +826,7 @@ por SMS.
   <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__inthread_notifications">Notificaciones dentro de conversación</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>
   <string name="preferences__repeat_alerts">Repetir alertas</string>
   <string name="preferences__never">Nunca</string>
@@ -847,12 +864,12 @@ por SMS.
   <string name="preferences__mmsc_password">Contraseña de MMSC</string>
   <string name="preferences__sms_delivery_reports">Confirmación de entrega de SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Solicita la confirmación de entrega de SMS para todos los SMS que envíe.</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Eliminar automáticamente los mensajes más antiguos cuando una conversación exceda el límite de longitud especificado</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Eliminar automáticamente los mensajes más antiguos cuando la conversación exceda el límite de longitud especificado</string>
   <string name="preferences__delete_old_messages">Eliminar mensajes antiguos</string>
   <string name="preferences__chats">Chats y audiovisuales</string>
   <string name="preferences__conversation_length_limit">Límite de longitud de la conversación</string>
-  <string name="preferences__trim_all_threads_now">Recortar todos los hilos ahora</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Escanear todas las conversaciones y forzar los límites de tamaño de conversación</string>
+  <string name="preferences__trim_all_conversations_now">Recortar todas las conversaciones ahora</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Escanear todas las conversaciones e imponer los límites de longitud en las conversaciones</string>
   <string name="preferences__devices">Dispositivos</string>
   <string name="preferences__light_theme">Claro</string>
   <string name="preferences__dark_theme">Oscuro</string>
@@ -908,11 +925,14 @@ por SMS.
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Borrar seleccionado</string>
   <string name="conversation_list_batch__menu_select_all">Seleccionar todo</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Archivo seleccionado</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Archivo deseleccionado</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Buscar</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Foto del contacto</string>
   <string name="conversation_list_item_view__error_alert">Alerta de error</string>
+  <string name="conversation_list_item_view__archived">Archivado</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nueva conversación</string>
   <!--conversation_secure_verified-->
@@ -950,6 +970,7 @@ por SMS.
   <string name="text_secure_normal__menu_clear_passphrase">Bloquear</string>
   <string name="text_secure_normal__mark_all_as_read">Marcar todos como leídos</string>
   <string name="text_secure_normal__invite_friends">Invitar amigos</string>
+  <string name="text_secure_normal__help">Ayuda</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">¡Su versión de Signal ha caducado!</string>
   <string name="reminder_header_expired_build_details">Los mensajes ya no se enviarán con éxito, por favor, actualice a la versión más reciente.</string>
@@ -977,7 +998,7 @@ por SMS.
   <!--media_preview-->
   <string name="media_preview__save_title">Guardar</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Previsualización de la imagen</string>
+  <string name="media_preview_activity__image_content_description">Previsualización de imagen</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Recargar</string>
   <!--redphone_audio_popup_menu-->

res/values-fa/strings.xml

@@ -10,7 +10,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">شما هنوز رمزی تعیین نکرده‌اید!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s پیام در هر گفتگو</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">پیام‌های قدیمی حذف شوند؟</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">مطمئنید که می‌خواهید از هر گفتگو %s پیام جدیدتر را نگه داشته و بقیه را حذف کنید؟</string>
   <string name="ApplicationPreferencesActivity_delete">حذف</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">عبارت عبور غیر فعال کنم؟</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -68,6 +67,9 @@
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">مجدد به تکه تکه کردن MMS؟</string>
   <string name="ConversationItem_unable_to_open_media">برنامه ای برای بازکردن این رسانه وجود ندارد.</string>
   <!--ConversationActivity-->
+  <string name="ConversationActivity_reset_secure_session_question">تنظیم مجدد جلسه امن؟</string>
+  <string name="ConversationActivity_reset">تنظیم مجدد</string>
+  <string name="ConversationActivity_delete_thread_question">گفتگو حذف شود؟</string>
   <string name="ConversationActivity_add_attachment">پیوست فایل</string>
   <string name="ConversationActivity_select_contact_info">انتخاب اطلاعات تماس</string>
   <string name="ConversationActivity_compose_message">نوشتن پیام</string>
@@ -101,6 +103,7 @@
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">آیا شما مطمئن هستید که میخواهید این مخاطب را از بلاک در بیاورید؟</string>
   <string name="ConversationActivity_unblock">رفع انسداد</string>
   <string name="ConversationActivity_quick_camera_unavailable">دوربین در دسترس نیست</string>
+  <string name="ConversationActivity_unable_to_record_audio">قادر به ضبط صدا نیست!</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">جزییات پیام</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">فرستنده: %1$s\nنوع انتقال: %2$s\nزمان ارسال: %3$s\nزمان دریافت: %4$s</string>
@@ -126,9 +129,14 @@
     <item quantity="other">مکالمات انتخاب شده حذف شوند؟</item>
   </plurals>
   <string name="ConversationListFragment_deleting">حذف</string>
-  <string name="ConversationListFragment_deleting_selected_threads">حذف موضوعات انتخاب شده...</string>
+  <string name="ConversationListFragment_archived_conversations">آرشیو گفتگوها</string>
+  <string name="ConversationListFragment_undo">UNDO</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">گفتگو انتقال داده شد به اینباکس</string>
+  <string name="ConversationListFragment_archived_conversation">آرشیو گفتگو</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">گفتگوها انتقال داده شد به اینباکس</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">پیام تبادل کلید...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">با استفاده از سفارشی: %s</string>
   <string name="CustomDefaultPreference_using_default">با استفاده از پیش فرض: %s</string>
@@ -195,6 +203,7 @@
   <string name="InviteActivity_cancel">لغو</string>
   <string name="InviteActivity_sending">در حال ارسال</string>
   <string name="InviteActivity_heart_content_description">فلب</string>
+  <string name="InviteActivity_invitations_sent">دعوت نامه ارسال شد!</string>
   <string name="InviteActivity_invite_to_signal">دعوت به سیگنال</string>
   <string name="InviteActivity_lets_switch_to_signal">بیایید از این برای سیگنال استفاده کنیم:  %1$s</string>
   <!--KeyScanningActivity-->
@@ -211,6 +220,11 @@
   <string name="NotificationBarManager_signal_call_in_progress">پاسخ سیگنال در حال انجام</string>
   <string name="NotificationBarManager_missed_call_from_s">تماس از دست رفته از %s</string>
   <string name="NotificationBarManager_missed_signal_call">تماس از دست رفته سیگنال</string>
+  <string name="NotificationBarManager__incoming_signal_call">پاسخ تماس سیگنال</string>
+  <string name="NotificationBarManager__deny_call">رد تماس</string>
+  <string name="NotificationBarManager__answer_call">پاسخ به تماس</string>
+  <string name="NotificationBarManager__end_call">پایان تماس</string>
+  <string name="NotificationBarManager__cancel_call">لغو تماس</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">پیام های چند رسانه ای</string>
   <!--MessageRecord-->
@@ -396,6 +410,8 @@
   <!--QuickResponseService-->
   <string name="QuickResponseService_problem_sending_message">بروز خطا در ارسال پیام!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">سیگنال</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">پیام جدید</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">تصویر</string>
   <string name="attachment_type_selector__audio">صدا</string>
@@ -403,6 +419,9 @@
   <string name="attachment_type_selector__contact">مخاطب</string>
   <string name="attachment_type_selector__camera">دوربین</string>
   <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">عبارت عبور قدیمی</string>
+  <string name="change_passphrase_activity__new_passphrase">عبارت عبور جدید</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">عبارت عبور قدیمی</string>
   <!--contact_selection_activity-->
   <string name="contact_selection_activity__enter_name_or_number">نام یا شماره را وارد کنید</string>
   <!--contact_selection_group_activity-->
@@ -451,8 +470,10 @@
   <string name="country_selection_fragment__search">جستجو</string>
   <!--device_add_fragment-->
   <!--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>
   <!--log_submit_activity-->
@@ -471,6 +492,7 @@
   <string name="import_fragment__restore_encrypted_backup">بازگرداندن نسخه پشتیبان رمزگذاری شده</string>
   <string name="import_fragment__import_plaintext_backup">وارد کردن پشتیبان ساده</string>
   <!--load_more_header-->
+  <string name="load_more_header__see_full_conversation">گفتگو کامل را ببینید</string>
   <!--media_overview_activity-->
   <string name="media_overview_activity__no_images">بدون تصاویر</string>
   <!--message_recipients_list_item-->
@@ -520,6 +542,8 @@
   <string name="registration_progress_activity__call_me">تماس با من</string>
   <string name="registration_progress_activity__edit_number">ویرایش شماره</string>
   <string name="registration_progress_activity__connectivity_error">خطای اتصال.</string>
+  <string name="registration_progress_activity__some_possible_problems_include">برخی ممکن
+مشکلات عبارتند از:</string>
   <string name="registration_progress_activity__no_network_connectivity">بدون شبکه
 اتصال.</string>
   <string name="registration_progress_activity__restrictive_firewall">محدود کردن دیواره آتش</string>
@@ -556,11 +580,12 @@
   <string name="AndroidManifest__change_passphrase">تغییر رمز</string>
   <string name="AndroidManifest__verify_identity">تشخیص هویت</string>
   <string name="AndroidManifest__log_submit">ارسال گزارش اشکال‌زدایی</string>
-  <string name="AndroidManifest__media_preview">پیش نمایش رسانه</string>
   <string name="AndroidManifest__media_overview">همه تصاویر</string>
   <string name="AndroidManifest__media_overview_named">همه عکس ها با %1$s</string>
+  <string name="AndroidManifest__message_details">جزییات پیام</string>
   <string name="AndroidManifest_manage_linked_devices">مدیریت دستگاه های مرتبط</string>
   <string name="AndroidManifest__invite_friends">دعوت دوستان</string>
+  <string name="AndroidManifest_conversations_archive">آرشیو گفتگو</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">وارد کردن / خروجی گرفتن</string>
   <string name="arrays__your_identity_key">کلید هویت شما</string>
@@ -576,6 +601,7 @@
   <string name="arrays__disabled">غیر فعال</string>
   <string name="arrays__name_and_message">نام و پیام</string>
   <string name="arrays__name_only">تنها نام</string>
+  <string name="arrays__no_name_or_message">بدون نام و یا پیام</string>
   <string name="arrays__images">تصویر</string>
   <string name="arrays__audio">صدا</string>
   <string name="arrays__video">ویدئو</string>
@@ -621,7 +647,7 @@
   <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__inthread_notifications">در موضوع اطلاعیه</string>
+  <string name="preferences__silent">بی صدا</string>
   <string name="preferences__repeat_alerts">تکرار هشدار</string>
   <string name="preferences__never">هرگز</string>
   <string name="preferences__one_time">یکبار</string>
@@ -656,12 +682,10 @@
   <string name="preferences__mmsc_username">MMSC نام کاربری</string>
   <string name="preferences__mmsc_password">MMSC رمز عبور</string>
   <string name="preferences__sms_delivery_reports">گزارش های تحویل پیام کوتاه</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">وقتی طول یک گفتگو از حد خاصی بیشتر شد، پیام‌های قدیمی آن را را حذف کن</string>
   <string name="preferences__delete_old_messages">حذف پیام‌های قدیمی</string>
   <string name="preferences__chats">چت و رسانه</string>
   <string name="preferences__conversation_length_limit">محدودیت طول گفتگو</string>
-  <string name="preferences__trim_all_threads_now">حذف پیام‌های قدیمی، همین حالا</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">همین حالا محدودیت طول را برای همه گفتگوها اعمال کن و پیام‌های قدیمی هر گفتگو را حذف کن</string>
+  <string name="preferences__devices">دستگاه ها</string>
   <string name="preferences__light_theme">روشن</string>
   <string name="preferences__dark_theme">تیره</string>
   <string name="preferences__appearance">ظاهر برنامه</string>
@@ -696,6 +720,7 @@
   <!--conversation_callable_insecure-->
   <string name="conversation_callable_insecure__menu_call">تماس گرفتن</string>
   <!--conversation_callable_secure-->
+  <string name="conversation_callable_secure__menu_call">تماس سیگنال</string>
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">جزییات پیام</string>
   <string name="conversation_context__menu_copy_text">کپی متن</string>
@@ -711,11 +736,13 @@
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">حذف انتخاب شده ها</string>
   <string name="conversation_list_batch__menu_select_all">انتخاب همه</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">بایگانی انتخاب شده ها</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">جستجو</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">تماس با عکس تصویر</string>
   <string name="conversation_list_item_view__error_alert">هشدار خطا</string>
+  <string name="conversation_list_item_view__archived">آرشیو</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">گفتگوی جدید</string>
   <!--conversation_secure_verified-->
@@ -730,6 +757,7 @@
   <string name="conversation__menu_add_attachment">پیوست فایل</string>
   <string name="conversation__menu_update_group">به روز رسانی گروه</string>
   <string name="conversation__menu_leave_group">مرخص شدن از گروه</string>
+  <string name="conversation__menu_delete_thread">حذف گفتگو</string>
   <string name="conversation__menu_view_media">همه تصاویر</string>
   <string name="conversation__menu_conversation_settings">تنظیمات گفتگو</string>
   <!--conversation_popup-->
@@ -752,6 +780,7 @@
   <string name="text_secure_normal__menu_clear_passphrase">قفل</string>
   <string name="text_secure_normal__mark_all_as_read">علامت همه به عنوان خوانده شده</string>
   <string name="text_secure_normal__invite_friends">دعوت دوستان</string>
+  <string name="text_secure_normal__help">کمک</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">نسخه سیگنال شما منقضی شده است!</string>
   <string name="reminder_header_expired_build_button">بروزرسانی</string>
@@ -775,8 +804,8 @@
   <!--media_preview-->
   <string name="media_preview__save_title">دخیره</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">پیش‌نمایش تصویر</string>
   <!--new_conversation_activity-->
+  <string name="new_conversation_activity__refresh">تازه کردن</string>
   <!--redphone_audio_popup_menu-->
   <string name="redphone_audio_popup_menu__handset">گوشی</string>
   <string name="redphone_audio_popup_menu__headset">گوشی</string>

res/values-fi/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Et ole vielä määritellyt salalausetta!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s viestiä per keskustelu</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Poistetaanko kaikki vanhat viestit nyt?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Haluatko varmasti rajata kaikki keskustelut %s viimeisimpään viestiin?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Tämä karsii välittömästi kaikki keskustelut %s viimeisimpään viestiin.</string>
   <string name="ApplicationPreferencesActivity_delete">Poista</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Poista salalause käytöstä?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -19,7 +19,7 @@ Poistetaanko sovelluksen ja viestien lukitus salalauseella käytöstä?</string>
   <string name="ApplicationPreferencesActivity_unregistering">Puretaan rekisteröintiä</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Puretaan rekisteröintiä Signal-viesteistä ja -puheluista...</string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Otetaanko Signal-viestit ja -puhelut pois käytöstä?</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Tämä purkaa rekisteröitymisesi palvelimelta ja lopettaa Signalin viesti- ja puhelupalvelut. Jos haluat käyttää niitä jatkossa, täytyy sinun rekisteröityä uudelleen puhelinnumerollasi.</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Tämä ottaa Signal-viestit ja -puhelut pois käytöstä  purkamalla rekisteröitymisesi palvelimelta. Jos haluat käyttää niitä jatkossa, täytyy sinun rekisteröityä puhelinnumerollasi uudelleen.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Virhe yhdistettäessä palvelimeen!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">Tekstiviestit käytössä</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Kosketa, jos haluat vaihtaa oletustekstiviestisovellustasi</string>
@@ -101,7 +101,7 @@ tämän yhteystiedon.</string>
   <string name="ConversationActivity_calls_not_supported">Puheluita ei tueta</string>
   <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Tämä laite ei näytä tukevan valintanäppäintoimintoja.</string>
   <string name="ConversationActivity_leave_group">Poistutaanko ryhmästä?</string>
-  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Haluatko varmasti poistua ryhmästä?</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Haluatko varmasti poistua tästä ryhmästä?</string>
   <string name="ConversationActivity_transport_insecure_sms">Salaamaton tekstiviesti</string>
   <string name="ConversationActivity_transport_insecure_mms">Salaamaton MMS-viesti</string>
   <string name="ConversationActivity_transport_signal">Signal</string>
@@ -159,9 +159,16 @@ Vastaanotettu: %4$s</string>
     <item quantity="other">Tämä poistaa pysyvästi kaikki %1$d valittua keskustelua.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Poistetaan</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Valittuja keskusteluja poistetaan...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Poistetaan valittuja keskusteluja...</string>
+  <string name="ConversationListFragment_archived_conversations">Arkistoidut keskustelut</string>
+  <string name="ConversationListFragment_undo">KUMOA</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Keskustelu siirretty postilaatikkoon</string>
+  <string name="ConversationListFragment_archived_conversation">Keskustelu arkistoitu</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Keskustelut siirretty postilaatikkoon</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Avaintenvaihtoviesti...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Arkistoidut keskustelut (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Käytä mukautettua: %s</string>
   <string name="CustomDefaultPreference_using_default">Käytä oletusta: %s</string>
@@ -181,6 +188,7 @@ Vastaanotettu: %4$s</string>
   <string name="DeviceListItem_unnamed_device">Nimeämätön laite</string>
   <string name="DeviceListItem_linked_s">Yhdistetty %s</string>
   <string name="DeviceListItem_last_active_s">Viimeksi käytetty %s</string>
+  <string name="DeviceListItem_today">Tänään</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Jaa</string>
   <!--ExperienceUpgradeActivity-->
@@ -201,14 +209,14 @@ Vastaanotettu: %4$s</string>
   <string name="ExportFragment_success">Onnistui!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Pysyvä Signal-yhteysvirhe!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal ei voinut rekisteröityä Google Play Services -palveluun, minkä vuoksi viestintä tietoverkon kautta on nyt otettu pois käytöstä. Kokeile rekisteröityä uudelleen Signalin asetuksista.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal ei voinut rekisteröityä Google Play Services -palveluun, minkä vuoksi Signal-viestit ja puhelut ovat otettu pois käytöstä. Kokeile rekisteröityä uudelleen Signalin lisäasetuksista.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Uusi ryhmä</string>
   <string name="GroupCreateActivity_actionbar_update_title">Päivitä ryhmää</string>
   <string name="GroupCreateActivity_group_name_hint">Ryhmän nimi</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Uusi MMS-ryhmä</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Olet valinnut yhteystiedon, joka ei tue Signalin ryhmäkeskusteluja. Tämä ryhmä tulee olemaan MMS-pohjainen.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Et ole rekisteröitynyt käyttämään tietoverkkovälitteistä viestintää, joten Signalin ryhmäkeskustelut ovat poissa käytöstä.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Et ole rekisteröitynyt Signal-viesteihin ja -puheluihin, joten Signalin ryhmäkeskustelut eivät ole käytettävissä. Kokeile rekisteröityä Signalin lisäasetuksista.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ryhmän luonti epäonnistui odottamattoman virheen takia.</string>
   <string name="GroupCreateActivity_contacts_no_members">Ryhmässä täytyy olla vähintään yksi henkilö!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Yhdellä ryhmän jäsenistä on puhelinnumero, jota ei voida lukea. Ole hyvä ja korjaa tämän henkilön yhteystiedot tai poista hänet ryhmästä ja yritä uudelleen.</string>
@@ -320,6 +328,8 @@ seuraa niiden uudelleentuonnista viestien kaksoiskappaleita.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Virheellinen QR-koodi.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sinulla on liian monta laitetta yhdistettynä. Kokeile poistaa joitakin...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Valitettavasti tämä ei ole laitteen yhdistämiseksi tarkoitettu QR-koodi.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Yhdistetäänkö Signal-laite?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Vaikuttaa siltä, että yrität yhdistää laitetta käyttämällä Signalin ulkopuolista skannaussovellusta. Oman turvallisuutesi vuoksi skannaa QR-koodi uudelleen Signalilla itsellään.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Syötä salalause</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signal-kuvake</string>
@@ -504,7 +514,7 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="QuickResponseService_problem_sending_message">Ongelma viestin lähettämisessä!</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Uusi viesti!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Uusi viesti</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Kuva</string>
   <string name="attachment_type_selector__audio">Äänitallenne</string>
@@ -666,13 +676,12 @@ Signal voi myös soittaa sinulle numerosi vahvistamiseksi. Napsauta \"Soita minu
   <string name="registration_progress_activity__call_me">Soita minulle</string>
   <string name="registration_progress_activity__edit_number">Muokkaa numeroa</string>
   <string name="registration_progress_activity__connectivity_error">Yhteysvirhe.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal ei saanut yhteyttä pikaviestipalveluun.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal ei saanut yhteyttä palvelimeen.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Mahdollisiin ongelmiin
 sisältyvät:</string>
   <string name="registration_progress_activity__no_network_connectivity">Ei verkkoyhteyttä.</string>
   <string name="registration_progress_activity__your_device_needs_network_connectivity">Laitteesi
-tarvitsee verkkoyhteyttä tämän TextSecuren ominaisuuden käyttämiseksi. Tarkista, että
+tarvitsee verkkoyhteyttä tämän Signalin ominaisuuden käyttämiseksi. Tarkista, että
 laitteesi on yhdistettynä mobiilitiedonsiirto- tai WiFi-verkkoon.</string>
   <string name="registration_progress_activity__restrictive_firewall">Rajoittava palomuuri.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
@@ -713,12 +722,13 @@ Signal ei saanut vahvistustekstiviestiä odotusajan sisällä.</string>
   <string name="AndroidManifest__change_passphrase">Vaihda salalause</string>
   <string name="AndroidManifest__verify_identity">Varmenna identiteetti</string>
   <string name="AndroidManifest__log_submit">Lähetä virheenkorjausloki</string>
-  <string name="AndroidManifest__media_preview">Median esikatselu</string>
+  <string name="AndroidManifest__media_preview">Liitteen esikatselu</string>
   <string name="AndroidManifest__media_overview">Kaikki kuvat</string>
   <string name="AndroidManifest__media_overview_named">%1$s: kaikki kuvat</string>
   <string name="AndroidManifest__message_details">Viestin tiedot</string>
   <string name="AndroidManifest_manage_linked_devices">Hallitse yhdistettyjä laitteita</string>
   <string name="AndroidManifest__invite_friends">Kutsu ystäviä</string>
+  <string name="AndroidManifest_conversations_archive">Arkistoidut keskustelut</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Varmuuskopiot</string>
   <string name="arrays__your_identity_key">Identiteettiavaimesi</string>
@@ -783,7 +793,7 @@ Signal ei saanut vahvistustekstiviestiä odotusajan sisällä.</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__inthread_notifications">Keskustelun sisäiset ilmoitukset</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>
   <string name="preferences__repeat_alerts">Hälytysten toisto</string>
   <string name="preferences__never">Älä toista</string>
@@ -821,12 +831,12 @@ Signal ei saanut vahvistustekstiviestiä odotusajan sisällä.</string>
   <string name="preferences__mmsc_password">MMSC salasana</string>
   <string name="preferences__sms_delivery_reports">SMS toimitusvahvistukset</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pyydä vahvistus jokaisen lähetetyn tekstiviestin toimituksesta</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Poista vanhimpia viestejä automaattisesti, kun keskustelu ylittää määritetyn pituusrajan</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Poista vanhimpia viestejä automaattisesti, kun keskustelu ylittää määritetyn pituusrajan</string>
   <string name="preferences__delete_old_messages">Vanhojen viestien poisto</string>
   <string name="preferences__chats">Keskustelut ja liitetiedostot</string>
   <string name="preferences__conversation_length_limit">Keskustelun pituusraja</string>
-  <string name="preferences__trim_all_threads_now">Karsi kaikki keskustelut nyt</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Käy läpi kaikki keskustelut ja pakota niihin pituusrajat</string>
+  <string name="preferences__trim_all_conversations_now">Karsi kaikki keskustelut nyt</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Käy läpi kaikki keskustelut ja pakota niihin pituusrajat</string>
   <string name="preferences__devices">Laitteet</string>
   <string name="preferences__light_theme">Vaalea</string>
   <string name="preferences__dark_theme">Tumma</string>
@@ -882,11 +892,14 @@ Signal ei saanut vahvistustekstiviestiä odotusajan sisällä.</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Poista valitut</string>
   <string name="conversation_list_batch__menu_select_all">Valitse kaikki</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Arkistoi valitut</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Palauta valitut arkistosta</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Hae</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Yhteystiedon kuva</string>
   <string name="conversation_list_item_view__error_alert">Virheilmoituksen hälytys</string>
+  <string name="conversation_list_item_view__archived">Arkistoitu</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Uusi keskustelu</string>
   <!--conversation_secure_verified-->

res/values-fr/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Vous n’avez pas encore défini de phrase de passe !</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s messages par conversation</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Supprimer tous les anciens messages maintenant ?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Êtes-vous sûr de ne vouloir garder que les %s messages les plus récents de chaque conversation ?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Cela va immédiatement réduire toutes les conversations pour qu\'il ne reste que les %s messages les plus récents.</string>
   <string name="ApplicationPreferencesActivity_delete">Supprimer</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Désactiver la phrase de passe ?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -153,9 +153,16 @@ vérifier ce contact.</string>
     <item quantity="other">Cela supprimera définitivement les %1$d conversations sélectionnés.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Suppression</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Suppression des fils sélectionnés…</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Suppression des conversations sélectionnées...</string>
+  <string name="ConversationListFragment_archived_conversations">Conversations archivées</string>
+  <string name="ConversationListFragment_undo">ANNULER</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Conversation déplacée dans la boite de réception</string>
+  <string name="ConversationListFragment_archived_conversation">Conversation archivée</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Conversations déplacées dans la boite de réception</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Message d’échange des clés…</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Conversations déplacées (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Personnalisé : %s</string>
   <string name="CustomDefaultPreference_using_default">Par défaut : %s</string>
@@ -175,6 +182,7 @@ vérifier ce contact.</string>
   <string name="DeviceListItem_unnamed_device">Appareil sans nom</string>
   <string name="DeviceListItem_linked_s">%s associé</string>
   <string name="DeviceListItem_last_active_s">Vu pour la dernière fois %s</string>
+  <string name="DeviceListItem_today">Aujourd\'hui</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partager avec</string>
   <!--ExperienceUpgradeActivity-->
@@ -195,14 +203,14 @@ vérifier ce contact.</string>
   <string name="ExportFragment_success">Réussite !</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Échec de communication Signal permanent !</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">La communication via le canal de données a été désactivée car Signal n\'a pas pu s\'enregistrer auprès de Google Play Services. Veuillez essayer de vous enregistrer à nouveau à partir du menu Paramètres de Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Les appels et messages Signal ont été désactivés car Signal n\'a pas pu s\'enregistrer auprès de Google Play Services. Veuillez essayer de vous enregistrer à nouveau à partir du menu Paramètres &gt; Avancé.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nouveau groupe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Mettre à jour le groupe</string>
   <string name="GroupCreateActivity_group_name_hint">Nom du groupe</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nouveau groupe MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Vous avez sélectionné un contact qui n\'a pas Signal, le groupe sera donc converti en groupe MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Vous n’êtes pas enregistré pour utiliser la transmission de données, les groupes Signal sont donc désactivés.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Vous n’êtes pas enregistré pour les appels et messages Signal, les groupes Signal sont donc désactivés. Veuillez essayer de vous enregistrer à nouveau à partir du menu Paramètres &gt; Avancé.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Une erreur inattendue s\'est produite, ce qui a empêché la création du groupe.</string>
   <string name="GroupCreateActivity_contacts_no_members">Il vous faut au moins une personne dans votre groupe !</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Un des membres de votre groupe a un numéro illisible. Veuillez réparer ou enlever ce contact et essayer à nouveau.</string>
@@ -240,7 +248,7 @@ l\'importer à nouveau se traduira par des messages dupliqués.</string>
   <string name="ImportFragment_no_encrypted_backup_found">Aucune sauvegarde chiffrée trouvée!</string>
   <string name="ImportFragment_restore_complete">Restauration terminée !</string>
   <!--InputPanel-->
-  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Appuyez et tenez pour enregistrer un message vocal, relâchez pour envoyer.</string>
+  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Appuyez et maintenez pour enregistrer un message vocal, relâchez pour envoyer.</string>
   <!--InviteActivity-->
   <string name="InviteActivity_share">Partager</string>
   <string name="InviteActivity_send_sms">Envoyer un SMS</string>
@@ -251,7 +259,7 @@ l\'importer à nouveau se traduira par des messages dupliqués.</string>
   <string name="InviteActivity_invite_to_signal">Inviter sur Signal</string>
   <plurals name="InviteActivity_send_to_friends">
     <item quantity="one">ENVOYER À 1 AMI</item>
-    <item quantity="other">ENVOYER À %d AMI(E)(S)</item>
+    <item quantity="other">ENVOYER À %d AMIS</item>
   </plurals>
   <plurals name="InviteActivity_send_sms_invites">
     <item quantity="one">Envoyer 1 invitation par SMS ?</item>
@@ -279,7 +287,7 @@ l\'importer à nouveau se traduira par des messages dupliqués.</string>
   <string name="NotificationBarManager__incoming_signal_call">Appel Signal entrant</string>
   <string name="NotificationBarManager__deny_call">Refuser l\'appel</string>
   <string name="NotificationBarManager__answer_call">Répondre à l\'appel</string>
-  <string name="NotificationBarManager__end_call">Arrêter l\'appel</string>
+  <string name="NotificationBarManager__end_call">Terminer l\'appel</string>
   <string name="NotificationBarManager__cancel_call">Annuler l\'appel</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Message multimédia</string>
@@ -301,8 +309,7 @@ l\'importer à nouveau se traduira par des messages dupliqués.</string>
   <string name="DeviceProvisioningActivity_continue">CONTINUER</string>
   <string name="DeviceProvisioningActivity_title">Lier cet appareil ?</string>
   <string name="DeviceProvisioningActivity_content_intro">Il sera capable de</string>
-  <string name="DeviceProvisioningActivity_content_bullets">
-• Lire tous vos messages
+  <string name="DeviceProvisioningActivity_content_bullets">• Lire tous vos messages
 \n• Envoyer des messages en votre nom</string>
   <string name="DeviceProvisioningActivity_content_progress_title">Association de l\'appareil</string>
   <string name="DeviceProvisioningActivity_content_progress_content">Association du nouvel appareil...</string>
@@ -312,6 +319,8 @@ l\'importer à nouveau se traduira par des messages dupliqués.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">QR code invalide.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Désolé, vous avez associé trop d\'appareils, essayez d\'en enlever quelques-uns...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Désolé, ceci n\'est pas un QR code valide pour lier son appareil.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Lier un appareil Signal ?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Il semble que vous essayez de lier un appareil Signal en utilisant un scanner externe. Pour votre protection, veuillez scanner le code à nouveau depuis Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Entrez la phrase de passe</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icône Signal</string>
@@ -495,6 +504,8 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <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>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Nouveau message</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Image</string>
   <string name="attachment_type_selector__audio">Audio</string>
@@ -559,7 +570,7 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <string name="device_link_fragment__link_device">Lier l\'appareil</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Aucun appareil associé...</string>
-  <string name="device_list_fragment__link_new_device">Lier le nouvel appareil</string>
+  <string name="device_list_fragment__link_new_device">Lier un nouvel appareil</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">continuer</string>
   <!--log_submit_activity-->
@@ -577,13 +588,13 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Mise à jour de la base de donnée...</string>
   <string name="export_fragment__export_plaintext_backup">Exporter une sauvegarde en clair</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporter une sauvegarde en texte clair compatible avec «SMSBackup And Restore»</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exporter une sauvegarde en clair compatible avec «SMS Backup &amp; Restore»</string>
   <string name="import_fragment__import_system_sms_database">Importer la base de données SMS du système</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Importer la base de données depuis l\'application SMS par défaut</string>
   <string name="import_fragment__restore_encrypted_backup">Restaurer sauvegarde chiffrée</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">Restaurer une sauvegarde chiffrée précédemment avec Signal</string>
   <string name="import_fragment__import_plaintext_backup">Importer la sauvegarde en clair</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">Importer un fichier de sauvegarde en texte clair. Compatible avec «SMSBackup And Restore»</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">Importer un fichier de sauvegarde en clair. Compatible avec «SMS Backup &amp; Restore»</string>
   <!--load_more_header-->
   <string name="load_more_header__see_full_conversation">Voir la conversation complète</string>
   <!--media_overview_activity-->
@@ -661,12 +672,12 @@ Signal peut aussi vous appeler pour vérifier votre numéro. Appuyez sur \'Appel
   <string name="registration_progress_activity__call_me">Appelez-Moi</string>
   <string name="registration_progress_activity__edit_number">Modifier le numéro</string>
   <string name="registration_progress_activity__connectivity_error">Erreur de connectivité.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal n\'a pas pu se connecter au service push.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal n\'a pas pu se connecter au serveur.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Certains des problèmes
 possibles sont:</string>
   <string name="registration_progress_activity__no_network_connectivity">Pas de connexion
 au réseau.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Votre appareil a besoin d\'une connectivité réseau pour pouvoir utiliser cette fonctionnalité Signal. Vérifiez qu\'il soit connecté à la 3G ou au Wi-Fi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Pare-feu restrictif.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Si vous êtes connectés au Wi-Fi, Il est possible qu\'un pare-feu bloque l\'accès
@@ -710,11 +721,13 @@ par SMS.</string>
   <string name="AndroidManifest__change_passphrase">Modifier la phrase de passe</string>
   <string name="AndroidManifest__verify_identity">Vérifier l’identité</string>
   <string name="AndroidManifest__log_submit">Soumettre un rapport de débogage</string>
-  <string name="AndroidManifest__media_preview">Prévisualisation du média.</string>
+  <string name="AndroidManifest__media_preview">Aperçu du média</string>
   <string name="AndroidManifest__media_overview">Toutes les images</string>
   <string name="AndroidManifest__media_overview_named">Toutes les images avec %1$s</string>
+  <string name="AndroidManifest__message_details">Détails du message</string>
   <string name="AndroidManifest_manage_linked_devices">Gérer les appareils associés</string>
   <string name="AndroidManifest__invite_friends">Inviter des amis</string>
+  <string name="AndroidManifest_conversations_archive">Archive des conversations</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importer / exporter</string>
   <string name="arrays__your_identity_key">Votre clé d\'identité</string>
@@ -724,7 +737,7 @@ par SMS.</string>
   <string name="arrays__mute_for_two_hours">Pendant 2 heures</string>
   <string name="arrays__mute_for_one_day">Pendant 1 jour</string>
   <string name="arrays__mute_for_seven_days">Pendant 7 jours</string>
-  <string name="arrays__mute_for_one_year">Mettre en silence pendant 1 an</string>
+  <string name="arrays__mute_for_one_year">Pendant 1 an</string>
   <string name="arrays__settings_default">Paramètres par défaut</string>
   <string name="arrays__enabled">Activé</string>
   <string name="arrays__disabled">Désactivé</string>
@@ -779,7 +792,7 @@ par SMS.</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__inthread_notifications">Notifications dans la discussion</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>
   <string name="preferences__repeat_alerts">Répéter les alertes</string>
   <string name="preferences__never">Jamais</string>
@@ -817,12 +830,12 @@ par SMS.</string>
   <string name="preferences__mmsc_password">Mot de passe MMSC</string>
   <string name="preferences__sms_delivery_reports">Accusés de réception SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Demander un accusé de réception pour chaque SMS envoyé</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Supprimer automatiquement les anciens messages lorsque la conversation dépasse un certaine taille.</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Supprimer automatiquement les plus vieux messages lorsque la conversation dépasse une certaine longueur</string>
   <string name="preferences__delete_old_messages">Supprimer les anciens messages</string>
   <string name="preferences__chats">Chats et média</string>
   <string name="preferences__conversation_length_limit">Limite de taille de la conversation</string>
-  <string name="preferences__trim_all_threads_now">Réduire toutes les conversations maintenant</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Parcourir toutes les conversations et appliquer la limite de taille de conversation</string>
+  <string name="preferences__trim_all_conversations_now">Réduire toutes les conversations maintenant</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Scanner toutes les conversations et imposer les limites de longueur pour les conversations</string>
   <string name="preferences__devices">Appareils</string>
   <string name="preferences__light_theme">Clair</string>
   <string name="preferences__dark_theme">Sombre</string>
@@ -878,11 +891,14 @@ par SMS.</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Supprimer les lots sélectionnés</string>
   <string name="conversation_list_batch__menu_select_all">Tout sélectionner</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Archive sélectionnée</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Désarchivage sélectionné</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Chercher</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Photo de contact</string>
   <string name="conversation_list_item_view__error_alert">Alerte d\'erreur</string>
+  <string name="conversation_list_item_view__archived">Archivé</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nouvelle conversation</string>
   <!--conversation_secure_verified-->
@@ -920,6 +936,7 @@ par SMS.</string>
   <string name="text_secure_normal__menu_clear_passphrase">Verrouiller</string>
   <string name="text_secure_normal__mark_all_as_read">Tout marquer comme lu</string>
   <string name="text_secure_normal__invite_friends">Inviter des amis</string>
+  <string name="text_secure_normal__help">Aide</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Votre version de Signal a expiré !</string>
   <string name="reminder_header_expired_build_details">Les messages ne pourront plus être envoyés, veuillez installer la dernière version.</string>
@@ -947,7 +964,7 @@ par SMS.</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Enregistrer</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Prévisualisation de l’image.</string>
+  <string name="media_preview_activity__image_content_description">Aperçu d\'image</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Rafraîchir</string>
   <!--redphone_audio_popup_menu-->

res/values-hr/strings.xml

@@ -10,13 +10,16 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Još niste postavili lozinku!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s poruka po razgovoru</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Obriši sve stare poruke?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Jeste li sigurni da želite skratiti sve razgovore na %s najnovijih poruka?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Ovo će trenutno skratiti sve razgovore na %s najnovijih poruka.</string>
   <string name="ApplicationPreferencesActivity_delete">Obriši</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Onemogući lozinku?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
 Onemogući zaključani ekran za poruke?</string>
   <string name="ApplicationPreferencesActivity_disable">Onemogući</string>
   <string name="ApplicationPreferencesActivity_unregistering">Uklanjanje registracije</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Uklanjanje registracije na Signal poruke i pozive...</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Onemogući Signal poruke i pozive?</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Onemogućite Signal poruke i pozive tako što će ukloniti registraciju s poslužitelja. Trebat ćete ponovno registrirati vaš broj telefona kako biste ih koristili u budućnosti.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Greška prilikom povezivanja na poslužitelj!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS omogućen</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Pritisnite za promjenu zadane SMS aplikacije</string>
@@ -42,6 +45,7 @@ Onemogući zaključani ekran za poruke?</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Kontakt informacije</string>
   <!--AudioSlidePlayer-->
+  <string name="AudioSlidePlayer_error_playing_audio">Greška prilikom reprodukcije zvuka!</string>
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Blokirani kontakti</string>
   <!--CallScreen-->
@@ -55,6 +59,7 @@ ovaj kontakt.</string>
   <string name="ConfirmIdentityDialog_accept">Prihvati</string>
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s">Poruka %s</string>
+  <string name="ContactsDatabase_signal_call_s">Signal pozivi %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Veličina poruke: %d KB</string>
   <string name="ConversationItem_expires_s">Ističe: %s</string>
@@ -71,6 +76,11 @@ ovaj kontakt.</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ova poruka <b>neće</b> biti kriptirana zato što primatelj nije više Signal korisnik.\n\nPošalji nesigurnu poruku?</string>
   <string name="ConversationItem_unable_to_open_media">Nije moguće pronaći aplikaciju za otvaranje ovog medija.</string>
   <!--ConversationActivity-->
+  <string name="ConversationActivity_reset_secure_session_question">Resetiraj sigurnu sesiju?</string>
+  <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Može pomoći ukoliko imate problema s kriptiranjem u ovom razgovoru. Vaše poruke će biti zadržane.</string>
+  <string name="ConversationActivity_reset">Resetiraj</string>
+  <string name="ConversationActivity_delete_thread_question">Obriši razgovor?</string>
+  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Trajno ćete obrisati sve poruke u ovom razgovoru.</string>
   <string name="ConversationActivity_add_attachment">Dodaj privitak</string>
   <string name="ConversationActivity_select_contact_info">Odaberite informacije kontakta</string>
   <string name="ConversationActivity_compose_message">Sastavi poruku</string>
@@ -94,6 +104,8 @@ ovaj kontakt.</string>
   <string name="ConversationActivity_transport_insecure_sms">Nesigurni SMS</string>
   <string name="ConversationActivity_transport_insecure_mms">Nesigurni MMS</string>
   <string name="ConversationActivity_transport_signal">Signal</string>
+  <string name="ConversationActivity_lets_switch_to_signal">Prebaci se na Signal %1$s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Koristi ovo za razgovor: %1$s</string>
   <string name="ConversationActivity_error_leaving_group">Greška prilikom napuštanja grupe...</string>
   <string name="ConversationActivity_mms_not_supported_title">MMS nije podržan</string>
   <string name="ConversationActivity_mms_not_supported_message">Ovu poruku nije moguće poslati jer vaš operater ne podržava MMS.</string>
@@ -103,11 +115,19 @@ ovaj kontakt.</string>
   <string name="ConversationActivity_unblock">Ukloni blokadu</string>
   <string name="ConversationActivity_attachment_exceeds_size_limits">Privitak prelazi ograničenje veličine za tip poruke koju šaljete.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Kamera nije dostupna</string>
+  <string name="ConversationActivity_unable_to_record_audio">Nije moguće snimati svuk!</string>
+  <string name="ConversationActivity_error_sending_voice_message">Greška prilikom slanja glasovne poruke...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalji poruke</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nPoslano/Primljeno: %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Pošiljatelj: %1$s\nTransport: %2$s\nPoslano: %3$s\nPrimljeno: %4$s</string>
+  <plurals name="ConversationFragment_delete_selected_messages">
+    <item quantity="one">Obriši odabrane poruke?</item>
+    <item quantity="few">Obriši odabrane poruke?</item>
+    <item quantity="other">Obriši odabrane poruke?</item>
+  </plurals>
   <string name="ConversationFragment_save_to_sd_card">Spremi na disk?</string>
+  <string name="ConversationFragment_saving_this_media_to_storage_warning">Spremanje ovog medija na disk će omogućiti pristup mediju iz drugih aplikacija na vašem uređaju.\n\nNastavi?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Greška prilikom spremanja privitka na disk!</string>
   <string name="ConversationFragment_success_exclamation">Uspješno!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Nije moguće pisati na disk!</string>
@@ -123,9 +143,14 @@ ovaj kontakt.</string>
   <string name="ConversationListActivity_search">Traži...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_deleting">Brisanje</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Brisanje odabranih tema...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Brisanje odabranih razgovora...</string>
+  <string name="ConversationListFragment_archived_conversations">Arhivirani razgovori</string>
+  <string name="ConversationListFragment_undo">VRATI</string>
+  <string name="ConversationListFragment_archived_conversation">Arhivirani razgovor</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Poruka za razmjenu ključa...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Arhivirani razgovori (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Koristeći prilagođeno: %s</string>
   <string name="CustomDefaultPreference_using_default">Koristeći zadano: %s</string>
@@ -145,6 +170,7 @@ ovaj kontakt.</string>
   <string name="DeviceListItem_unnamed_device">Neimenovani uređaj</string>
   <string name="DeviceListItem_linked_s">Povezan %s</string>
   <string name="DeviceListItem_last_active_s">Zadnje aktivno %s</string>
+  <string name="DeviceListItem_today">Danas</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Podijeli s</string>
   <!--ExperienceUpgradeActivity-->
@@ -155,19 +181,24 @@ ovaj kontakt.</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure i RedPhone su sada jedna aplikacija: Signal. Pritisnite za pregled.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Izvoz</string>
+  <string name="ExportFragment_export_plaintext_to_storage">Izvezi u obliku običnog teksta na pohranu?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Upozorenje, ova radnja će izvesti vaše Signalporuke na pohranu u obliku običnog teksta.</string>
   <string name="ExportFragment_cancel">Odustani</string>
   <string name="ExportFragment_exporting">Izvoz</string>
+  <string name="ExportFragment_exporting_plaintext_to_storage">Izvoz u obliku običnog teksta na pohranu...</string>
+  <string name="ExportFragment_error_unable_to_write_to_storage">Greška, nije moguće pisati na pohranu.</string>
+  <string name="ExportFragment_error_while_writing_to_storage">Greška prilikom pisanja na pohranu.</string>
   <string name="ExportFragment_success">Uspješno!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trajna greška u Signal komunikaciji!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal se nije uspješno registrirao na Google Play Services. Komunikacija preko podatkovnog kanala je onemogućena, pokušajte se ponovno registrirati iz Signal izbornika.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal se nije uspješno registrirao na Google Play Services. Signal poruke i pozivi su onemogućeni, pokušajte se ponovno registrirati kroz Postavke &gt; Napredno.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nova grupa</string>
   <string name="GroupCreateActivity_actionbar_update_title">Ažuriraj grupu</string>
   <string name="GroupCreateActivity_group_name_hint">Naziv grupe</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nova MMS grupa</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Odabrali ste kontakt koji ne podržava Signal grupe, tako da će ovo biti MMS grupa.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Niste registrirani za korištenje podatkovnog kanala, tako da su Signal grupe onemogućene.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Niste registrirani za Signal poruke i pozive, tako da su Signal grupe onemogućene. Pokušajte se ponovno registrirati u Postavke &gt; Napredno.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Dogodila se neočekivana greška zbog koje je stvaranje grupe neuspješno.</string>
   <string name="GroupCreateActivity_contacts_no_members">Potrebna je barem jedna osoba u vašoj grupi!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Jedan od članova vaše grupe ima broj koji ne može biti ispravno pročitan. Ispravite ili uklonite taj kontakt i pokušajte ponovno.</string>
@@ -175,7 +206,9 @@ ovaj kontakt.</string>
   <string name="GroupCreateActivity_menu_create_title">Stvori grupu</string>
   <string name="GroupCreateActivity_creating_group">Stvaranje %1$s...</string>
   <string name="GroupCreateActivity_updating_group">Ažuriranje %1$s...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Nije moguće dodati %1$s jer nisu Signal korisnici.</string>
   <string name="GroupCreateActivity_loading_group_details">Učitavanje detalja grupe...</string>
+  <string name="GroupCreateActivity_youre_already_in_the_group">Već ste u grupi.</string>
   <!--GroupMembersDialog-->
   <string name="GroupMembersDialog_me">Ja</string>
   <!--ImportExportActivity-->
@@ -208,7 +241,15 @@ ponovno uvoženje će rezultirati duplim porukama.</string>
   <string name="ImportFragment_no_encrypted_backup_found">Nije pronađena kriptirana kopija!</string>
   <string name="ImportFragment_restore_complete">Vraćanje završeno!</string>
   <!--InputPanel-->
+  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Pritisnite i držite kako biste snimili glasovnu poruku, pustite za slanje</string>
   <!--InviteActivity-->
+  <string name="InviteActivity_share">Dijeli</string>
+  <string name="InviteActivity_send_sms">Pošalji SMS</string>
+  <string name="InviteActivity_cancel">Odustani</string>
+  <string name="InviteActivity_sending">Slanje...</string>
+  <string name="InviteActivity_heart_content_description">Srce</string>
+  <string name="InviteActivity_invitations_sent">Pozivnice poslane!</string>
+  <string name="InviteActivity_invite_to_signal">Pozovi u Signal</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Skenirani ključ nije pronađen!</string>
   <string name="KeyScanningActivity_install_barcode_Scanner">Instaliraj Barcode Scanner?</string>
@@ -426,6 +467,7 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Brzi odgovor nije dostupan kada je Signal zaključan!</string>
   <string name="QuickResponseService_problem_sending_message">Greška prilikom slanja poruke!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_message">Nova poruka</string>
   <!--attachment_type_selector-->
   <!--change_passphrase_activity-->
   <!--contact_selection_activity-->
@@ -569,8 +611,6 @@ Signal vas može nazvati kako bi potvrdio vaš broj. Pritisnite \'Nazovi me\' i
   <string name="registration_progress_activity__call_me">Nazovi me</string>
   <string name="registration_progress_activity__edit_number">Uredi broj</string>
   <string name="registration_progress_activity__connectivity_error">Greška u povezivanju.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal se nije mogao povezati na instant uslugu.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Neki mogući
 problemi uključuju:</string>
   <string name="registration_progress_activity__no_network_connectivity">Nema mreže.</string>
@@ -617,7 +657,6 @@ neuspješno.</string>
   <string name="AndroidManifest__change_passphrase">Izmjeni lozinku</string>
   <string name="AndroidManifest__verify_identity">Potvrdite identitet</string>
   <string name="AndroidManifest__log_submit">Pošaljite debug zapise</string>
-  <string name="AndroidManifest__media_preview">Prikaz medija</string>
   <string name="AndroidManifest__media_overview">Sve slike</string>
   <string name="AndroidManifest__media_overview_named">Sve slike sa %1$s</string>
   <string name="AndroidManifest_manage_linked_devices">Upravljanje povezanim uređajima</string>
@@ -681,7 +720,6 @@ neuspješno.</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__inthread_notifications">Obavijesti unutar razgovora</string>
   <string name="preferences__play_inthread_notifications">Reproduciraj zvukove obavijesti prilikom pregleda aktivnog razgovora</string>
   <string name="preferences__repeat_alerts">Ponovi upozorenja</string>
   <string name="preferences__never">Nikada</string>
@@ -719,12 +757,9 @@ neuspješno.</string>
   <string name="preferences__mmsc_password">MMSC lozinka</string>
   <string name="preferences__sms_delivery_reports">SMS potvrde isporuke</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Traži potvrdu isporuke za svaki poslani SMS</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatski obriši starije poruke nakon što razgovor pređe određenu duljinu</string>
   <string name="preferences__delete_old_messages">Obriši stare poruke</string>
   <string name="preferences__chats">Razgovori i media</string>
   <string name="preferences__conversation_length_limit">Maksimalna duljina razgovora</string>
-  <string name="preferences__trim_all_threads_now">Skrati sve teme sada</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skeniraj sve teme i primijeni maksimalnu duljinu razgovora</string>
   <string name="preferences__light_theme">Svijetla</string>
   <string name="preferences__dark_theme">Tamna</string>
   <string name="preferences__appearance">Izgled</string>
@@ -837,7 +872,6 @@ neuspješno.</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Spremi</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Prikaz slike</string>
   <!--new_conversation_activity-->
   <!--redphone_audio_popup_menu-->
   <string name="redphone_audio_popup_menu__handset">Slušalica</string>

res/values-hu/strings.xml

@@ -10,7 +10,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Még nem állítottál be jelmondatot!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s üzenet beszélgetésenként</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Minden régi üzenet törlése most?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Biztosan szeretnéd azonnal csonkolni az összes beszélgetésfolyamot a legutóbbi %s üzenetre?</string>
   <string name="ApplicationPreferencesActivity_delete">Törlés</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Jelmondat tiltása?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -157,9 +156,15 @@ ezt a névjegyet.
     <item quantity="other">Ez azonnal törölni fogja mind a(z) %1$d kiválasztott beszélgetést.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Törlés</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Kiválasztott beszélgetésfolyamok törlése...</string>
+  <string name="ConversationListFragment_archived_conversations">Archivált beszélgetések</string>
+  <string name="ConversationListFragment_undo">VISSZAVONÁS</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Beérkezőbe áthelyezett beszélgetés</string>
+  <string name="ConversationListFragment_archived_conversation">Archivált beszélgetés</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Beérkezőbe áthelyezett beszélgetések</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Kulcs-csere üzenet...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Archivált beszélgetések (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Egyéni: %s</string>
   <string name="CustomDefaultPreference_using_default">Alapértelmezett: %s</string>
@@ -199,14 +204,14 @@ ezt a névjegyet.
   <string name="ExportFragment_success">Sikerült!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Elhúzódó Signal kommunikációs hiba!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">A Signal képtelen volt regisztrálni Google Play Szolgáltatásokkal. Az adatcsatornán keresztüli kommunikáció le van tiltva, kérlek próbálj meg újra regisztrálni a Signal beállítások menüből.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">A Signal nem tudott regisztrálni a Google Play Szolgáltatásokkal. A Signal üzenetek és hívások le vannak tiltva, kérlek próbálj meg újraregisztrálni a Beállítások &gt; Haladó-ban.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Új csoport</string>
   <string name="GroupCreateActivity_actionbar_update_title">Csoport frissítése</string>
   <string name="GroupCreateActivity_group_name_hint">Csoport név</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Új MMS csoport</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Kiválasztottál egy névjegyet, aki nem támogatja a Signal csoportokat, így ez a csoport MMS lesz.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Nem vagy regisztrálva adat csatorna használatára, így a Signal csoportok le vannak tiltva.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Nem vagy regisztrálva Signal üzenetekre és hívásokra, így a Signal csoportok le vannak tiltva. Kérlek próbálj meg újraregisztrálni a Beállítások &gt; Haladó-ban.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Egy váratlan hiba történt, ami a csoport létrehozását meghiúsította.</string>
   <string name="GroupCreateActivity_contacts_no_members">A csoporthoz legalább egy emberre szükség van!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">A csoportod egyik tagjának számát nem lehet megfelelően olvasni. Kérlek javítsd ki, vagy távolítsd el a névjegyet és próbáld újra!</string>
@@ -369,7 +374,7 @@ Kérlek telepíts újra a Google Play Szolgáltatásokat és próbálkozz újra!
   <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Az általad tárcsázott szám nem támogatja a biztonságos hangot!</string>
   <string name="RedPhone_got_it">Megértettem</string>
   <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_signal">Csatlakozás a Signal-lal</string>
+  <string name="RegistrationActivity_connect_with_signal">Kapcsolódás a Signal-lal</string>
   <string name="RegistrationActivity_select_your_country">Saját ország kiválasztása </string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">Add meg a saját
 ország kódot!
@@ -514,6 +519,8 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <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ésben!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Új üzenet</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Kép</string>
   <string name="attachment_type_selector__audio">Hang</string>
@@ -688,15 +695,17 @@ az alakja!
   <string name="registration_progress_activity__call_me">Hívj fel</string>
   <string name="registration_progress_activity__edit_number">Szám szerkesztése</string>
   <string name="registration_progress_activity__connectivity_error">Kapcsolati hiba.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-        A Signal képtelen volt kapcsolódni a push szolgáltatáshoz.
-    </string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">A Signal nem tudott kapcsolódni a kiszolgálóhoz.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Néhány lehetséges probléma
 beleértve:
  </string>
   <string name="registration_progress_activity__no_network_connectivity">Nincs hálózati
 kapcsolat!
  </string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">A
+        készülékednek szüksége van hálózati kapcsolatra annak érdekében, hogy használni tudja ezt a Signal funkciót. Győződj meg róla,
+        hogy kapcsolódva van mobil adatokhoz vagy Wi-Fi-hez.
+    </string>
   <string name="registration_progress_activity__restrictive_firewall">Korlátozó tűzfal.
  </string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
@@ -747,11 +756,12 @@ sikertelen.
   <string name="AndroidManifest__change_passphrase">Jelmondat megváltoztatása</string>
   <string name="AndroidManifest__verify_identity">Azonosító ellenőrzése</string>
   <string name="AndroidManifest__log_submit">Hibakeresési napló küldése</string>
-  <string name="AndroidManifest__media_preview">Média előnézet</string>
   <string name="AndroidManifest__media_overview">Összes fénykép</string>
   <string name="AndroidManifest__media_overview_named">Összes fénykép vele: %1$s</string>
+  <string name="AndroidManifest__message_details">Üzenet részletek</string>
   <string name="AndroidManifest_manage_linked_devices">Társított készülékek kezelése</string>
   <string name="AndroidManifest__invite_friends">Barátok meghívása</string>
+  <string name="AndroidManifest_conversations_archive">Beszélgetések archívum</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importálás / Exportálás</string>
   <string name="arrays__your_identity_key">Azonosító kulcsod</string>
@@ -816,7 +826,6 @@ sikertelen.
   <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__inthread_notifications">Értesítések a beszélgetések során</string>
   <string name="preferences__play_inthread_notifications">Értesítési hang lejátszása, amikor aktív beszélgetést nézel</string>
   <string name="preferences__repeat_alerts">Figyelmeztetések megismétlése</string>
   <string name="preferences__never">Soha</string>
@@ -854,12 +863,9 @@ sikertelen.
   <string name="preferences__mmsc_password">MMSC jelszó</string>
   <string name="preferences__sms_delivery_reports">SMS kézbesítési jelentések</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Kézbesítési jelentés kérése minden elküldött SMS esetén</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Régebbi üzenetek automatikus törlése, amikor egy beszélgetésfolyam túllép egy megadott hosszt</string>
   <string name="preferences__delete_old_messages">Régi üzenetek törlése</string>
   <string name="preferences__chats">Csevegések és média</string>
   <string name="preferences__conversation_length_limit">Beszélgetés hosszának behatárolása</string>
-  <string name="preferences__trim_all_threads_now">Minden beszélgetésfolyam csonkolása</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Minden beszélgetésfolyam átnézése és a beszélgetés határoló hossz érvényre juttatása</string>
   <string name="preferences__devices">Készülékek</string>
   <string name="preferences__light_theme">Világos</string>
   <string name="preferences__dark_theme">Sötét</string>
@@ -915,11 +921,13 @@ sikertelen.
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">A kijelölt elemek törlése</string>
   <string name="conversation_list_batch__menu_select_all">Összes kijelölése</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Archívum kiválasztva</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Keresés</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Névjegyhez tartozó fénykép</string>
   <string name="conversation_list_item_view__error_alert">Hiba figyelmeztetés</string>
+  <string name="conversation_list_item_view__archived">Archivált</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Új beszélgetés</string>
   <!--conversation_secure_verified-->
@@ -957,6 +965,7 @@ sikertelen.
   <string name="text_secure_normal__menu_clear_passphrase">Lezárás</string>
   <string name="text_secure_normal__mark_all_as_read">Összes megjelölése olvasottként</string>
   <string name="text_secure_normal__invite_friends">Barátok meghívása</string>
+  <string name="text_secure_normal__help">Súgó</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">A Signal-od buildje lejárt!</string>
   <string name="reminder_header_expired_build_details">Az üzenetek küldése nem lesz sikeres, kérlek frissíts a legújabb verzióra!</string>
@@ -984,7 +993,6 @@ sikertelen.
   <!--media_preview-->
   <string name="media_preview__save_title">Mentés</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Kép előnézet</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Frissítés</string>
   <!--redphone_audio_popup_menu-->

res/values-in/strings.xml

@@ -10,7 +10,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Anda belum mengatur kata kunci!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s pesan per percakapan</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Hapus seluruh pesan lama?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Apakah anda yakin untuk memangkas seluruh rangkaian percakapan hingga ke %s pesan terakhir?</string>
   <string name="ApplicationPreferencesActivity_delete">Hapus</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Nonaktifkan frasa sandi?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -43,6 +42,7 @@
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Info kontak</string>
   <!--AudioSlidePlayer-->
+  <string name="AudioSlidePlayer_error_playing_audio">Gagal saat memutar audio!</string>
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Kontak yang diblokir</string>
   <!--CallScreen-->
@@ -69,10 +69,18 @@ kontak ini.
   <string name="ConversationItem_error_received_stale_key_exchange_message">Gagal, menerima pesan pertukaran kunci terhenti.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Menerima pesan pertukaran kunci, klik untuk memproses.</string>
   <string name="ConversationItem_group_action_left">si %1$s telah meninggalkan grup.</string>
-  <string name="ConversationItem_click_for_details">Ketuk untuk detail</string>
+  <string name="ConversationItem_click_for_details">Tekan untuk detail</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Tekan untuk beralih tanpa enkripsi</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Alihkan ke SMS tanpa enkripsi?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Alihkan ke MMS tanpa enkripsi?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Pesan ini <b>tidak</b> akan dienkripsi karena penerima tidak lagi menjadi pengguna Signal.\n\nTetap kirim pesan tidak aman?</string>
   <string name="ConversationItem_unable_to_open_media">Tidak bisa menemukan aplikasi untuk membuka media ini.</string>
   <!--ConversationActivity-->
+  <string name="ConversationActivity_reset_secure_session_question">Atur kembali sesi aman?</string>
+  <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Ini dapat membantu jika Anda mengalami masalah enkripsi dalam percakapan ini. Pesan Anda akan disimpan.</string>
+  <string name="ConversationActivity_reset">Atur kembali</string>
+  <string name="ConversationActivity_delete_thread_question">Hapus percakapan?</string>
+  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Ini akan menghapus secara permanen seluruh pesan dalam percakapan.</string>
   <string name="ConversationActivity_add_attachment">Tambahkan lampiran</string>
   <string name="ConversationActivity_select_contact_info">Pilih info kontak</string>
   <string name="ConversationActivity_compose_message">Tulis pesan</string>
@@ -107,6 +115,8 @@ kontak ini.
   <string name="ConversationActivity_unblock">Buka blokir</string>
   <string name="ConversationActivity_attachment_exceeds_size_limits">Lampiran melebihi batas ukuran untuk tipe pesan yang Anda kirimkan.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Kamera tidak tersedia</string>
+  <string name="ConversationActivity_unable_to_record_audio">Tidak bisa merekam audio!</string>
+  <string name="ConversationActivity_error_sending_voice_message">Gagal mengirim pesan suara...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Rincian pesan</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nKirim/Terima: %2$s</string>
@@ -140,9 +150,15 @@ kontak ini.
     <item quantity="other">Ini akan secara permanen menghapus semua %1$d percakapan terpilih.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Menghapus</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Menghapus percakapan yang dipilih ...</string>
+  <string name="ConversationListFragment_archived_conversations">Arsip percakapan</string>
+  <string name="ConversationListFragment_undo">ULANG</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Pindah percakapan ke kotak masuk</string>
+  <string name="ConversationListFragment_archived_conversation">Arsip percakapan</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Pindah percakapan ke kotak masuk</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Pesan pertukaran kunci...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Arsip percakapan (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Gunakan ubahsuai: %s</string>
   <string name="CustomDefaultPreference_using_default">Gunakan bawaan: %s</string>
@@ -169,24 +185,26 @@ kontak ini.
   <string name="ExperienceUpgradeActivity_textsecure_is_now_called_signal">TextSecure dan RedPhone sekarang bergabung menjadi perpesanan privat tunggal, untuk semua situasi: Signal.</string>
   <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Selamat datang di Signal!</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal">TextSecure sekarang adalah Signal.</string>
-  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure dan RedPhone sekarang bergabung menjadi satu aplikasi: Signal. Ketuk untuk menjelajah.</string>
+  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure dan RedPhone sekarang bergabung menjadi satu aplikasi: Signal. Tekan untuk menjelajah.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Eksport</string>
+  <string name="ExportFragment_export_plaintext_to_storage">Ekspor teks ke media penyimpanan?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Peringatan, ini akan mengeksport teks pesan Signal Anda ke media penyimpanan.</string>
   <string name="ExportFragment_cancel">Batal</string>
   <string name="ExportFragment_exporting">Mengeksport</string>
-  <string name="ExportFragment_error_unable_to_write_to_storage">Galat, tidak bisa menyimpan ke penyimpanan.</string>
-  <string name="ExportFragment_error_while_writing_to_storage">Galat saat menyimpan ke penyimpanan.</string>
+  <string name="ExportFragment_exporting_plaintext_to_storage">Mengeksport teks ke media penyimpanan...</string>
+  <string name="ExportFragment_error_unable_to_write_to_storage">Gagal, tidak bisa menyimpan ke penyimpanan.</string>
+  <string name="ExportFragment_error_while_writing_to_storage">Gagal saat menyimpan ke penyimpanan.</string>
   <string name="ExportFragment_success">Sukses!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Kegagalan permanen komunikasi Signal!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal tidak bisa mendaftar dengan Layanan Google Play. Komunikasi melalui saluran data dinonaktifkan, silahkan coba mendaftar ulang dari menu pengaturan Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal tidak dapat melakukan registrasi dengan Layanan Google Play. Fitur Signal seperti pesan dan panggilan di nonaktifkan, mohon registrasi ulang melalui Pengaturan</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Grup baru</string>
   <string name="GroupCreateActivity_actionbar_update_title">Perbarui grup</string>
   <string name="GroupCreateActivity_group_name_hint">Nama grup</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Grup MMS baru</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Anda telah memilih kontak yang tidak mendukung grup Signal, maka grup ini akan menjadi grup MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Anda tidak terdaftar untuk menggunakan saluran data, jadi grup Signal dinonaktifkan.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Terjadi kesalahan tidak terduga yang menggagalkan pembuatan grup.</string>
   <string name="GroupCreateActivity_contacts_no_members">Anda butuh minimal satu orang tergabung dalam grup Anda!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Salah satu anggota grup Anda memiliki nomor yang tidak dapat dibaca, silakan perbaiki atau keluarkan kontak tersebut dan coba lagi.</string>
@@ -217,10 +235,12 @@ kontak ini.
         tidak di cadangan.
     </string>
   <string name="ImportFragment_restore">Pulihkan</string>
+  <string name="ImportFragment_import_plaintext_backup">Import cadangan teks?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Ini akan mengimport
 pesan dari basis data SMS standar ke TextSecure. Jika anda sebelumnya
 telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikasi pesan.</string>
   <string name="ImportFragment_importing">Mengimport</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Mengimport cadangan teks...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Cadangan teks polos tidak ditemukan!</string>
   <string name="ImportFragment_error_importing_backup">Gagal mengimport cadangan!</string>
   <string name="ImportFragment_import_complete">Selesai mengimport!</string>
@@ -229,6 +249,7 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <string name="ImportFragment_no_encrypted_backup_found">Tidak menemukan adanya cadangan yang dienkripsi!</string>
   <string name="ImportFragment_restore_complete">Pemulihan selesai!</string>
   <!--InputPanel-->
+  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Tekan dan tahan untuk merekam pesan suara, lepas untuk mengirim</string>
   <!--InviteActivity-->
   <string name="InviteActivity_share">Berbagi</string>
   <string name="InviteActivity_send_sms">Kirim SMS</string>
@@ -261,6 +282,12 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <string name="NotificationBarManager_signal_call_in_progress">Kemajuan panggilan masuk Signal</string>
   <string name="NotificationBarManager_missed_call_from_s">Panggilan tak terjawab dari %s</string>
   <string name="NotificationBarManager_missed_signal_call">Panggilan tak terjawab Signal</string>
+  <string name="NotificationBarManager__establishing_signal_call">Menyiapkan panggilan Signal</string>
+  <string name="NotificationBarManager__incoming_signal_call">Panggilan masuk Signal</string>
+  <string name="NotificationBarManager__deny_call">Tolak panggilan</string>
+  <string name="NotificationBarManager__answer_call">Terima panggilan</string>
+  <string name="NotificationBarManager__end_call">Akhiri panggilan</string>
+  <string name="NotificationBarManager__cancel_call">Batalkan panggilan</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Pesan multimedia</string>
   <!--MessageRecord-->
@@ -280,12 +307,19 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <string name="DeviceProvisioningActivity_cancel">BATAL</string>
   <string name="DeviceProvisioningActivity_continue">LANJUTKAN</string>
   <string name="DeviceProvisioningActivity_title">Kaitkan perangkat ini?</string>
+  <string name="DeviceProvisioningActivity_content_intro">Ini akan dapat</string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+• Baca semua pesan Anda
+\n• Kirim pesan atas nama Anda
+</string>
   <string name="DeviceProvisioningActivity_content_progress_title">Mengaitkan perangkat</string>
   <string name="DeviceProvisioningActivity_content_progress_content">Mengaitkan perangkat baru...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Perangkat disetujui!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Perangkat tidak ditemukan.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Galat jaringan.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Kode QR tidak valid.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Maaf, sudah terlalu banyak perangkat yang Anda kaitkan, coba untuk membuang beberapa...</string>
+  <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Maaf, ini bukan tautan perangkat QR code yang benar.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Masukkan frasa sandi</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikon Signal</string>
@@ -301,7 +335,7 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <string name="RatingManager_later">Nanti</string>
   <!--RecipientPreferencesActivity-->
   <string name="RecipientPreferenceActivity_block_this_contact_question">Blokir kontak ini?</string>
-  <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_or_calls_from_this_user">Anda tidak akan lagi menerima pesan atau penggilan dari pengguna ini.</string>
+  <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_or_calls_from_this_user">Anda tidak akan bisa lagi menerima pesan atau penggilan dari pengguna ini.</string>
   <string name="RecipientPreferenceActivity_block">Blokir</string>
   <string name="RecipientPreferenceActivity_unblock_this_contact_question">Buka blokir kontak ini?</string>
   <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Apakah Anda yakin ingin membuka blokir kontak ini?</string>
@@ -318,8 +352,12 @@ telah mengimport basis data sistem SMS, hal ini akan menyebabkan adanya duplikas
   <string name="RedPhone_busy">Sibuk</string>
   <string name="RedPhone_connected">Tersambung</string>
   <string name="RedPhone_connecting">Menyambung</string>
+  <string name="RedPhone_handshake_failed">Otentikasi gagal!</string>
   <string name="RedPhone_recipient_unavailable">Penerima tidak tersedia</string>
+  <string name="RedPhone_performing_handshake">Melakukan otentikasi</string>
   <string name="RedPhone_network_failed">Jaringan gagal!</string>
+  <string name="RedPhone_client_failed">Klien gagal</string>
+  <string name="RedPhone_fatal_error">Kesalahan Fatal</string>
   <string name="RedPhone_login_failed">Gagal masuk!</string>
   <string name="RedPhone_message_from_the_server">Pesan dari server</string>
   <string name="RedPhone_number_not_registered">Nomor tidak terdaftar!</string>
@@ -375,7 +413,7 @@ isikan (%s) tidak tepat.
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Pendaftaran selesai</string>
   <string name="RegistrationService_signal_registration_has_successfully_completed">Pendaftaran Signal telah lengkap dan berhasil.</string>
-  <string name="RegistrationService_registration_error">Galat pendaftaran</string>
+  <string name="RegistrationService_registration_error">Pendaftaran gagal</string>
   <string name="RegistrationService_signal_registration_has_encountered_a_problem">Pendaftaran Signal mengalami masalah.</string>
   <!--Slide-->
   <string name="Slide_image">Gambar</string>
@@ -389,7 +427,7 @@ Diterima pesan pertukaran kunci untuk versi protokol yang tidak valid.
 </string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
 Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan menampilkan.</string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Menerima pembaharuan atas identitas yang tidak diketahui. Sentuh untuk memvalidasi identitas</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Menerima pembaharuan atas identitas yang tidak diketahui. Tekan untuk memvalidasi identitas</string>
   <string name="SmsMessageRecord_secure_session_reset">Sesi aman disetel ulang.</string>
   <string name="SmsMessageRecord_duplicate_message">Pesan Duplikat</string>
   <!--ThreadRecord-->
@@ -406,6 +444,7 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Penerima tidak memiliki kunci identitas.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Penerima tidak memiliki kunci identitas!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Pindai kunci untuk dicocokkan</string>
+  <string name="VerifyIdentityActivity_get_your_key_scanned">Pindai kunci saya</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">PERINGATAN, kunci terpindai TIDAK cocok! Mohon periksa teks sidik jari dengan baik.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">TIDAK diverifikasi!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Kunci benar. Diperlukan juga untuk memverifikasi kunci anda.</string>
@@ -421,6 +460,7 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="ViewIdentityActivity_verified_exclamation">Terverifikasi!</string>
   <string name="ViewIdentityActivity_your_identity_fingerprint">Sidik jari identitas Anda</string>
   <!--KeyExchangeInitiator-->
+  <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Memulai meskipun permintaan sudah ada?</string>
   <string name="KeyExchangeInitiator_send">Kirim</string>
   <!--MessageDisplayHelper-->
   <string name="MessageDisplayHelper_bad_encrypted_message">Enkripsi pada pesan tidak dapat dikenali</string>
@@ -435,7 +475,7 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="MmsDatabase_downloading_mms">Mengunduh MMS...</string>
   <string name="MmsDatabase_mms_download_failed">Pengunduhan MMS gagal!</string>
   <string name="MmsDatabase_downloading">Mengunduh...</string>
-  <string name="MmsDatabase_mms_pending_download">Sentuh untuk mengkonfigurasi pengaturan MMS untuk lanjut mengunduh.</string>
+  <string name="MmsDatabase_mms_pending_download">Tekan untuk mengkonfigurasi pengaturan MMS untuk lanjut mengunduh.</string>
   <string name="MmsDatabase_error_decrypting_message">Galat mendekripsi pesan.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">Proses deskripsi MMS, mohon tunggu...</string>
@@ -468,6 +508,8 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Tanggapan cepat tidak tersedia ketika Signal sedang dikunci!</string>
   <string name="QuickResponseService_problem_sending_message">Terjadi masalah saat mengirim pesan!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Pesan baru</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Gambar</string>
   <string name="attachment_type_selector__audio">Audio</string>
@@ -475,6 +517,9 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="attachment_type_selector__contact">Kontak</string>
   <string name="attachment_type_selector__camera">Kamera</string>
   <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">Kata sandi lama</string>
+  <string name="change_passphrase_activity__new_passphrase">Kata sandi baru</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">Ulang kata sandi baru</string>
   <!--contact_selection_activity-->
   <string name="contact_selection_activity__enter_name_or_number">Masukkan nama atau nomor</string>
   <!--contact_selection_group_activity-->
@@ -502,6 +547,7 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="conversation_activity__attachment_thumbnail">Gambar Mini Lampiran</string>
   <string name="conversation_activity__quick_attachment_drawer_toggle_description">Jungkit laci lampiran</string>
   <!--conversation_input_panel-->
+  <string name="conversation_input_panel__slide_to_cancel">GESER UNTUK MEMBATALKAN</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Pengunduhan pesan media</string>
   <string name="conversation_item__mms_image_description">Pesan media</string>
@@ -523,9 +569,12 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="country_selection_fragment__loading_countries">Memuat daftar negara...</string>
   <string name="country_selection_fragment__search">Cari</string>
   <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Pindai QR code yang tertera pada perangkat ke tautan</string>
   <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Tautan perangkat</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Tidak ada perangkat yang dikaitkan...</string>
+  <string name="device_list_fragment__link_new_device">Kaitkan perangkat baru</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">lanjutkan</string>
   <!--log_submit_activity-->
@@ -542,10 +591,14 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="database_migration_activity__importing">MENGIMPORT</string>
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Memperbarui basis data...</string>
+  <string name="export_fragment__export_plaintext_backup">Ekspor teks cadang</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Ekspor teks cadangan kompatibel dengan \'SMS Backup &amp; Restore\' ke media penyimpanan</string>
   <string name="import_fragment__import_system_sms_database">Impor basis data SMS sistem</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Impor basis data dari aplikasi bawaan perpesanan sistem</string>
   <string name="import_fragment__restore_encrypted_backup">Pulihkan cadangan terenkripsi</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">Pulihkan cadangan terenkripsi Signal yang sebelumnya diekspor</string>
+  <string name="import_fragment__import_plaintext_backup">Import teks cadangan</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">Import teks cadangan. Kompatibel dengan \'SMS Backup &amp; Restore.\'</string>
   <!--load_more_header-->
   <string name="load_more_header__see_full_conversation">Lihat seluruh percakapan</string>
   <!--media_overview_activity-->
@@ -561,7 +614,11 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <string name="MmsPreferencesFragment__invalid_uri">Teks yang dimasukkan bukan URI yang valid</string>
   <string name="MmsPreferencesFragment__invalid_host">Teks yang dimasukkan bukan host yang valid</string>
   <!--GroupUtil-->
+  <plurals name="GroupUtil_joined_the_group">
+    <item quantity="other">%1$s bergabung dengan grup</item>
+  </plurals>
   <string name="GroupUtil_group_updated">Grup diperbarui.</string>
+  <string name="GroupUtil_group_name_is_now">Nama grup sekarang \'%1$s\'.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Buka Kunci</string>
   <!--prompt_mms_activity-->
@@ -618,28 +675,30 @@ termasuk:
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Verifikasi suara</string>
   <string name="registration_progress_activity__signal_can_also_call_you_to_verify_your_number">
-        Signal juga bisa menelpon Anda untuk memverifikasi nomor Anda. Ketuk \'Panggil Saya\' dan masukkan enam digit
-        yang Anda dengar.
+Signal juga bisa menelpon Anda untuk memverifikasi nomor Anda. Tekan \'Panggil Saya\' dan masukkan enam digit
+yang Anda dengar.
     </string>
   <string name="registration_progress_activity__verify">Verifikasi</string>
   <string name="registration_progress_activity__call_me">Panggil saya</string>
   <string name="registration_progress_activity__edit_number">Edit nomor</string>
   <string name="registration_progress_activity__connectivity_error">Kesalahan konektivitas</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-        Signal tidak bisa tersambung ke layanan push.
-    </string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal tidak dapat terhubung ke server.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Kemungkinan masalah
 termasuk:
 </string>
   <string name="registration_progress_activity__no_network_connectivity">Tidak ada konektivitas
 jaringan.
 </string>
-  <string name="registration_progress_activity__restrictive_firewall">Firewall yang ketat.
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Perangkat Anda
+membutuhkan konektivitas jaringan agar dapat menggunakan fitur Signal. Periksa untuk memastikan
+Anda tersambung ke data seluler atau Wi-Fi.
+</string>
+  <string name="registration_progress_activity__restrictive_firewall">Firewall membatasi.
 </string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
-        Anda tersambung melalui Wi-Fi, ada kemungkinan ada aturan firewall yang memblokir akses ke
-        server Signal. Coba jaringan lain atau data seluler.
-    </string>
+Jika Anda tersambung melalui Wi-Fi, kemungkinan ada pengaturan firewall yang memblokir akses ke
+server Signal. Coba jaringan lain atau gunakan data seluler.
+</string>
   <string name="registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
         Signal akan secara otomatis memverifikasi nomor Anda menggunakan konfirmasi pesan SMS.
     </string>
@@ -654,12 +713,12 @@ SMS...</string>
         Signal kehabisan waktu saat menunggu pesan verifikasi SMS.
     </string>
   <string name="registration_progress_activity__sms_verification_failed">Verifikasi SMS
-Telah gagal
+gagal
 </string>
   <string name="registration_progress_activity__generating_keys">Membuat kunci...</string>
   <string name="registration_progress_activity__alert">Peringatan</string>
   <string name="registration_progress_activity__telephone">Telepon</string>
-  <string name="registration_progress_activity__check">Cek</string>
+  <string name="registration_progress_activity__check">Periksa</string>
   <!--recipients_panel-->
   <string name="recipients_panel__to"><small>Masukkan nama atau nomor</small></string>
   <string name="recipients_panel__add_member">Tambah Anggota</string>
@@ -683,11 +742,12 @@ Telah gagal
   <string name="AndroidManifest__change_passphrase">Ganti Kata Kunci</string>
   <string name="AndroidManifest__verify_identity">Verifikasi identitas</string>
   <string name="AndroidManifest__log_submit">Kirim debug log</string>
-  <string name="AndroidManifest__media_preview">Pratinjau Media</string>
   <string name="AndroidManifest__media_overview">Semua gambar</string>
   <string name="AndroidManifest__media_overview_named">Semua gambar dengan %1$s</string>
+  <string name="AndroidManifest__message_details">Rincian pesan</string>
   <string name="AndroidManifest_manage_linked_devices">Kelola perangkat terkait</string>
   <string name="AndroidManifest__invite_friends">Undang teman</string>
+  <string name="AndroidManifest_conversations_archive">Arsip percakapan</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Impor / ekspor</string>
   <string name="arrays__your_identity_key">Kunci identitas Anda</string>
@@ -703,6 +763,7 @@ Telah gagal
   <string name="arrays__disabled">Nonaktif</string>
   <string name="arrays__name_and_message">Nama dan pesan</string>
   <string name="arrays__name_only">Nama saja</string>
+  <string name="arrays__no_name_or_message">Tidak ada nama atau pesan</string>
   <string name="arrays__images">Gambar</string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Video</string>
@@ -749,7 +810,7 @@ Telah gagal
   <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__inthread_notifications">Pemberitahuan dalam percakapan</string>
+  <string name="preferences__silent">Diam</string>
   <string name="preferences__play_inthread_notifications">Putar suara pemberitahuan ketika berada pada percakapan aktif</string>
   <string name="preferences__repeat_alerts">Ulangi peringatan</string>
   <string name="preferences__never">Tidak pernah</string>
@@ -787,12 +848,10 @@ Telah gagal
   <string name="preferences__mmsc_password">Kata Sandi MMSC</string>
   <string name="preferences__sms_delivery_reports">Laporan pengiriman SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Minta laporan pengiriman untuk tiap SMS yang dikirim</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Secara otomatis hapus pesan yang lebih lama ketika percakapan telah melebihi jumlah yang ditentukan</string>
   <string name="preferences__delete_old_messages">Hapus pesan lama</string>
   <string name="preferences__chats">Obrolan dan media</string>
   <string name="preferences__conversation_length_limit">Batas panjang percakapan</string>
-  <string name="preferences__trim_all_threads_now">Pangkas seluruh percakapan sekarang</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Pindai seluruh rangkaian percakapan dan terapkan batas panjang percakapan</string>
+  <string name="preferences__devices">Perangkat</string>
   <string name="preferences__light_theme">Terang</string>
   <string name="preferences__dark_theme">Gelap</string>
   <string name="preferences__appearance">Penampilan</string>
@@ -831,6 +890,7 @@ Telah gagal
   <!--conversation_callable_insecure-->
   <string name="conversation_callable_insecure__menu_call">Panggil</string>
   <!--conversation_callable_secure-->
+  <string name="conversation_callable_secure__menu_call">Panggilan Signal</string>
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Rincian pesan</string>
   <string name="conversation_context__menu_copy_text">Salin teks</string>
@@ -846,11 +906,13 @@ Telah gagal
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Hapus terpilih</string>
   <string name="conversation_list_batch__menu_select_all">Pilih semua</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Arsip terpilih</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Cari</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Gambar Foto Kontak</string>
   <string name="conversation_list_item_view__error_alert">Galat peringatan</string>
+  <string name="conversation_list_item_view__archived">Diarsipkan</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Percakapan baru</string>
   <!--conversation_secure_verified-->
@@ -865,6 +927,7 @@ Telah gagal
   <string name="conversation__menu_add_attachment">Tambahkan lampiran</string>
   <string name="conversation__menu_update_group">Perbarui grup</string>
   <string name="conversation__menu_leave_group">Keluar grup</string>
+  <string name="conversation__menu_delete_thread">Hapus percakapan</string>
   <string name="conversation__menu_view_media">Semua gambar</string>
   <string name="conversation__menu_conversation_settings">Pengaturan percakapan</string>
   <!--conversation_popup-->
@@ -887,15 +950,16 @@ Telah gagal
   <string name="text_secure_normal__menu_clear_passphrase">Kunci</string>
   <string name="text_secure_normal__mark_all_as_read">Tandai semua dibaca</string>
   <string name="text_secure_normal__invite_friends">Undang teman</string>
+  <string name="text_secure_normal__help">Batuan</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Versi Signal Anda telah usang!</string>
   <string name="reminder_header_expired_build_details">Pesan tidak akan bisa lagi terkirim dengan sukses, mohon mutakhirkan ke versi terbaru.</string>
   <string name="reminder_header_expired_build_button">PERBARUI</string>
   <string name="reminder_header_sms_default_title">Gunakan sebagai aplikasi SMS baku</string>
-  <string name="reminder_header_sms_default_text">Ketuk untuk membuat Signal menjadi aplikasi SMS baku Anda.</string>
+  <string name="reminder_header_sms_default_text">Tekan untuk membuat Signal menjadi aplikasi SMS utama Anda.</string>
   <string name="reminder_header_sms_default_button">SET</string>
   <string name="reminder_header_sms_import_title">Impor SMS sistem</string>
-  <string name="reminder_header_sms_import_text">Ketuk untuk menyalin pesan SMS telepon Anda ke dalam basis data terenkripsi.</string>
+  <string name="reminder_header_sms_import_text">Tekan untuk menyalin pesan SMS telepon Anda ke dalam basis data terenkripsi.</string>
   <string name="reminder_header_sms_import_button">IMPOR</string>
   <string name="reminder_header_push_title">Aktifkan pesan dan panggilan Signal</string>
   <string name="reminder_header_push_text">Tingkatkan pengalaman komunikasi Anda.</string>
@@ -914,9 +978,12 @@ Telah gagal
   <!--media_preview-->
   <string name="media_preview__save_title">Simpan</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Pratinjau Gambar</string>
   <!--new_conversation_activity-->
+  <string name="new_conversation_activity__refresh">Perbaharui</string>
   <!--redphone_audio_popup_menu-->
+  <string name="redphone_audio_popup_menu__handset">Handset</string>
+  <string name="redphone_audio_popup_menu__headset">Headset</string>
+  <string name="redphone_audio_popup_menu__speaker">Pengeras suara</string>
   <!--Trimmer-->
   <string name="trimmer__deleting">Menghapus</string>
   <string name="trimmer__deleting_old_messages">Menghapus pesan lama...</string>

res/values-it/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Non hai ancora impostato una password!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s messaggi per conversazione</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Eliminare tutti i messaggi vecchi ora?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Vuoi davvero ridurre tutte conversazioni ai soli %s messaggi più recenti?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Questo ridurrà immediatamente tutte le conversazioni ai %s messaggi più recenti.</string>
   <string name="ApplicationPreferencesActivity_delete">Elimina</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Disabilitare la password?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -152,9 +152,16 @@ questo contatto.</string>
     <item quantity="other">Così cancellerai per sempre le %1$d conversazioni selezionate.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Eliminazione</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Eliminazione delle conversazioni selezionate...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Eliminazione delle conversazioni selezionate...</string>
+  <string name="ConversationListFragment_archived_conversations">Conversazioni archiviate</string>
+  <string name="ConversationListFragment_undo">ANNULLA</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Sposta la conversazione nei messaggi in arrivo</string>
+  <string name="ConversationListFragment_archived_conversation">Conversazione archiviata</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Sposta le conversazioni nei messaggi in arrivo</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Messaggio di scambio della chiave...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Conversazioni archiviate (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Utilizzo di personalizzato: %s</string>
   <string name="CustomDefaultPreference_using_default">Utilizzo di predefinito: %s</string>
@@ -174,6 +181,7 @@ questo contatto.</string>
   <string name="DeviceListItem_unnamed_device">Dispositivo senza nome</string>
   <string name="DeviceListItem_linked_s">Collegato %s</string>
   <string name="DeviceListItem_last_active_s">Ultima attività %s</string>
+  <string name="DeviceListItem_today">Oggi</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Condividi con</string>
   <!--ExperienceUpgradeActivity-->
@@ -194,14 +202,15 @@ questo contatto.</string>
   <string name="ExportFragment_success">Completato!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Comunicazione Signal fallita definitivamente!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal non è stato in grandi di registrarsi con i Google Play Services. La comunicazione via internet è stata disabilitata, ti preghiamo di registrarti nuovamente dal menu delle impostazioni.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal è stato impossibilitato a registrarsi con i sevizi di Google Play.
+I suoi messagi e le chiamate sono state disabilitate, si prega di provare e ri-registrare in Impostazioni &gt; Avanzate.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nuovo gruppo</string>
   <string name="GroupCreateActivity_actionbar_update_title">Aggiorna gruppo</string>
   <string name="GroupCreateActivity_group_name_hint">Nome del gruppo</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nuovo gruppo MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Hai selezionato un contatto che non supporta i gruppi di Signal, quindi questo gruppo sarà via MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Non sei registrato per usare i dati internet, quindi i gruppi di Signal sono disabilitati.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Non sei registrato per i messeggi e le chiamate Signal, pertanto i gruppi sono disabilitati. Si prega di ri-registrarsi in Impostazioni &gt; Avanzate.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Si è verificato un errore inatteso e la creazione del gruppo è fallito.</string>
   <string name="GroupCreateActivity_contacts_no_members">Il tuo gruppo deve contenere almeno una persona!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Uno dei membri del tuo gruppo ha un numero che non può essere letto correttamente. Sistema o rimuovi quel contatto e prova di nuovo.</string>
@@ -240,6 +249,7 @@ una nuova importazione creerà dei messaggi duplicati.</string>
   <string name="ImportFragment_no_encrypted_backup_found">Nessuna copia cifrata trovata!</string>
   <string name="ImportFragment_restore_complete">Ripristino completato!</string>
   <!--InputPanel-->
+  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Tieni premuto per registrare un messaggio vocale, rilascia per inviare</string>
   <!--InviteActivity-->
   <string name="InviteActivity_share">Condividi</string>
   <string name="InviteActivity_send_sms">Invia SMS</string>
@@ -311,6 +321,7 @@ una nuova importazione creerà dei messaggi duplicati.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Codice QR non valido.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Siamo spiacenti, hai già troppi dispositivi collegati. Prova a scollegarne qualcuno...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Ci spiace, questo non è un codice QR valido per collegare il dispositivo.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Collegare un dispositivo Signal?</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Inserire la password</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icona Signal</string>
@@ -496,7 +507,7 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="QuickResponseService_problem_sending_message">Problema nell\'invio del messaggio!</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Nuovo messaggio!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Nuovo messaggio</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Immagine</string>
   <string name="attachment_type_selector__audio">Audio</string>
@@ -578,11 +589,13 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Aggiornando il database...</string>
   <string name="export_fragment__export_plaintext_backup">Esportare copia in chiaro</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Esporta in memoria una copia in chiaro compatibile con \'SMS Backup &amp; Restore\'</string>
   <string name="import_fragment__import_system_sms_database">Importa gli SMS dal database criptato</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Importa i messaggi dall\'app di sistema per gli SMS</string>
   <string name="import_fragment__restore_encrypted_backup">Ripristina backup criptato</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">Ripristina un backup cifrato di Signal precedentemente esportato.</string>
   <string name="import_fragment__import_plaintext_backup">Importare copia in chiaro</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">Importa un file dalla memoria. Compatibile con \'SMS Backup &amp; Restore\'</string>
   <!--load_more_header-->
   <string name="load_more_header__see_full_conversation">Vedi tutta la conversazione</string>
   <!--media_overview_activity-->
@@ -661,14 +674,14 @@ Signal non funziona con i numeri Google Voice</string>
   <string name="registration_progress_activity__call_me">Chiamami</string>
   <string name="registration_progress_activity__edit_number">Modifica numero</string>
   <string name="registration_progress_activity__connectivity_error">Errore di connessione.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal non è stato in grado di connettersi al servizio push.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal non è in grado di connettersi al server.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Alcuni possibili
         problemi includono:
     </string>
   <string name="registration_progress_activity__no_network_connectivity">Nessuna connessione
 di rete.
 </string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Per usare questa funzionalità di Signal il tuo dispositivo necessita di connettività. Assicurati che sia connesso alla rete mobile o in Wi-Fi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Firewall troppo restrittivo.
     </string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
@@ -702,7 +715,7 @@ non riuscita.
   <string name="message_details_header__issues_need_your_attention">Alcuni problemi necessitano della tua attenzione.</string>
   <string name="message_details_header__sent">Inviato</string>
   <string name="message_details_header__received">Ricevuto</string>
-  <string name="message_details_header__via">Attrave</string>
+  <string name="message_details_header__via">Tramite</string>
   <string name="message_details_header__to">A:</string>
   <string name="message_details_header__from">Da:</string>
   <string name="message_details_header__with">Con:</string>
@@ -715,12 +728,13 @@ non riuscita.
   <string name="AndroidManifest__change_passphrase">Cambia passphrase</string>
   <string name="AndroidManifest__verify_identity">Verifica identità</string>
   <string name="AndroidManifest__log_submit">Invia log di debug</string>
-  <string name="AndroidManifest__media_preview">Anteprima media</string>
+  <string name="AndroidManifest__media_preview">Anteprima contenuto multimediale</string>
   <string name="AndroidManifest__media_overview">Tutte le immagini</string>
   <string name="AndroidManifest__media_overview_named">Tutte le immagini con %1$s</string>
   <string name="AndroidManifest__message_details">Dettagli messaggio</string>
   <string name="AndroidManifest_manage_linked_devices">Gestisci dispositivi collegati</string>
   <string name="AndroidManifest__invite_friends">Invita amici</string>
+  <string name="AndroidManifest_conversations_archive">Archivio conversazioni</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importa / Esporta</string>
   <string name="arrays__your_identity_key">Chiave della tua identità</string>
@@ -785,7 +799,7 @@ non riuscita.
   <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__inthread_notifications">Notifiche</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>
   <string name="preferences__repeat_alerts">Ripeti notifiche</string>
   <string name="preferences__never">Mai</string>
@@ -823,12 +837,12 @@ non riuscita.
   <string name="preferences__mmsc_password">MMSC Password</string>
   <string name="preferences__sms_delivery_reports">Rapporti di consegna SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Richiedi un rapporto di consegna per ogni SMS inviato</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Elimina automaticamente i messaggi più vecchi quando un thread di conversazione supera una certa lunghezza</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Elimina automaticamente i messaggi più vecchi quando una conversazione supera una certa lunghezza.</string>
   <string name="preferences__delete_old_messages">Elimina i messaggi vecchi</string>
   <string name="preferences__chats">Chat e download</string>
   <string name="preferences__conversation_length_limit">Limite di lunghezza conversazione</string>
-  <string name="preferences__trim_all_threads_now">Riduci immediatamente tutti i thread</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Analizza tutti i thread e applica il limite di lunghezza delle conversazioni.</string>
+  <string name="preferences__trim_all_conversations_now">Riduci immediatamente tutte le conversazioni</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Analizza tutte le conversazioni e applica il limite di lunghezza.</string>
   <string name="preferences__devices">Dispositivi</string>
   <string name="preferences__light_theme">Chiaro</string>
   <string name="preferences__dark_theme">Scuro</string>
@@ -884,11 +898,13 @@ non riuscita.
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Elimina selezionati</string>
   <string name="conversation_list_batch__menu_select_all">Seleziona tutto</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Archivia queste conversazioni</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Cerca</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Foto del contatto</string>
   <string name="conversation_list_item_view__error_alert">Messaggio di errore</string>
+  <string name="conversation_list_item_view__archived">Archiviate</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nuova conversazione</string>
   <!--conversation_secure_verified-->
@@ -954,7 +970,7 @@ non riuscita.
   <!--media_preview-->
   <string name="media_preview__save_title">Salva</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Anteprima Immagine</string>
+  <string name="media_preview_activity__image_content_description">Anteprima immagine</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Aggiorna</string>
   <!--redphone_audio_popup_menu-->

res/values-iw/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">עדיין לא הגדרת משפט סודי!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s מסרים בשיחה</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">למחוק את כל המסרים הישנים עכשיו?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">האם באמת לקצץ מיד את כל שרשורי השיחות עד ל־%s המסרים הכי חדשים?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">זה יקצץ מיד את כל השיחות ל־%s השיחות האחרונות.</string>
   <string name="ApplicationPreferencesActivity_delete">מחיקה</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">לבטל את המשפט הסודי?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -156,9 +156,16 @@
     <item quantity="other">זה ימחק לצמיתות את כל %1$d השיחות שנבחרו.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">מוחק</string>
-  <string name="ConversationListFragment_deleting_selected_threads">מוחק שרשורים שנבחרו...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">מחיקת השיחות הנבחרות...</string>
+  <string name="ConversationListFragment_archived_conversations">שיחות גנוזות</string>
+  <string name="ConversationListFragment_undo">ביטול</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">העברת שיחות לדואר נכנס</string>
+  <string name="ConversationListFragment_archived_conversation">שיחה גנוזה</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">הועברו שיחות לדואר נכנס</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">הודעת החלפת מפתח...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">שיחות גנוזות (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">משתמש בהגדרה מותאמת אישית: %s</string>
   <string name="CustomDefaultPreference_using_default">משמש הערך ההתחלתי: %s</string>
@@ -178,6 +185,7 @@
   <string name="DeviceListItem_unnamed_device">מכשיר ללא שם</string>
   <string name="DeviceListItem_linked_s">קישרתי את %s</string>
   <string name="DeviceListItem_last_active_s">פעל לאחרונה %s</string>
+  <string name="DeviceListItem_today">היום</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">לשתף עם</string>
   <!--ExperienceUpgradeActivity-->
@@ -198,14 +206,14 @@
   <string name="ExportFragment_success">זה עבד!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">כישלון קבוע בתקשורת סיגנל!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">סיגנל לא הצליח להירשם עם שירותי Google Play. תקשורת דרך ערוץ נתונים כובתה, נא לנסות להירשם מחדש דרך תפריט ההגדרות של סיגנל.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">סיגנל לא הצליח להירשם בשירותי גוגל Play. מסרים ושיחות של סיגנל כובו, נא לנסות להירשם שוב בהגדרות &lt; מתקדם.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">קבוצה חדשה</string>
   <string name="GroupCreateActivity_actionbar_update_title">עדכון קבוצה</string>
   <string name="GroupCreateActivity_group_name_hint">שם הקבוצה</string>
   <string name="GroupCreateActivity_actionbar_mms_title">קבוצת MMS חדשה</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">בחרת איש קשר שאינו תומך בקבוצות סיגנל, אז הקבוצה הזאת תהיה מסוג MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">לא נרשמת לשימוש בערוץ נתונים, אז קבוצות סיגנל כבויות.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">לא נרשמת למסרים ושיחות של סיגנל, אז קבוצות סיגנל כבויות. נא לנסות להירשם שוב בהגדרות &lt; מתקדם.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">אירעה שגיאה בלתי־צפויה שבגללה יצירת הקבוצה נכשלה.</string>
   <string name="GroupCreateActivity_contacts_no_members">צריך להיות לפחות אדם אחד בקבוצה הזאת!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">לאחד החברים בקבוצה שלך יש מספר שאי־אפשר לקרוא נכון. נא לתקן את זה או להסיר את איש הקשר הזה ולנסות שוב.</string>
@@ -321,6 +329,8 @@
   <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">לקשר מכשיר סיגנל?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">נראה שניסית לקשר מכשיר סיגנל באמצעות סורק מצד שלישי. למען בטיחותך, נא לסרוק את הקוד שוב באמצעות סיגנל.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">נא לרשום משפט סודי</string>
   <string name="PassphrasePromptActivity_watermark_content_description">סמל סיגנל</string>
@@ -503,6 +513,8 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">תשובה מהירה אינה זמינה כשסיגנל נעול!</string>
   <string name="QuickResponseService_problem_sending_message">בעיה בשליחת מסר!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">סיגנל</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">מסר חדש</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">תמונה</string>
   <string name="attachment_type_selector__audio">קול</string>
@@ -643,7 +655,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">הרישום שולח פרטי קשרמ מסוימים לשרת. הם לא יישמרו.</string>
+  <string name="registration_activity__registration_will_transmit_some_contact_information_to_the_server_temporariliy">הרישום שולח פרטי קשר מסוימים לשרת. הם לא יישמרו.</string>
   <string name="registration_activity__powered_by_twilio">מופעל באמצעות טוויליו</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">בעיות אפשריות
@@ -669,24 +681,24 @@
   <string name="registration_progress_activity__call_me">התקשרו אליי</string>
   <string name="registration_progress_activity__edit_number">עריכת המספר</string>
   <string name="registration_progress_activity__connectivity_error">שגיאת קישוריות.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-סיגנל לא הצליח להתחבר לשירות דחיפה.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">סיגנל לא הצליח להתחבר לשרת.</string>
   <string name="registration_progress_activity__some_possible_problems_include">בעיות
 אפשריות:</string>
   <string name="registration_progress_activity__no_network_connectivity">אין קישורית
 רשת.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">במכשיר שלך צריכה לעבוד קישוריות רשת כדי להשתמש ביכולת הזאת של סיגנל. נא לבדוק שהוא מחובר לנתונים ניידים או לווייפיי.</string>
   <string name="registration_progress_activity__restrictive_firewall">חומת־אש מגבילה.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 אם התחברת דרך וייפיי, ייתכן שיש חומת־אש שחוסמת את הגישה
 לשרת סיגנל. נא לנסות רשת אחרת או להפעיל נתונים ניידים.</string>
   <string name="registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
-מעכשין סיגנל יאמת את המספר שלך אוטומטית עם SMS.</string>
+סיגנל יאמת עכשיו את המספר שלך אוטומטית באמצעות SMS.</string>
   <string name="registration_progress_activity__connecting">מתחבר...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">ממתין
 לאימות SMS...</string>
   <string name="registration_progress_activity__registering_with_server">נרשם בשרת...</string>
   <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">זה
-יכול לקחת רגע. נא להמתיןם בסבלנות, אנחנו נודיע לך כשהאימות יושלם.</string>
+יכול לקחת רגע. נא להמתין בסבלנות, אנחנו נודיע לך כשהאימות יושלם.</string>
   <string name="registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message">
 בסיגנל פג הזמן להמתנה לאימות SMS.</string>
   <string name="registration_progress_activity__sms_verification_failed">אימות SMS
@@ -721,8 +733,10 @@
   <string name="AndroidManifest__media_preview">תצוגה מקדימה של מדיה</string>
   <string name="AndroidManifest__media_overview">כל התמונות</string>
   <string name="AndroidManifest__media_overview_named">כל התמונות עם %1$s</string>
+  <string name="AndroidManifest__message_details">פרטי מסר</string>
   <string name="AndroidManifest_manage_linked_devices">ניהול מכשירים מקושרים</string>
   <string name="AndroidManifest__invite_friends">להזמין חברים</string>
+  <string name="AndroidManifest_conversations_archive">גנזך שיחות</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">ייבוא / ייצוא</string>
   <string name="arrays__your_identity_key">מפתח הזהות שלך</string>
@@ -787,7 +801,7 @@
   <string name="preferences__sound">קול</string>
   <string name="preferences__change_notification_sound">שינוי צליל ההתראה</string>
   <string name="preferences__silent">שקט</string>
-  <string name="preferences__inthread_notifications">התראות תוך־שרשוריות</string>
+  <string name="preferences__in_conversation_notifications">התראות בתוך השיחה</string>
   <string name="preferences__play_inthread_notifications">לנגן צליל התראה רק בזמן הצגת שיחה פעילה</string>
   <string name="preferences__repeat_alerts">התראות חוזרות</string>
   <string name="preferences__never">לעולם לא</string>
@@ -825,12 +839,12 @@
   <string name="preferences__mmsc_password">ססמת MMSC</string>
   <string name="preferences__sms_delivery_reports">דו״חות מסירה של SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">לבקש דו״ח מסירה לכל SMS שנשלח</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">למחוק אוטומטית הודעות ישנות יותר כששרשור השיחה עולה על אורך מסוים</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">למחוק אוטומטית הודעות ישנות יותר כשהשיחה עולה על אורך מסוים</string>
   <string name="preferences__delete_old_messages">למחוק הודעות ישנות</string>
   <string name="preferences__chats">התכתבויות ומדיה</string>
   <string name="preferences__conversation_length_limit">הגבלת אורך שיחה</string>
-  <string name="preferences__trim_all_threads_now">לקצץ את כל השרשורים כעת</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">לבצע סריקה של כל השרשורים ולאכוף את הגבלות אורך השיחה</string>
+  <string name="preferences__trim_all_conversations_now">לקצץ את כל השיחות כעת</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">לסרוק את כל השיחות ולאכוף את הגבלות אורך השיחה</string>
   <string name="preferences__devices">מכשירים</string>
   <string name="preferences__light_theme">בהירה</string>
   <string name="preferences__dark_theme">חשוכה</string>
@@ -886,11 +900,14 @@
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">מחיקת נבחרים</string>
   <string name="conversation_list_batch__menu_select_all">לבחור הכוללבחור הכול</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">גנזך נבחר</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">להוציא את הנבחרות מהגניזה</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">חיפוש</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">צילום איש קשר</string>
   <string name="conversation_list_item_view__error_alert">התרעת על שגיאה</string>
+  <string name="conversation_list_item_view__archived">נגנז</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">שיחה חדשה</string>
   <!--conversation_secure_verified-->
@@ -928,6 +945,7 @@
   <string name="text_secure_normal__menu_clear_passphrase">נעילה</string>
   <string name="text_secure_normal__mark_all_as_read">לסמן שקראתי את הכול</string>
   <string name="text_secure_normal__invite_friends">להזמין חברים</string>
+  <string name="text_secure_normal__help">עזרה</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">גרסת הסיגנל שלך פגה!</string>
   <string name="reminder_header_expired_build_details">מסרים לא יישלחו יותר כמו שצריך, נא לשדרג לגרסה החדשה ביותר.</string>

res/values-ja/strings.xml

@@ -9,7 +9,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">パスワードが登録されていません。</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">会話あたり %s のメッセージ</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">全ての古いメッセージを今、削除しますか？</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">今すぐ全ての会話スレッドを最新メッセージ%s通にまで縮小（トリム）しますか？</string>
   <string name="ApplicationPreferencesActivity_delete">削除</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">パスワードを無効にする?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -113,9 +112,9 @@
   <string name="ConversationListActivity_search">検索...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_deleting">削除</string>
-  <string name="ConversationListFragment_deleting_selected_threads">選択したスレッドを削除中…</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">鍵交換のメッセージ…</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">カスタム利用: %s</string>
   <string name="CustomDefaultPreference_using_default">デフォルト利用: %s</string>
@@ -347,6 +346,7 @@
   <!--QuickResponseService-->
   <string name="QuickResponseService_problem_sending_message">送信メッセージでの問題!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_message">新規メッセージ</string>
   <!--attachment_type_selector-->
   <!--change_passphrase_activity-->
   <!--contact_selection_activity-->
@@ -500,7 +500,6 @@
   <string name="AndroidManifest__change_passphrase">パスワードの変更</string>
   <string name="AndroidManifest__verify_identity">認証検証</string>
   <string name="AndroidManifest__log_submit">デバッグログを提出</string>
-  <string name="AndroidManifest__media_preview">メディアのプレビュー表示</string>
   <string name="AndroidManifest__media_overview">すべての画像</string>
   <string name="AndroidManifest__media_overview_named">%1$s とすべての画像</string>
   <string name="AndroidManifest_manage_linked_devices">リンク済みデバイスの管理</string>
@@ -561,7 +560,6 @@
   <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__inthread_notifications">スレッド内通知</string>
   <string name="preferences__play_inthread_notifications">アクティブな会話を表示している間で通知音を再生</string>
   <string name="preferences__repeat_alerts">アラートの繰り返し</string>
   <string name="preferences__never">なし</string>
@@ -599,12 +597,9 @@
   <string name="preferences__mmsc_password">MMSCパスワード</string>
   <string name="preferences__sms_delivery_reports">SMS配信報告</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">送信する全てのSMSに配信報告をつけます</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">会話スレッドが一定の長さを超えると、古いメッセージが自動的に削除されます</string>
   <string name="preferences__delete_old_messages">古いメッセージの削除</string>
   <string name="preferences__chats">チャットとメディア</string>
   <string name="preferences__conversation_length_limit">会話の最大の長さ</string>
-  <string name="preferences__trim_all_threads_now">全スレッドを今、トリムする</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">すべての会話スレッドをスキャンして、会話の長さの制限を強制します</string>
   <string name="preferences__light_theme">ライト</string>
   <string name="preferences__dark_theme">ダーク</string>
   <string name="preferences__appearance">デザイン設定</string>
@@ -702,7 +697,6 @@
   <!--media_preview-->
   <string name="media_preview__save_title">保存</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">画像プレビュー表示</string>
   <!--new_conversation_activity-->
   <!--redphone_audio_popup_menu-->
   <!--Trimmer-->

res/values-kn-rIN/strings.xml

@@ -9,7 +9,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">ನೀವು ಇನ್ನೂ ಗುಪ್ತಪದವನ್ನು ಹೊಂದಿಸಿಲ್ಲ!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">ಪ್ರತಿ ಸಂವಾದಕ್ಕೆ %s ಸಂದೇಶಗಳು</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">ಈಗ ಎಲ್ಲಾ ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">ನೀವು ಈ  ಕ್ಷಣ ಎಲ್ಲಾ ಸಂಭಾಷಣೆಯ ಇತ್ತೀಚಿನ %s ಸಂದೇಶಗಳಿಗೆ ಮಿತಗೊಳಿಸಲು ಖಚಿತವಾಗಿ ಬಯಸುವಿರಾ?</string>
   <string name="ApplicationPreferencesActivity_delete">ಅಳಿಸಿಹಾಕು</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">ಗುಪ್ತಪದವನ್ನು ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
   <string name="ApplicationPreferencesActivity_disable">ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಿ</string>
@@ -105,9 +104,9 @@
   <string name="ConversationListActivity_search">ಹುಡುಕಿ...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_deleting">ಅಳಿಸಲಾಗುತ್ತಿದೆ</string>
-  <string name="ConversationListFragment_deleting_selected_threads">ಆಯ್ದ ವಾದಗಳನ್ನು ಅಳಿಸಲಾಗುತ್ತಿದೆ ...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">ಕೀಲಿ ವಿನಿಮಯ ಸಂದೇಶ...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">ಇಚ್ಛೆಯ ಬಳಕೆ: %s</string>
   <string name="CustomDefaultPreference_using_default">ಪೂರ್ವನಿಯೋಜಿತ ಬಳಕೆ: %s</string>
@@ -321,6 +320,7 @@
   <string name="MessageNotifier_media_message">ಬಹುಮಾಧ್ಯಮ ಸಂದೇಶ</string>
   <!--QuickResponseService-->
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_message">ಹೊಸ ಸಂದೇಶ</string>
   <!--attachment_type_selector-->
   <!--change_passphrase_activity-->
   <!--contact_selection_activity-->
@@ -467,7 +467,6 @@
   <string name="AndroidManifest__change_passphrase">ಗುಪ್ತಪದವನ್ನು ಬದಲಾಯಿಸಿ</string>
   <string name="AndroidManifest__verify_identity">ಗುರುತನ್ನು ಪರಿಶೀಲಿಸಿ</string>
   <string name="AndroidManifest__log_submit">ಡಿಬಗ್ ಲಾಗ್ಗಳನ್ನು ಸಲ್ಲಿಸಿ</string>
-  <string name="AndroidManifest__media_preview">ಬಹುಮಾಧ್ಯಮ ಮುನ್ನೋಟ</string>
   <string name="AndroidManifest__media_overview">ಎಲ್ಲಾ ಚಿತ್ರಗಳು</string>
   <string name="AndroidManifest__media_overview_named">ಎಲ್ಲಾ ಚಿತ್ರಗಳು %1$s ಜೊತೆ</string>
   <!--arrays.xml-->
@@ -510,7 +509,6 @@
   <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__inthread_notifications">ಎಳೆಗಳಲ್ಲಿನ ಸೂಚನೆಗಳು</string>
   <string name="preferences__one_time">ಒಮ್ಮೆ</string>
   <string name="preferences__two_times">ಎರಡು ಬಾರಿ</string>
   <string name="preferences__three_times">ಮೂರು ಬಾರಿ</string>
@@ -540,11 +538,8 @@
   <string name="preferences__mmsc_password">ಎಮ್ ಎಮ್ ಎಸ್ ಸಿ ಪಾಸ್ವರ್ಡ್</string>
   <string name="preferences__sms_delivery_reports">ಎಸ್. ಎಮ್. ಎಸ್ ವಿತರಣಾ ವರದಿಗಳು</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">ನೀವು ಕಳುಹಿಸುವ ಪ್ರತಿ ಎಸ್.ಎಮ್.ಎಸ್ ಸಂದೇಶಕ್ಕೂ ವಿತರಣಾ ವರದಿಯನ್ನು ವಿನಂತಿಸಿ</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">ಒಂದು ಸಂಭಾಷಣೆಯ ಎಳೆ ಒಂದು ನಿಗದಿತ ಮಿತಿಯನ್ನು ಮೀರಿದ ಕೂಡಲೆ ಸ್ವಯಂಚಾಲಿತವಾಗಿ ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ</string>
   <string name="preferences__delete_old_messages">ಹಳೆಯ ಸಂದೇಶಗಳನ್ನು ಅಳಿಸಿ</string>
   <string name="preferences__conversation_length_limit">ಸಂವಾದದ ಉದ್ದ ಮಿತಿ</string>
-  <string name="preferences__trim_all_threads_now">ಈಗ ಎಲ್ಲಾ ವಾದಗಳನ್ನು ತೆಗೆದು ಹಾಕಿ</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">ಎಲ್ಲಾ ಸಂಭಾಷಣೆಯ ಎಳೆಗಳನ್ನು ಮೇಲೆ ಸ್ಥೂಲವಾಗಿ ಕಣ್ಣು ಹಾಯಿಸು ಹಾಗು ಸಂಭಾಷಣೆಯ ಉದ್ದ ಮಿತಿಯನ್ನು ಜಾರಿಗೊಳಿಸು</string>
   <string name="preferences__light_theme">ಲಘು ವಿನ್ಯಾಸ </string>
   <string name="preferences__dark_theme">ಗಾಢಬಣ್ಣದ ವಿನ್ಯಾಸ</string>
   <string name="preferences__appearance">ಲಕ್ಷಣ</string>
@@ -630,7 +625,6 @@
   <!--media_preview-->
   <string name="media_preview__save_title">ಉಳಿಸಿ</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">ಚಿತ್ರ ಮುನ್ನೋಟ</string>
   <!--new_conversation_activity-->
   <!--redphone_audio_popup_menu-->
   <!--Trimmer-->

res/values-ko/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">암호 설정되지 않음</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">대화당 메시지 %s개</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">지금 모든 이전 메시지를 삭제하시겠습니까?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">지금 모든 대화를 최근 메시지 %s개로 줄이시겠습니까?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">모든 대화를 최근 메시지 %s개로 줄입니다.</string>
   <string name="ApplicationPreferencesActivity_delete">삭제</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">암호 사용 중지</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">메시지 화면 잠금을 사용 중지하시겠습니까?</string>
@@ -146,9 +146,16 @@
     <item quantity="other">선택된 대화 %1$d개가 영구 삭제됩니다.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">대화 삭제</string>
-  <string name="ConversationListFragment_deleting_selected_threads">선택된 대화를 삭제 중…</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">선택된 대화를 삭제 중…</string>
+  <string name="ConversationListFragment_archived_conversations">대화 보관처리됨</string>
+  <string name="ConversationListFragment_undo">실행취소</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">보관 취소</string>
+  <string name="ConversationListFragment_archived_conversation">대화 보관처리됨</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">보관 취소</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">키 교환 메시지…</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">보관된 대화 (%d개)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">맞춤값 사용: %s</string>
   <string name="CustomDefaultPreference_using_default">기본값 사용: %s</string>
@@ -168,6 +175,7 @@
   <string name="DeviceListItem_unnamed_device">이름이 없는 기기</string>
   <string name="DeviceListItem_linked_s">연결: %s</string>
   <string name="DeviceListItem_last_active_s">최근 사용: %s</string>
+  <string name="DeviceListItem_today">오늘</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">공유 대상</string>
   <!--ExperienceUpgradeActivity-->
@@ -188,14 +196,14 @@
   <string name="ExportFragment_success">성공</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 설정 메뉴에서 재가입해 주세요.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal은 Google Play 서비스에 등록할 수 없습니다. Signal 메시지와 통화는 사용 중지되었으므로 Signal 설정 메뉴에서 재가입해 주세요.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">그룹 만들기</string>
   <string name="GroupCreateActivity_actionbar_update_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_you_dont_support_push">인터넷 대화에 가입되지 않아서 Signal 그룹이 사용 중지되었습니다.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Signal 메시지와 통화에 가입되지 않아서 Signal 그룹이 사용 중지되었습니다.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">예기치 못한 오류로 인해 그룹 만들 수 없음</string>
   <string name="GroupCreateActivity_contacts_no_members">그룹 멤버 한명 이상 선택 되어야 함</string>
   <string name="GroupCreateActivity_contacts_invalid_number">그룹 멤버 중 한명은 잘못된 전화번호가 있으므로 정확한 전화번호를 입력하거나 그 연락처를 삭제하고 다시 시도해 주세요.</string>
@@ -299,6 +307,8 @@
   <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 기기를 서드파티 스캐너로 연결해 보는 것 같습니다. 안전한 사용을 위해 Signal에서 다시 스캔해 주세요.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">암호 입력</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signal 아이콘</string>
@@ -627,7 +637,7 @@
   <string name="registration_progress_activity__call_me">나에게 전화</string>
   <string name="registration_progress_activity__edit_number">전화번호 수정</string>
   <string name="registration_progress_activity__connectivity_error">연결 실패</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">Signal이 푸시 서비스에 연결하지 못했습니다.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal이 서버에 연결하지 못했습니다.</string>
   <string name="registration_progress_activity__some_possible_problems_include">잠재적인 문제</string>
   <string name="registration_progress_activity__no_network_connectivity">네트워크에 연결되지 않음</string>
   <string name="registration_progress_activity__your_device_needs_network_connectivity">이 Signal 기능을 사용하려면 네트워크에 연결해야 합니다. Wi-Fi나 모바일 데이터 네트워크 연결 상태를 확인하세요.</string>
@@ -667,12 +677,13 @@
   <string name="AndroidManifest__change_passphrase">암호 변경</string>
   <string name="AndroidManifest__verify_identity">인증 키 확인</string>
   <string name="AndroidManifest__log_submit">디버그 로그 보내기</string>
-  <string name="AndroidManifest__media_preview">미디어 미리 보기</string>
+  <string name="AndroidManifest__media_preview">미디어 미리보기</string>
   <string name="AndroidManifest__media_overview">전체 이미지</string>
   <string name="AndroidManifest__media_overview_named">%1$s님이랑 대화의 전체 이미지</string>
   <string name="AndroidManifest__message_details">메시지 세부정보</string>
   <string name="AndroidManifest_manage_linked_devices">연결된 기기 관리</string>
   <string name="AndroidManifest__invite_friends">친구 초대</string>
+  <string name="AndroidManifest_conversations_archive">보관된 대화</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">가져오기 / 내보내기</string>
   <string name="arrays__your_identity_key">내 인증 키</string>
@@ -736,7 +747,7 @@
   <string name="preferences__sound">소리</string>
   <string name="preferences__change_notification_sound">알림 벨소리 변경</string>
   <string name="preferences__silent">무음</string>
-  <string name="preferences__inthread_notifications">대화 중 알림</string>
+  <string name="preferences__in_conversation_notifications">대화 중 알림</string>
   <string name="preferences__play_inthread_notifications">대화 중에 알림 벨소리 재생</string>
   <string name="preferences__repeat_alerts">알림 반복</string>
   <string name="preferences__never">안함</string>
@@ -774,12 +785,12 @@
   <string name="preferences__mmsc_password">MMSC 비밀번호</string>
   <string name="preferences__sms_delivery_reports">SMS 전송 확인</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">SMS 메시지 보낼 때마다 전송 확인 요청</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">대화 메시지 저장한도가 초과되면 이전 메시지 자동 삭제</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">대화 메시지 저장한도가 초과되면 이전 메시지 자동 삭제</string>
   <string name="preferences__delete_old_messages">이전 메시지 삭제</string>
   <string name="preferences__chats">대화 및 미디어</string>
   <string name="preferences__conversation_length_limit">대화 메시지 저장한도</string>
-  <string name="preferences__trim_all_threads_now">모든 대화 줄이기</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">모든 대화에 메시지 저장한도 적용</string>
+  <string name="preferences__trim_all_conversations_now">모든 대화 줄이기</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">모든 대화에 메시지 저장한도 적용</string>
   <string name="preferences__devices">기기</string>
   <string name="preferences__light_theme">밝게</string>
   <string name="preferences__dark_theme">어둡게</string>
@@ -835,11 +846,14 @@
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">선택된 대화 삭제</string>
   <string name="conversation_list_batch__menu_select_all">모두 선택</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">선택된 대화 보관</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">선택된 대화 보관 취소</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">검색</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">연락처 사진</string>
   <string name="conversation_list_item_view__error_alert">오류 경고</string>
+  <string name="conversation_list_item_view__archived">보관됨</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">새 대화</string>
   <!--conversation_secure_verified-->

res/values-mk/strings.xml

@@ -9,7 +9,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Сеуште не сте поставиле лозинка!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s пораки по разговор</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Избришете ги сите стари пораки?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Дали сте сигурни дека сакате да се скратат сите теми на разговор на %s од најновите пораки?</string>
   <string name="ApplicationPreferencesActivity_delete">Избриши</string>
   <string name="ApplicationPreferencesActivity_disable">Оневозможи</string>
   <string name="ApplicationPreferencesActivity_unregistering">Одјавување</string>
@@ -105,9 +104,9 @@
   <string name="ConversationListActivity_search">Барај...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_deleting">Бришење</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Бришење на избраните теми...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Порака за размена на клучеви...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Користејќи прилагодено: %s</string>
   <string name="CustomDefaultPreference_using_default">Користејќи стандардно: %s</string>
@@ -331,6 +330,7 @@
   <string name="MessageNotifier_media_message">Медиа порака</string>
   <!--QuickResponseService-->
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_message">Нова порака</string>
   <!--attachment_type_selector-->
   <!--change_passphrase_activity-->
   <!--contact_selection_activity-->
@@ -484,7 +484,6 @@
   <string name="AndroidManifest__change_passphrase">Променете лозинка</string>
   <string name="AndroidManifest__verify_identity">Проверете идентитет</string>
   <string name="AndroidManifest__log_submit">Испратете debug логови</string>
-  <string name="AndroidManifest__media_preview">Приказ на датотека</string>
   <string name="AndroidManifest__media_overview">Сите слики</string>
   <string name="AndroidManifest__media_overview_named">Сите слики со %1$s</string>
   <!--arrays.xml-->
@@ -537,7 +536,6 @@
   <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__inthread_notifications">Извествања секогаш</string>
   <string name="preferences__play_inthread_notifications">Свири звук за известување за време на активен разговор</string>
   <string name="preferences__repeat_alerts">Повтори известувања</string>
   <string name="preferences__never">Никогаш</string>
@@ -575,11 +573,8 @@
   <string name="preferences__mmsc_password">MMSC лозинка</string>
   <string name="preferences__sms_delivery_reports">SMS потврда за достава</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Побарајте доставна потврда за секоја испратена SMS порака</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Автоматско бришење на стари пораки во случај кога разговорот ќе ја пречекори максимално утврдената должина</string>
   <string name="preferences__delete_old_messages">Избришете стари пораки</string>
   <string name="preferences__conversation_length_limit">Максимална должина на разговор</string>
-  <string name="preferences__trim_all_threads_now">Скрати ги сите теми</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Скенирај ги сите теми на разговор и примени го лимитот за должина на разговори</string>
   <string name="preferences__light_theme">Светла</string>
   <string name="preferences__dark_theme">Темна</string>
   <string name="preferences__appearance">Изглед</string>
@@ -669,7 +664,6 @@
   <!--media_preview-->
   <string name="media_preview__save_title">Зачувај</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Приказ на слика</string>
   <!--new_conversation_activity-->
   <!--redphone_audio_popup_menu-->
   <!--Trimmer-->

res/values-nl/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Je hebt nog geen wachtwoord ingesteld!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s berichten per gesprek</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Nu alle oude berichten verwijderen?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Weet je zeker dat je alle gesprekken wil inkorten tot de laatste %s berichten?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Dit zal direct alle gesprekken inkorten tot de laatste %s berichten.</string>
   <string name="ApplicationPreferencesActivity_delete">Verwijderen</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Wachtwoord uitschakelen?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -152,9 +152,16 @@
     <item quantity="other">Dit zal alle %1$d geselecteerde gesprekken permanent verwijderen.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Aan het verwijderen</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Geselecteerde gesprekken aan het verwijderen...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Geselecteerde gesprekken aan het verwijderen...</string>
+  <string name="ConversationListFragment_archived_conversations">Gearchiveerde gesprekken</string>
+  <string name="ConversationListFragment_undo">ONGEDAAN MAKEN</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Gesprek naar inbox verplaatst</string>
+  <string name="ConversationListFragment_archived_conversation">Gesprek gearchiveerd</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Gesprekken naar inbox verplaatst</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Sleuteluitwisselingsbericht...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Gesprekken gearchiveerd (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Handmatig gebruiken: %s</string>
   <string name="CustomDefaultPreference_using_default">Standaard gebruiken: %s</string>
@@ -174,6 +181,7 @@
   <string name="DeviceListItem_unnamed_device">Naamloos apparaat</string>
   <string name="DeviceListItem_linked_s">Gekoppeld %s</string>
   <string name="DeviceListItem_last_active_s">Laatst actief %s</string>
+  <string name="DeviceListItem_today">Vandaag</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Delen met</string>
   <!--ExperienceUpgradeActivity-->
@@ -194,14 +202,14 @@
   <string name="ExportFragment_success">Succesvol!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanente Signal communicatiefout!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal was niet in staat zich bij Google Play services te registreren. Communicatie over het data kanaal is uitgeschakeld, probeer het opnieuw via het Signal instellingen menu.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal was niet in staat met Google Play services te registreren. Signal berichten en oproepen zijn nu uitgeschakeld, probeer opnieuw te registreren via Instellingen &gt; Geavanceerd.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nieuwe groep</string>
   <string name="GroupCreateActivity_actionbar_update_title">Groep bijwerken</string>
   <string name="GroupCreateActivity_group_name_hint">Groepsnaam</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nieuwe MMS-Groep</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Je hebt een contactpersoon geselecteerd die geen Signal-groepen ondersteunt, dus deze groep zal gebruik maken van MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Je bent niet geregistreerd om het datakanaal te gebruiken, dus Signal groepen zijn uitgeschakeld.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Je bent niet geregistreerd voor Signal berichten en oproepen, dus Signal groepen zijn uitgeschakeld. Registreren kan via Instellingen &gt; Geavanceerd.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Er is een onverwachte fout opgetreden waardoor het aanmaken van een groep is mislukt.</string>
   <string name="GroupCreateActivity_contacts_no_members">Je groep moet ten minste één persoon bevatten.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Het nummer van een van de leden van je groep kan niet goed worden gelezen. Corrigeer dit of verwijder deze persoon, en probeer het opnieuw.</string>
@@ -307,6 +315,8 @@ Herstellen van een versleutelde back-up zal je bestaande sleutels, voorkeuren en
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ongeldige QR code.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sorry, u hebt teveel gekoppelde apparaten, probeer er te verwijderen...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Sorry, dit is geen geldige QR code voor koppeling van een apparaat.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Een Signal apparaat koppelen?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Het lijkt er op dat je een Signal apparaat wil koppelen met een externe scanner. Scan voor de veiligheid alsjeblieft de code opnieuw vanuit Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Voer wachtwoord in</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signal icoon</string>
@@ -488,7 +498,7 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="QuickResponseService_problem_sending_message">Fout bij het bericht versturen!</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Nieuw bericht!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Nieuw bericht</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Afbeelding</string>
   <string name="attachment_type_selector__audio">Audio</string>
@@ -654,8 +664,7 @@ Signal kan je ook bellen om je nummer te verifiëren. Raak \'Bel Me\' aan en voe
   <string name="registration_progress_activity__call_me">Bel me</string>
   <string name="registration_progress_activity__edit_number">Nummer bewerken</string>
   <string name="registration_progress_activity__connectivity_error">Verbindingsfout.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal kon geen verbinding maken met de push service.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal kon geen verbinding maken met de server.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Mogelijke problemen
 zijn:</string>
   <string name="registration_progress_activity__no_network_connectivity">Geen netwerkverbinding.</string>
@@ -700,12 +709,13 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <string name="AndroidManifest__change_passphrase">Wachtwoord veranderen</string>
   <string name="AndroidManifest__verify_identity">Identiteit verifiëren</string>
   <string name="AndroidManifest__log_submit">Debug logs indienen</string>
-  <string name="AndroidManifest__media_preview">Media Voorvertoning</string>
+  <string name="AndroidManifest__media_preview">Media miniatuur</string>
   <string name="AndroidManifest__media_overview">Alle afbeeldingen</string>
   <string name="AndroidManifest__media_overview_named">Alle afbeeldingen met %1$s</string>
   <string name="AndroidManifest__message_details">Berichtdetails</string>
-  <string name="AndroidManifest_manage_linked_devices">Beheer gekoppelde apparaten</string>
+  <string name="AndroidManifest_manage_linked_devices">Gekoppelde apparaten beheren</string>
   <string name="AndroidManifest__invite_friends">Vrienden uitnodigen</string>
+  <string name="AndroidManifest_conversations_archive">Gesprekkenarchief</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importeren / exporteren</string>
   <string name="arrays__your_identity_key">Jouw identiteitssleutel</string>
@@ -770,7 +780,7 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <string name="preferences__sound">Geluid</string>
   <string name="preferences__change_notification_sound">Verander notificatiegeluid</string>
   <string name="preferences__silent">Stil</string>
-  <string name="preferences__inthread_notifications">Notificaties in een gesprek</string>
+  <string name="preferences__in_conversation_notifications">Notificaties in een gesprek</string>
   <string name="preferences__play_inthread_notifications">Notificatiegeluid afspelen tijdens het bekijken van een actief gesprek</string>
   <string name="preferences__repeat_alerts">Herhaal meldingen</string>
   <string name="preferences__never">Nooit</string>
@@ -808,12 +818,12 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <string name="preferences__mmsc_password">MMSC Wachtwoord</string>
   <string name="preferences__sms_delivery_reports">SMS ontvangstbevestigingen</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Verzoeken om een ontvangstbevestiging voor ieder verzonden SMS bericht</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatisch oudere berichten verwijderen wanneer een gesprek meer dan een bepaald aantal berichten bevat</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Automatisch oudere berichten verwijderen wanneer een gesprek meer dan een bepaald aantal berichten bevat</string>
   <string name="preferences__delete_old_messages">Verwijder oude berichten</string>
   <string name="preferences__chats">Gesprekken en media</string>
   <string name="preferences__conversation_length_limit">Gesprekslengte limiet</string>
-  <string name="preferences__trim_all_threads_now">Oude berichten nu verwijderen</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Alle gesprekken scannen en de maximale gesprekslengte toepassen</string>
+  <string name="preferences__trim_all_conversations_now">Oude berichten nu verwijderen</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Alle gesprekken scannen en de maximale gesprekslengte toepassen</string>
   <string name="preferences__devices">Apparaten</string>
   <string name="preferences__light_theme">Licht</string>
   <string name="preferences__dark_theme">Donker</string>
@@ -869,11 +879,14 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Geselecteerde verwijderen</string>
   <string name="conversation_list_batch__menu_select_all">Alles selecteren</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Selectie archiveren</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Selectie dearchiveren</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Zoeken</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Foto Contact</string>
   <string name="conversation_list_item_view__error_alert">Foutmelding</string>
+  <string name="conversation_list_item_view__archived">Gearchiveerd</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nieuw gesprek</string>
   <!--conversation_secure_verified-->
@@ -939,7 +952,7 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <!--media_preview-->
   <string name="media_preview__save_title">Opslaan</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Afbeelding Voorvertoning</string>
+  <string name="media_preview_activity__image_content_description">Afbeelding miniatuur</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Verversen</string>
   <!--redphone_audio_popup_menu-->

res/values-no/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har ikke definert et passord ennå!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s meldinger pr samtale</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Slette alle gamle meldinger nå?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Er du sikker på at du ønsker å umiddelbart trimme alle samtaletrådene til de siste %s meldinger?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Dette vil umiddelbart trimme alle samtaletrådene til de siste %s meldinger.</string>
   <string name="ApplicationPreferencesActivity_delete">Slett</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Deaktivere passord?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -153,9 +153,16 @@ denne kontakten.</string>
     <item quantity="other">Dette vil permanent slette alle de %1$d valgte samtalene.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Sletter</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Sletter utvalgte tråder...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Sletter utvalgte samtaler...</string>
+  <string name="ConversationListFragment_archived_conversations">Arkiverte samtaler</string>
+  <string name="ConversationListFragment_undo">Angre</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Samtale flyttet til innboks</string>
+  <string name="ConversationListFragment_archived_conversation">Arkivert samtale</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Samtalene flyttet til innboks</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Nøkkelutvekslingsmelding...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Arkiverte samtaler (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Benytter egendefinert: %s</string>
   <string name="CustomDefaultPreference_using_default">Benytter standard: %s</string>
@@ -175,6 +182,7 @@ denne kontakten.</string>
   <string name="DeviceListItem_unnamed_device">Ikke navngitt enhet</string>
   <string name="DeviceListItem_linked_s">%s tilkoblet</string>
   <string name="DeviceListItem_last_active_s">Sist aktiv %s</string>
+  <string name="DeviceListItem_today">I dag</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Del med</string>
   <!--ExperienceUpgradeActivity-->
@@ -195,14 +203,14 @@ denne kontakten.</string>
   <string name="ExportFragment_success">Suksess!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent Signal kommunikasjonsfeil!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal var ikke i stand til å registerere hos Google Play Services. Kommunikasjon over datakanalen er skrudd av. Forsøk å registrere på nytt gjennom innstillingsmenyen i Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Sinal kunne ikke registrere seg med Google Play Tjenester. Signal meldinger og anrop er slått av, vennligst prøv å registrere på nytt i Innstillinger &gt; Avansert.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ny gruppe</string>
   <string name="GroupCreateActivity_actionbar_update_title">Oppdater gruppe</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppenavn</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Ny MMS gruppe</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Du har valgt en kontakt som ikke støtter Signal grupper, så dette vil bli en MMS gruppe.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Du har ikke registrert for å bruke data kanalen, så Signal grupper er deaktivert.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Du er ikke registrert for å kunne bruke Signal meldinger og anrop, dermed er heller ikk Signal grupper tilgjengelig. Vennligst prøv å registrere i Instillinger &gt; Avansert. </string>
   <string name="GroupCreateActivity_contacts_mms_exception">En ukjent feil har ført til at gruppeopprettelsen feilet.</string>
   <string name="GroupCreateActivity_contacts_no_members">Du må ha minst en person i gruppen din!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">En av gruppemedlemmene har et nummer som ikke kan tolkes. Vær vennlig og korriger eller slett kontakten og prøv igjen. </string>
@@ -311,6 +319,8 @@ Inlasting av en kryptert backup vil erstatte dine eksisterende nøkler, preferan
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ugyldig QR-kode.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Beklager, du har for mange enheter koblet til allerede, forsøk å fjerne noen...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Beklager, dette er ikke en gyldig QR kode for kobling av enheter.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Koble en Signal enhet?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Det ser ut som om du prøver å koble en Signal enhet ved hjelp av en 3. parts skanner. For å beskytte deg ber vi at du skanner koden igjen fra Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Tast inn passord</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signal ikon</string>
@@ -491,7 +501,7 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="QuickResponseService_problem_sending_message">Kunne ikke sende melding!</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Ny melding!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Ny melding</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Bilde</string>
   <string name="attachment_type_selector__audio">Lyd</string>
@@ -655,8 +665,7 @@ Signal kan også ringe deg for å verisifere nummeret ditt. Trykk \'Ring meg\' o
   <string name="registration_progress_activity__call_me">Ring meg</string>
   <string name="registration_progress_activity__edit_number">Endre nummer</string>
   <string name="registration_progress_activity__connectivity_error">Tilkoblingsfeil.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal var ikke i stand til å opprette en forbindelse til \'push\' tjenesten.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal kunne ikke koble seg til serveren.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Noen mulige 
 problemer:</string>
   <string name="registration_progress_activity__no_network_connectivity">Ingen nettverksforbindelse.</string>
@@ -708,6 +717,7 @@ feilet.</string>
   <string name="AndroidManifest__message_details">Meldingsdetaljer</string>
   <string name="AndroidManifest_manage_linked_devices">Administrer tilkoblede enheter</string>
   <string name="AndroidManifest__invite_friends">Inviter venner</string>
+  <string name="AndroidManifest_conversations_archive">Samtale-arkiv</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importere / eksportere</string>
   <string name="arrays__your_identity_key">Din ID-nøkkel</string>
@@ -772,7 +782,7 @@ feilet.</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__inthread_notifications">Varsling i aktiv tråd</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>
   <string name="preferences__repeat_alerts">Gjenta varsling</string>
   <string name="preferences__never">Aldri</string>
@@ -810,12 +820,12 @@ feilet.</string>
   <string name="preferences__mmsc_password">MMSC passord</string>
   <string name="preferences__sms_delivery_reports">Leveringsrapport for SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Be om en leveringsrapport for hver SMS-melding du sender</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Slett eldre meldinger automatisk når en samtaletråd overskrider en spesifisert lengde</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Slett eldre meldinger automatisk når en samtaletråd overskrider en spesifisert lengde</string>
   <string name="preferences__delete_old_messages">Slett gamle meldinger</string>
   <string name="preferences__chats">Samtaler og media</string>
   <string name="preferences__conversation_length_limit">Grense på samtalelengde</string>
-  <string name="preferences__trim_all_threads_now">Trimme alle samtaletråder nå</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Gjennomgå alle samtaletrådene og håndhev grensen på samtalelengde </string>
+  <string name="preferences__trim_all_conversations_now">Trimme alle samtaler nå</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Skann alle samtaletrådene og håndhev grensen på samtalelengde </string>
   <string name="preferences__devices">Enheter</string>
   <string name="preferences__light_theme">Lys</string>
   <string name="preferences__dark_theme">Mørk</string>
@@ -871,11 +881,14 @@ feilet.</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Slett merkede</string>
   <string name="conversation_list_batch__menu_select_all">Merk alt</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Arkiv valgt</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Pakk opp valgte</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Søk</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Kontaktbilde</string>
   <string name="conversation_list_item_view__error_alert">Varsel om feil</string>
+  <string name="conversation_list_item_view__archived">Arkivert</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Ny samtale</string>
   <!--conversation_secure_verified-->

res/values-pl/strings.xml

@@ -10,7 +10,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Nie masz jeszcze ustawionego hasła!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s wiadomości na konwersację</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Usunąć wszystkie stare wiadomości?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Czy na pewno chcesz przyciąć wszystkie wątki rozmów do %s najnowszych wiadomości?</string>
   <string name="ApplicationPreferencesActivity_delete">Usuń</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Wyłączyć hasło?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -18,38 +17,41 @@ Wyłączyć blokadę ekranu dla wiadomości?
 </string>
   <string name="ApplicationPreferencesActivity_disable">Wyłącz</string>
   <string name="ApplicationPreferencesActivity_unregistering">Wyrejestrowanie </string>
-  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Trwa wyrejestrowanie od używania wiadomości i dzwonienia Signal...</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Wyłączyć wiadomości i dzwonienie Signal?</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Trwa wyrejestrowanie z Signal...</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Wyłączyć wiadomości i połączenia Signal?</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Wyłącz wiadomości i połączenia telefoniczne Signal poprzez wyrejestrowanie z serwera. Będziesz musiał ponownie zarejestrować swój numer telefonu, jeśli będziesz chciał go używać w przyszłości.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Błąd połączenia z serwerem!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS Włączone</string>
-  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotknij aby zmienić swoją domyślną aplikację SMS</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Dotknij, aby zmienić swoją domyślną aplikację SMS</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">SMS Wyłączone</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Dotknij aby Signal był Twoją domyślną aplikacją SMS</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Dotknij, aby Signal był Twoją domyślną aplikacją SMS</string>
   <string name="ApplicationPreferencesActivity_on">włączone</string>
   <string name="ApplicationPreferencesActivity_On">Włączone</string>
   <string name="ApplicationPreferencesActivity_off">wyłączone</string>
   <string name="ApplicationPreferencesActivity_Off">Wyłączone</string>
   <string name="ApplicationPreferencesActivity_sms_mms_summary">SMS %1$s, MMS %2$s</string>
   <!--AppProtectionPreferenceFragment-->
-  <string name="AppProtectionPreferenceFragment_minutes">%d minuty</string>
+  <string name="AppProtectionPreferenceFragment_minutes">%d minut</string>
   <!--DraftDatabase-->
   <string name="DraftDatabase_Draft_image_snippet">(zdjęcie)</string>
   <string name="DraftDatabase_Draft_audio_snippet">(dźwięk)</string>
-  <string name="DraftDatabase_Draft_video_snippet">(film)</string>
+  <string name="DraftDatabase_Draft_video_snippet">(wideo)</string>
   <!--AttchmentManager-->
   <string name="AttachmentManager_cant_open_media_selection">Nie można znaleźć aplikacji, aby wybrać media.</string>
   <!--AttachmentTypeSelectorAdapter-->
   <string name="AttachmentTypeSelectorAdapter_camera">Kamera</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Zdjęcie</string>
-  <string name="AttachmentTypeSelectorAdapter_video">Film</string>
+  <string name="AttachmentTypeSelectorAdapter_video">Wideo</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Dźwięk</string>
-  <string name="AttachmentTypeSelectorAdapter_contact">Informacje kontaktowe</string>
+  <string name="AttachmentTypeSelectorAdapter_contact">Informacje kontaktu</string>
   <!--AudioSlidePlayer-->
+  <string name="AudioSlidePlayer_error_playing_audio">Błąd audio!</string>
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Zablokowane kontakty</string>
   <!--CallScreen-->
   <string name="CallScreen_Incoming_call">Przychodzące połączenie</string>
   <!--ConfirmIdentityDialog-->
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Podpis identyfikacyjny dla %1$s zmienił się. Może to oznaczać, że ktoś próbuje przechwycić Twoją komunikację, lub %2$s przeinstalował aplikację Signal i posiada teraz nowy klucz identyfikacyjny.</string>
   <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Może chcesz zweryfikować 
 ten kontakt.
 </string>
@@ -70,9 +72,11 @@ ten kontakt.
   <string name="ConversationItem_click_to_approve_unencrypted">Dotknij w celu użycia niezabezpieczonej alternatywy</string>
   <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Fallback do nieszyfrowanej wiadomości SMS?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Fallback do nieszyfrowanych wiadomości MMS?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ta wiadomość <b>nie</b> będzie zaszyfrowana, ponieważ odbiorca nie jest już użytkownikiem Signal.\n\nWysłać wiadomość nieszyfrowaną?</string>
   <string name="ConversationItem_unable_to_open_media">Nie można znaleźć aplikacji, aby otworzyć te media.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_reset_secure_session_question">Zresetować bezpieczną sesję?</string>
+  <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">To może pomóc jeśli masz problemy z szyfrowaniem w tej konwersacji. Twoje wiadomości będą zachowane.</string>
   <string name="ConversationActivity_reset">Reset</string>
   <string name="ConversationActivity_delete_thread_question">Usunąć rozmowę?</string>
   <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">To spowoduje permanentne usunięcie wszystkich wiadomości w tej konwersacji.</string>
@@ -100,6 +104,7 @@ ten kontakt.
   <string name="ConversationActivity_transport_insecure_mms">Nieszyfrowany MMS</string>
   <string name="ConversationActivity_transport_signal">Signal</string>
   <string name="ConversationActivity_lets_switch_to_signal">Zacznij używać Signal %1$s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Zacznij używać Signal: %1$s</string>
   <string name="ConversationActivity_error_leaving_group">Błąd opuszczenia grupy...</string>
   <string name="ConversationActivity_mms_not_supported_title">MMS nie są wspomagane</string>
   <string name="ConversationActivity_mms_not_supported_message">Wiadomość nie może zostać wysłana, ponieważ Twój operator nie obsługuje usługi MMS.</string>
@@ -126,6 +131,7 @@ ten kontakt.
     <item quantity="other">To spowoduje permanentne usunięcie wszystkich %1$d zaznaczonych wiadomości.</item>
   </plurals>
   <string name="ConversationFragment_save_to_sd_card">Zapisać na dysk?</string>
+  <string name="ConversationFragment_saving_this_media_to_storage_warning">Zapisanie tych plików na dysku pozwoli innym aplikacjom na Twoim telefonie na dostęp do tych plików.\n\nKontynuować?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Błąd podczas zapisywania załącznika na dysk!</string>
   <string name="ConversationFragment_success_exclamation">Sukces!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Nie udało zapisać się pliku!</string>
@@ -140,10 +146,27 @@ ten kontakt.
   <!--ConversationListActivity-->
   <string name="ConversationListActivity_search">Szukaj...</string>
   <!--ConversationListFragment-->
+  <plurals name="ConversationListFragment_delete_selected_conversations">
+    <item quantity="one">Usunąć wygraną konwersacje?</item>
+    <item quantity="few">Usunąć wygrane konwersacje?</item>
+    <item quantity="other">Usunąć wygrane konwersacje?</item>
+  </plurals>
+  <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
+    <item quantity="one">To spowoduje permanentne usunięcie wybranej konwersacji.</item>
+    <item quantity="few">To spowoduje permanentne usunięcie wszystkich %1$d zaznaczonych konwersacji.</item>
+    <item quantity="other">To spowoduje permanentne usunięcie wszystkich %1$d zaznaczonych konwersacji.</item>
+  </plurals>
   <string name="ConversationListFragment_deleting">Usuwanie...</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Usuwanie zaznaczonych wątków..</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Usuwanie zaznaczonych rozmów...</string>
+  <string name="ConversationListFragment_archived_conversations">Archiwum konwersacji</string>
+  <string name="ConversationListFragment_undo">COFNIJ</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Przeniesiono konwersacje do skrzynki odbiorczej</string>
+  <string name="ConversationListFragment_archived_conversation">Archiwum konwersacji</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Przeniesiono konwersacje do skrzynki odbiorczej</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Wiadomość wymiany kluczy...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Archiwum konwersacji (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Używa własnych: %s</string>
   <string name="CustomDefaultPreference_using_default">Używa domyślnych: %s</string>
@@ -163,6 +186,7 @@ ten kontakt.
   <string name="DeviceListItem_unnamed_device">Nieznane urządzenie</string>
   <string name="DeviceListItem_linked_s">Zarejestrowano %s</string>
   <string name="DeviceListItem_last_active_s">Ostatnio aktywny %s</string>
+  <string name="DeviceListItem_today">Dzisiaj</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Podziel się z</string>
   <!--ExperienceUpgradeActivity-->
@@ -173,15 +197,24 @@ ten kontakt.
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure i RedPhone są teraz jedną aplikacją: Signal. Dotknij, aby dowiedzieć się więcej.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Eksport</string>
+  <string name="ExportFragment_export_plaintext_to_storage">Wyeksportować nieszyfrowaną kopię na dysk?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Uwaga, ta czynność spowoduje wyeksportowanie Twoich wiadomości w formie nieszyfrowanej na dysk</string>
   <string name="ExportFragment_cancel">Anuluj</string>
   <string name="ExportFragment_exporting">Eksportowanie</string>
+  <string name="ExportFragment_exporting_plaintext_to_storage">Eksportowanie nieszyfrowanych wiadomości...</string>
+  <string name="ExportFragment_error_unable_to_write_to_storage">Błąd. Nie udało się zapisać na dysku!</string>
+  <string name="ExportFragment_error_while_writing_to_storage">Wystąpił błąd w czasie próby zapisu na dysku.</string>
   <string name="ExportFragment_success">Sukces!</string>
   <!--GcmRefreshJob-->
+  <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanentny błąd komunikacji Signal!</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal nie był w stanie zarejestrować się z Google Play Services. Wiadomości i połączenia Signal zostały wyłączone. Proszę spróbuj ponownie zarejestrować się poprzez pójście do Ustawienia &gt; Zaawansowane.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nowa grupa</string>
   <string name="GroupCreateActivity_actionbar_update_title">Aktualizuj grupę</string>
   <string name="GroupCreateActivity_group_name_hint">Nazwa grupy</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nowa grupa MMS</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Zaznaczyłeś kontakt, który nie wspiera grup Signal, tak więc ta grupa będzie grupą MMS.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Nie jesteś zarejestrowany w Signal, aby wysyłać wiadomości i wykonywać połączenia telefoniczne, tak więc grupy aplikacji Signal są wyłączone. Spróbuj ponownie poprzez pójście do Ustawienia &gt; Zaawansowane.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Wystąpił błąd podczas tworzenia nowej grupy. Grupa nie została utworzona.</string>
   <string name="GroupCreateActivity_contacts_no_members">Potrzebujesz przynajmniej jeden osoby w Twojej grupie.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Jeden z członków Twojej grupy ma numer który nie może być prawidłowo odczytany. Proszę popraw go lub usuń ten numer i spróbuj ponownie.</string>
@@ -189,6 +222,7 @@ ten kontakt.
   <string name="GroupCreateActivity_menu_create_title">Utwórz grupę</string>
   <string name="GroupCreateActivity_creating_group">Trwa tworzenie %1$s…</string>
   <string name="GroupCreateActivity_updating_group">Aktualizowanie %1$s...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Nie można dodać %1$s ponieważ nie jest on użytkownikiem aplikacji Signal.</string>
   <string name="GroupCreateActivity_loading_group_details">Wczytywanie szczegółów grupy...</string>
   <string name="GroupCreateActivity_youre_already_in_the_group">Już jesteś w tej grupie.</string>
   <!--GroupMembersDialog-->
@@ -203,6 +237,9 @@ wiadomości SMS z domyślnej aplikacji SMS. Jeżeli wcześniej wykonywałeś ju
   <string name="ImportFragment_import">Import</string>
   <string name="ImportFragment_cancel">Anuluj</string>
   <string name="ImportFragment_restore_encrypted_backup">Przywrócić z zaszyfrowanej kopii zapasowej?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Przywracanie szyfrowanej kopii zapasowej spowoduje nadpisanie Twoich istniejących kluczy, ustawień i wiadomości. 
+Stracisz wszystkie informacje obecnie zawarte w aplikacji Signal z wyjątkiem tych zawartych w kopii zapasowej.</string>
   <string name="ImportFragment_restore">Przywróć</string>
   <string name="ImportFragment_import_plaintext_backup">Importować z nieszyfrowanej kopii zapasowej?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Wiadomości z jawnej kopii zapasowej zostaną zaimportowane. Jeżeli wcześniej wykonywałeś już tę czynność, to ponowny import spowoduje duplikację wiadomości.</string>
@@ -216,18 +253,32 @@ wiadomości SMS z domyślnej aplikacji SMS. Jeżeli wcześniej wykonywałeś ju
   <string name="ImportFragment_no_encrypted_backup_found">Nie odnaleziono szyfrowanej kopii zapasowej!</string>
   <string name="ImportFragment_restore_complete">Przywracanie zakończone!</string>
   <!--InputPanel-->
+  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Dotknij i trzymaj palec, aby nagrać wiadomość głosową. Aby wysłać zdejmij palec z ekranu.</string>
   <!--InviteActivity-->
   <string name="InviteActivity_share">Podziel się</string>
   <string name="InviteActivity_send_sms">Wyślij SMS</string>
   <string name="InviteActivity_cancel">Anuluj</string>
   <string name="InviteActivity_sending">Wysyłanie...</string>
+  <string name="InviteActivity_heart_content_description">Serce</string>
   <string name="InviteActivity_invitations_sent">Zaproszenie zostało wysłane!</string>
   <string name="InviteActivity_invite_to_signal">Zaproś do używania Signal</string>
+  <plurals name="InviteActivity_send_to_friends">
+    <item quantity="one">WYŚLIJ DO 1 ZNAJOMEGO</item>
+    <item quantity="few">WYŚLIJ DO %d ZNAJOMYCH</item>
+    <item quantity="other">WYŚLIJ DO %d ZNAJOMYCH</item>
+  </plurals>
+  <plurals name="InviteActivity_send_sms_invites">
+    <item quantity="one">Wysłać 1 zaproszenie SMS?</item>
+    <item quantity="few">Wysłać %d zaproszeń SMS?</item>
+    <item quantity="other">Wysłać %d zaproszeń SMS?</item>
+  </plurals>
   <string name="InviteActivity_lets_switch_to_signal">Zacznij używać Signal: %1$s</string>
+  <string name="InviteActivity_no_app_to_share_to">Wygląda na to, że nie masz żadnych aplikacji z którymi możesz się podzielić.</string>
   <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Nie pozwól znajomym używać nieszyfrowanych połączeń.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nie znaleziono żadnego zeskanowanego klucza!</string>
   <string name="KeyScanningActivity_install_barcode_Scanner">Zainstalować Barcode Scanner?</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Aplikacja Signal potrzebuje skanera kodów QR.</string>
   <!--MessageDetailsRecipient-->
   <string name="MessageDetailsRecipient_failed_to_send">Nie udało się wysłać</string>
   <string name="MessageDetailsRecipient_new_identity">Nowa tożsamość</string>
@@ -248,6 +299,7 @@ wiadomości SMS z domyślnej aplikacji SMS. Jeżeli wcześniej wykonywałeś ju
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Wiadomość multimedialna</string>
   <!--MessageRecord-->
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Otrzymano wiadomość szyfrowaną. Wiadomość ta została wysłana przy użyciu starej wersji Signal, która nie jest już wspierana. Poproś nadawcę tej wiadomości o aktualizacje aplikacji do najnowszej wersji i przesłanie wiadomości ponownie.</string>
   <string name="MessageRecord_left_group">Opuściłeś grupę.</string>
   <string name="MessageRecord_updated_group">Zaktualizowano grupę.</string>
   <string name="MessageRecord_s_called_you">%s dzwonił do Ciebie</string>
@@ -264,6 +316,9 @@ wiadomości SMS z domyślnej aplikacji SMS. Jeżeli wcześniej wykonywałeś ju
   <string name="DeviceProvisioningActivity_continue">KONTYNUUJ</string>
   <string name="DeviceProvisioningActivity_title">Połączyć z tym urządzeniem?</string>
   <string name="DeviceProvisioningActivity_content_intro">Będę w stanie</string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+• Czytać wszystkie Twoje wiadomości
+\n• Wysyłać wiadomości w Twoim imieniu</string>
   <string name="DeviceProvisioningActivity_content_progress_title">Rejestrowanie urządzenia</string>
   <string name="DeviceProvisioningActivity_content_progress_content">Rejestrowanie nowego urządzenia...</string>
   <string name="DeviceProvisioningActivity_content_progress_success">Urządzenie zostało zatwierdzone!</string>
@@ -271,6 +326,7 @@ wiadomości SMS z domyślnej aplikacji SMS. Jeżeli wcześniej wykonywałeś ju
   <string name="DeviceProvisioningActivity_content_progress_network_error">Błąd sieci.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Niepoprawny kod QR.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Niestety masz już zbyt dużo zarejestrowanych urządzeń, spróbuj usunąć któreś z nich...</string>
+  <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Przepraszamy, ale to nie jest prawidłowy link QR.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Podaj hasło</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona Signal</string>
@@ -286,6 +342,7 @@ wiadomości SMS z domyślnej aplikacji SMS. Jeżeli wcześniej wykonywałeś ju
   <string name="RatingManager_later">Później</string>
   <!--RecipientPreferencesActivity-->
   <string name="RecipientPreferenceActivity_block_this_contact_question">Zablokować ten kontakt?</string>
+  <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_or_calls_from_this_user">Już nie będziesz otrzymywać wiadomości i połączeń od tego użytkownika.</string>
   <string name="RecipientPreferenceActivity_block">Blokuj</string>
   <string name="RecipientPreferenceActivity_unblock_this_contact_question">Odblokować ten kontakt?</string>
   <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Czy jesteś pewny, że chcesz odblokować ten kontakt?</string>
@@ -306,8 +363,13 @@ wiadomości SMS z domyślnej aplikacji SMS. Jeżeli wcześniej wykonywałeś ju
   <string name="RedPhone_recipient_unavailable">Odbiorca niedostępny</string>
   <string name="RedPhone_performing_handshake">Wykonywanie uwierzytelnienia</string>
   <string name="RedPhone_network_failed">Nieudane połączenie sieci</string>
+  <string name="RedPhone_client_failed">Błąd klienta</string>
+  <string name="RedPhone_fatal_error">Błąd krytyczny</string>
+  <string name="RedPhone_login_failed">Nie udało zalogować się!</string>
   <string name="RedPhone_message_from_the_server">Wiadomość z serwera</string>
   <string name="RedPhone_number_not_registered">Numer nie jest zarejestrowany!</string>
+  <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Numer który wybrałeś nie wspiera bezpiecznych połączeń głosowych!</string>
+  <string name="RedPhone_got_it">Rozumiem</string>
   <!--RegistrationActivity-->
   <string name="RegistrationActivity_connect_with_signal">Połącz z Signal</string>
   <string name="RegistrationActivity_select_your_country">Wybierz swój kraj</string>
@@ -364,9 +426,11 @@ Otrzymano wiadomość wymiany klucz dla niepoprawnej wersji protokołu.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
 Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć i wyświetlić.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Otrzymał zaktualizowany, ale z nieznaną informacją tożsamości. Dotknij aby potwierdzić tożsamość.</string>
+  <string name="SmsMessageRecord_secure_session_reset">Reset bezpiecznej sesji.</string>
   <string name="SmsMessageRecord_duplicate_message">Duplikuj wiadomość.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Opuścił grupę...</string>
+  <string name="ThreadRecord_secure_session_reset">Reset bezpiecznej sesji.</string>
   <string name="ThreadRecord_draft">Szkic:</string>
   <string name="ThreadRecord_called">Ty zadzwoniłeś</string>
   <string name="ThreadRecord_called_you">Oni zadzwonili</string>
@@ -442,6 +506,8 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Szybka odpowiedź jest niedostępna kiedy Signal jest zablokowany!</string>
   <string name="QuickResponseService_problem_sending_message">Wystąpił błąd przy wysyłaniu wiadomości!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Nowa wiadomość</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Obraz</string>
   <string name="attachment_type_selector__audio">Audio</string>
@@ -524,13 +590,13 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Aktualizowanie bazy danych...</string>
   <string name="export_fragment__export_plaintext_backup">Eksport nieszyfrowanej kopi zapasowej</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Eksportuj niezaszyfrowaną kopię zapasową kompatybilną z SMS Backup &amp; Restore</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Eksportuj niezaszyfrowaną kopię zapasową kompatybilną z \'SMS Backup &amp; Restore\'</string>
   <string name="import_fragment__import_system_sms_database">Importuj systemową bazę danych SMS</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Importuj wiadomości z domyślnej aplikacji SMS</string>
   <string name="import_fragment__restore_encrypted_backup">Przywróć szyfrowaną kopię zapasową</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">Przywróć poprzednio wyeksportowaną kopię zapasową Signal</string>
   <string name="import_fragment__import_plaintext_backup">Importuj nieszyfrowaną kopię zapasową</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">Importuj niezaszyfrowany plik kopii zapasowej, kompatybilny z SMS Backup &amp; Restore.</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">Importuj niezaszyfrowany plik kopii zapasowej, kompatybilny z \'SMS Backup &amp; Restore\'.</string>
   <!--load_more_header-->
   <string name="load_more_header__see_full_conversation">Zobacz pełną konwersację</string>
   <!--media_overview_activity-->
@@ -588,6 +654,8 @@ NUMER TELEFONU</string>
   <!--registration_problems-->
   <string name="registration_problems__some_possible_problems_include">Niektóre możliwe problemy:</string>
   <string name="registration_problems__sms_interceptors">Przechwytywanie SMS.</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+Niektóre zewnętrzne aplikacje SMS, takie jak Handcent lub GoSMS mogą przechwytywać całą komunikację SMS. Sprawdź czy otrzymałeś wiadomość rozpoczynającą się od słów: \'Twój kod weryfikacyjny:\'. Jeśli tak, musisz skonfigurować swoją zewnętrzną aplikację tak aby nie przechwytywała wiadomości SMS.</string>
   <string name="registration_problems__incorrect_number">Niepoprawny numer.</string>
   <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
 Upewnij się czy wprowadzony numer jest poprawny oraz czy kod Twojego regionu jest prawidłowy.</string>
@@ -602,11 +670,13 @@ TextSecure może również zadzwonić do Ciebie w celu weryfikacji numeru. Wybie
   <string name="registration_progress_activity__call_me">Zadzwoń do mnie</string>
   <string name="registration_progress_activity__edit_number">Edytuj numer</string>
   <string name="registration_progress_activity__connectivity_error">Błąd połączenia.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal nie był w stanie połączyć się z usługą push service.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal nie był w stanie połączyć się z serwerem.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Niektóre możliwe problemy:</string>
   <string name="registration_progress_activity__no_network_connectivity">Brak połączenia z siecią.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Twój telefon musi połączyć się z siecią, aby użyć tej funkcji Signal. Sprawdź czy urządzenie podłączone jest do danych mobilnych lub WiFi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Restrykcyjny Firewall.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
+Jeśli jesteś połączony przez WiFi, możliwe jest że Firewall blokuje dostęp do serwera Signal. Spróbuj połączyć się z inną siecią lub danymi mobilnymi.</string>
   <string name="registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
 Za chwilę Signal automatycznie zweryfikuje Twój numer za pomocą wiadomości SMS.</string>
   <string name="registration_progress_activity__connecting">Łączenie...</string>
@@ -643,11 +713,13 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="AndroidManifest__change_passphrase">Zmień hasło</string>
   <string name="AndroidManifest__verify_identity">Zweryfikuj tożsamość</string>
   <string name="AndroidManifest__log_submit">Wyślij logi debugowania</string>
-  <string name="AndroidManifest__media_preview">Podgląd pliku</string>
+  <string name="AndroidManifest__media_preview">Podgląd wiadomości multimedialnej</string>
   <string name="AndroidManifest__media_overview">Wszystkie obrazy</string>
   <string name="AndroidManifest__media_overview_named">Wszystkie obrazy z %1$s</string>
+  <string name="AndroidManifest__message_details">Szczegóły wiadomości</string>
   <string name="AndroidManifest_manage_linked_devices">Zarządzaj zarejestrowanymi urządzeniami</string>
   <string name="AndroidManifest__invite_friends">Zaproś znajomych</string>
+  <string name="AndroidManifest_conversations_archive">Archiwum konwersacji</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / eksport</string>
   <string name="arrays__your_identity_key">Twój klucz tożsamości</string>
@@ -713,7 +785,7 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</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__inthread_notifications">Powiadomienia \"w rozmowie\"</string>
+  <string name="preferences__in_conversation_notifications">Powiadomienia \"w rozmowie\"</string>
   <string name="preferences__play_inthread_notifications">Włącz dźwięk powiadomienia w aktywnej rozmowie</string>
   <string name="preferences__repeat_alerts">Powtarzaj alarmy</string>
   <string name="preferences__never">Nigdy</string>
@@ -751,12 +823,9 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences__mmsc_password">Hasło MMSC</string>
   <string name="preferences__sms_delivery_reports">Raporty dostarczenia SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Żądaj raportu dostarczenia każdej wysłanej wiadomości SMS</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatycznie usuń starsze wiadomości po przekroczeniu określonej długości wątku</string>
   <string name="preferences__delete_old_messages">Usuń stare wiadomości</string>
   <string name="preferences__chats">Czaty i media</string>
   <string name="preferences__conversation_length_limit">Limit długości konwersacji</string>
-  <string name="preferences__trim_all_threads_now">Przytnij wszystkie wątki</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skanuj wszystkie rozmowy i przytnij do zdefiniowanej długości</string>
   <string name="preferences__devices">Urządzenia</string>
   <string name="preferences__light_theme">Jasny</string>
   <string name="preferences__dark_theme">Ciemny</string>
@@ -766,8 +835,8 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="preferences__default">Domyślne</string>
   <string name="preferences__language">Język</string>
   <string name="preferences__language_summary">Język %s</string>
-  <string name="preferences__signal_messages_and_calls">Wiadomości i dzwonienie przez Signal</string>
-  <string name="preferences__free_private_messages_and_calls">Darmowe i prywatne wiadomości i dzwonienie do użytkowników Signal</string>
+  <string name="preferences__signal_messages_and_calls">Wiadomości i połączenia Signal</string>
+  <string name="preferences__free_private_messages_and_calls">Darmowe oraz prywatne wiadomości i połączenia do użytkowników Signal</string>
   <string name="preferences__submit_debug_log">Wyślij logi debugowania</string>
   <string name="preferences__support_wifi_calling">Tryb zgodności \'WiFi Calling\'</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Włącz jeśli Twoje urządzenie używa dostarczania SMS/MMS przez WiFi (włącz tylko wtedy gdy \'Połączenia WiFi\' jest włączone na Twoim urządzeniu)</string>
@@ -812,11 +881,14 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Usuń zaznaczone</string>
   <string name="conversation_list_batch__menu_select_all">Zaznacz wszystko</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Wybrane archiwum</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Przywróć wybrane z archiwum</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Szukaj</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Zdjęcie kontaktu</string>
   <string name="conversation_list_item_view__error_alert">Powiadomienie błedu</string>
+  <string name="conversation_list_item_view__archived">Archiwum</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nowa konwersacja</string>
   <!--conversation_secure_verified-->
@@ -854,6 +926,7 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="text_secure_normal__menu_clear_passphrase">Zablokuj</string>
   <string name="text_secure_normal__mark_all_as_read">Oznacz wszystkie jako przeczytane</string>
   <string name="text_secure_normal__invite_friends">Zaproś znajomych</string>
+  <string name="text_secure_normal__help">Pomoc</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Twoja wersja Signal wygasła!</string>
   <string name="reminder_header_expired_build_details">Wiadomości nie będą już pomylnie wysyłane, prosimy o aktualizację do najnowszej wersji.</string>
@@ -865,8 +938,10 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="reminder_header_sms_import_text">Dotknij, aby skopiować wiadomości SMS na tym telefonie do szyfrowanej bazy danych.</string>
   <string name="reminder_header_sms_import_button">IMPORT</string>
   <string name="reminder_header_push_title">Włącz wiadomości i połączenia Signal</string>
+  <string name="reminder_header_push_text">Polepsz swoje komunikacje.</string>
   <string name="reminder_header_push_button">WŁĄCZ</string>
   <string name="reminder_header_invite_title">Zaproś do używania Signal</string>
+  <string name="reminder_header_invite_text">Przenieś swoje rozmowy z %1$s na wyższy poziom.</string>
   <string name="reminder_header_invite_button">ZAPROŚ</string>
   <string name="reminder_header_share_title">Zaproś swoich znajomych!</string>
   <string name="reminder_header_share_text">Im więcej twoich znajomych używa Signal, tym bardziej staje się on użyteczny.</string>
@@ -879,7 +954,6 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Zapisz</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Podgląd obrazu</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Odśwież</string>
   <!--redphone_audio_popup_menu-->

res/values-pt-rBR/strings.xml

@@ -10,7 +10,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Você ainda não definiu uma frase-chave!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s mensagens por conversa</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Excluir todas as mensagens antigas agora?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tem certeza que deseja manter apenas as %s mensagens mais recentes?</string>
   <string name="ApplicationPreferencesActivity_delete">Excluir</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Desabilitar frase-chave?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -159,9 +158,15 @@ Tem certeza que deseja fazer isto?</string>
     <item quantity="other">Isto irá excluir permanentemente todas as %1$d conversas selecionadas.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Deletando</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Excluindo conversas selecionadas...</string>
+  <string name="ConversationListFragment_archived_conversations">Conversas arquivadas</string>
+  <string name="ConversationListFragment_undo">DESFAZER</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Conversa movida para a caixa de entrada</string>
+  <string name="ConversationListFragment_archived_conversation">Conversa arquivada</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Conversas movidas para a caixa de entrada</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mensagem de intercâmbio de chaves...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Conversas arquivadas (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Usando personalização: %s</string>
   <string name="CustomDefaultPreference_using_default">Usando padrão: %s</string>
@@ -201,14 +206,14 @@ Tem certeza que deseja fazer isto?</string>
   <string name="ExportFragment_success">Sucesso!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Falha permanente de comunicação do Signal!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">O Signal não conseguiu cadastrar-se com o Google Play Services. A comunicação pelo canal de dados foi desabilitada; tente recadastrar através do menu de configurações do Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">O Signal não conseguiu cadastrar-se com o Google Play Services. Mensagens e chamadas Signal foram desabilitadas; tente recadastrar em Configurações &gt; Avançado.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Novo grupo</string>
   <string name="GroupCreateActivity_actionbar_update_title">Atualizar grupo</string>
   <string name="GroupCreateActivity_group_name_hint">Nome do grupo</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Novo grupo MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Você selecionou um contato que não tem suporte a grupos Signal, então este grupo será de MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Você não está cadastrado para usar o canal de dados, então grupos Signal estão desabilitados.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Você não está cadastrado para usar mensagens e chamadas Signal, então grupos Signal estão desabilitados. Tente recadastrar em Configurações &gt; Avançado.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Um erro inesperado ocorreu e fez a criação do grupo falhar.</string>
   <string name="GroupCreateActivity_contacts_no_members">Você precisa de pelo menos uma pessoa no seu grupo!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Um dos membros do seu grupo tem um número que não pôde ser lido. Favor consertar ou remover esse contato e tentar novamente.</string>
@@ -263,6 +268,14 @@ Tem certeza que deseja fazer isto?</string>
   <string name="InviteActivity_heart_content_description">Coração</string>
   <string name="InviteActivity_invitations_sent">Convites enviados!</string>
   <string name="InviteActivity_invite_to_signal">Convidar para o Signal</string>
+  <plurals name="InviteActivity_send_to_friends">
+    <item quantity="one">ENVIAR PARA 1 AMIGO</item>
+    <item quantity="other">ENVIAR PARA %d AMIGOS</item>
+  </plurals>
+  <plurals name="InviteActivity_send_sms_invites">
+    <item quantity="one">Enviar 1 convite SMS?</item>
+    <item quantity="other">Enviar %d convites SMS?</item>
+  </plurals>
   <string name="InviteActivity_lets_switch_to_signal">Vamos mudar para o Signal: %1$s</string>
   <string name="InviteActivity_no_app_to_share_to">Parece que você não tem apps para onde compartilhar.</string>
   <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Amigos não deixam amigos conversar sem criptografia.</string>
@@ -495,6 +508,7 @@ Tem certeza que deseja fazer isto?</string>
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Resposta rápida não disponível quando o Signal está bloqueado!</string>
   <string name="QuickResponseService_problem_sending_message">Problema ao enviar mensagem!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_message">Nova mensagem</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Imagem</string>
   <string name="attachment_type_selector__audio">Áudio</string>
@@ -678,7 +692,6 @@ falhou.</string>
   <string name="AndroidManifest__change_passphrase">Mudar frase-chave</string>
   <string name="AndroidManifest__verify_identity">Verificar identidade</string>
   <string name="AndroidManifest__log_submit">Enviar logs de depuração</string>
-  <string name="AndroidManifest__media_preview">Visualização rápida</string>
   <string name="AndroidManifest__media_overview">Todas as imagens</string>
   <string name="AndroidManifest__media_overview_named">Todas as imagens com %1$s</string>
   <string name="AndroidManifest_manage_linked_devices">Gerenciar dispositivos vinculados</string>
@@ -739,7 +752,6 @@ falhou.</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__inthread_notifications">Notificações em conversas</string>
   <string name="preferences__play_inthread_notifications">Tocar som de notificação quando vendo uma conversa ativa</string>
   <string name="preferences__repeat_alerts">Repetir alertas</string>
   <string name="preferences__never">Nunca</string>
@@ -777,12 +789,9 @@ falhou.</string>
   <string name="preferences__mmsc_password">Senha do MMSC</string>
   <string name="preferences__sms_delivery_reports">Avisos de entrega de SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticamente excluir mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
   <string name="preferences__delete_old_messages">Excluir mensagens antigas</string>
   <string name="preferences__chats">Chats e mídia</string>
   <string name="preferences__conversation_length_limit">Tamanho máximo de conversa</string>
-  <string name="preferences__trim_all_threads_now">Apagar todas conversas agora</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Verificar todas conversas e aplicar tamanho máximo de conversa</string>
   <string name="preferences__light_theme">Claro</string>
   <string name="preferences__dark_theme">Escuro</string>
   <string name="preferences__appearance">Aparência</string>
@@ -892,7 +901,6 @@ falhou.</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Salvar</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Visualização rápida.</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Atualizar</string>
   <!--redphone_audio_popup_menu-->

res/values-pt/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ainda não definiu uma frase-chave!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s mensagens por conversa</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Apagar todas as mensagens antigas?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tem certeza que deseja eliminar as conversas anteriores às %s mensagens mais recentes?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Isto irá reduzir as conversas anteriores às %s mensagens mais recentes.</string>
   <string name="ApplicationPreferencesActivity_delete">Apagar</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Desabilitar frase-chave?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -157,9 +157,16 @@ que %2$s reinstalou o Signal e tem agora uma nova chave de identidade.
     <item quantity="other">Isto irá eliminar permanentemente todas as %1$d conversas seleccionadas.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">A apagar</string>
-  <string name="ConversationListFragment_deleting_selected_threads">A apagar conversas seleccionadas...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">A eliminar conversas seleccionadas...</string>
+  <string name="ConversationListFragment_archived_conversations">Conversas arquivadas</string>
+  <string name="ConversationListFragment_undo">REVERTER</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Conversa movida para a caixa de entrada</string>
+  <string name="ConversationListFragment_archived_conversation">Conversa arquivada</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Conversas movidas para a caixa de entrada</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mensagem de intercâmbio de chaves...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Conversas arquivadas (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Usar a opção personalizada: %s</string>
   <string name="CustomDefaultPreference_using_default">Usar a opção por omissão: %s</string>
@@ -179,6 +186,7 @@ que %2$s reinstalou o Signal e tem agora uma nova chave de identidade.
   <string name="DeviceListItem_unnamed_device">Dispositivo sem nome</string>
   <string name="DeviceListItem_linked_s">Interligado %s</string>
   <string name="DeviceListItem_last_active_s">Activo pela última vez %s</string>
+  <string name="DeviceListItem_today">Hoje</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partilhar com</string>
   <!--ExperienceUpgradeActivity-->
@@ -199,14 +207,14 @@ que %2$s reinstalou o Signal e tem agora uma nova chave de identidade.
   <string name="ExportFragment_success">Sucesso!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Falha de comunicação Signal permanente!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal não se conseguiu registar com os Serviços Google Play. A comunicação através do canal de dados foi inactiva, por favor tente registar-se novamente através do menu de configurações Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal não se conseguiu registar com os Serviços Google Play. As mensagens e chamadas Signal estão desabilitadas. Por favor tente registar-se novamente em Definições &gt; Avançadas.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Grupo novo</string>
   <string name="GroupCreateActivity_actionbar_update_title">Actualizar grupo</string>
   <string name="GroupCreateActivity_group_name_hint">Nome do grupo</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Novo Grupo MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Seleccionou um contacto que não suporta grupos Signal, pelo que este grupo será um grupo MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Não está registado para usar o canal de dados, pelo que os grupos Signal estão desabilitados.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Não está registado para usar mensagens e chamadas Signal, pelo que os grupos Signal estão desabilitados. Por favor tente registar-se em Definições &gt; Avançadas.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Um irro inesperado ocorreu que impossibilitou a criação do grupo.</string>
   <string name="GroupCreateActivity_contacts_no_members">É necessária pelo menos uma pessoa para formar um grupo!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Um dos membros do seu grupo tem um número ilegível. Por favor corrija ou remova esse contacto e tente novamente.</string>
@@ -323,6 +331,8 @@ importá-lo novamente resultará em mensagens duplicadas.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Código QR inválido.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Lamentamos mas tem demasiados dispositivos interligados, tente remover alguns...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Lamento mas este não é um código QR de ligação de dispositivo válido.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Interligar a um dispositivo Signal?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Aparentemente está a tentar interligar-se a um dispositivo Signal através de um scanner externo. Para sua protecção, releia o código através do Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Introduza palavra-chave</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icon Signal</string>
@@ -508,7 +518,7 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="QuickResponseService_problem_sending_message">Problema no envio da mensagem!</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Mensagem nova!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Mensagem nova</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Imagem</string>
   <string name="attachment_type_selector__audio">Áudio</string>
@@ -680,9 +690,7 @@ insira abaixo o código de seis dígitos que irá ouvir.
   <string name="registration_progress_activity__call_me">Ligue-me</string>
   <string name="registration_progress_activity__edit_number">Editar número</string>
   <string name="registration_progress_activity__connectivity_error">Erro de ligação.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal foi impossibilitado de se ligar ao serviço push
-</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal foi impossibilitado de se ligar ao servidor</string>
   <string name="registration_progress_activity__some_possible_problems_include">Alguns problemas
 possíveis incluem:
 </string>
@@ -745,6 +753,7 @@ falhou.
   <string name="AndroidManifest__message_details">Detalhes da mensagem</string>
   <string name="AndroidManifest_manage_linked_devices">Gerir dispositivos interligados</string>
   <string name="AndroidManifest__invite_friends">Convidar amigos</string>
+  <string name="AndroidManifest_conversations_archive">Arquivo de conversas</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar / Exportar</string>
   <string name="arrays__your_identity_key">A sua chave de identidade</string>
@@ -809,7 +818,7 @@ falhou.
   <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__inthread_notifications">Notificações em conversas</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>
   <string name="preferences__repeat_alerts">Alertas repetidos</string>
   <string name="preferences__never">Nunca</string>
@@ -847,12 +856,12 @@ falhou.
   <string name="preferences__mmsc_password">Palavra-chave MMSC</string>
   <string name="preferences__sms_delivery_reports">Avisos de entrega de SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pedir um aviso de entrega para cada SMS enviado</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Apagar automaticamente as mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Apagar automaticamente as mensagens mais antigas quando uma conversa exceder o tamanho especificado</string>
   <string name="preferences__delete_old_messages">Apagar mensagens antigas</string>
   <string name="preferences__chats">Conversas e media</string>
   <string name="preferences__conversation_length_limit">Tamanho máximo de conversa</string>
-  <string name="preferences__trim_all_threads_now">Apagar todas conversas agora</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Verificar todas conversas e aplicar tamanho máximo de conversa</string>
+  <string name="preferences__trim_all_conversations_now">Aparar todas as conversas agora</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Verificar todas as conversas e limitá-las ao tamanho máximo de conversa</string>
   <string name="preferences__devices">Dispositivos</string>
   <string name="preferences__light_theme">Claro</string>
   <string name="preferences__dark_theme">Escuro</string>
@@ -908,11 +917,14 @@ falhou.
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Apagar seleccionado</string>
   <string name="conversation_list_batch__menu_select_all">Seleccionar tudo</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Arquivo seleccionado</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Desarquivar seleccionado</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Procurar</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Foto de Contacto</string>
   <string name="conversation_list_item_view__error_alert">Alerta de erro</string>
+  <string name="conversation_list_item_view__archived">Arquivado</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Conversa nova</string>
   <!--conversation_secure_verified-->

res/values-ro/strings.xml

@@ -10,7 +10,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Nu ai setat inca o parola!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s mesaje per conversație</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Şterge toate mesajele vechi acum?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Eşti sigur că doreşti să scurtezi toate conversaţiile la %s cele mai recente mesaje?</string>
   <string name="ApplicationPreferencesActivity_delete">Şterge</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Dezactivez parola?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -18,6 +17,7 @@
     </string>
   <string name="ApplicationPreferencesActivity_disable">Dezactivează</string>
   <string name="ApplicationPreferencesActivity_unregistering">Anulare înregistrare</string>
+  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Se dezabonează de la mesajele și apelurile Signal... </string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Dezactivez mesajele și apelurile Signal? </string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Dezactivare mesaje și apeluri Signal prin dezabonarea de la server. Va trebui să re-înregistrezi numărul tău de telefon pentru a putea să le folosești din nou în viitor.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Eroare de conectare cu serverul!</string>
@@ -72,6 +72,7 @@
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Acest mesaj <b>nu</b> o să fie criptat deoarece destinatarul nu mai este un utilizator Signal.\n\nTrimit mesaj nesecurizat?</string>
   <string name="ConversationItem_unable_to_open_media">Nu a fost găsită o aplicație pentru a deschide acest tip media.</string>
   <!--ConversationActivity-->
+  <string name="ConversationActivity_reset_secure_session_question">Resetez sesiunea securizată?</string>
   <string name="ConversationActivity_reset">Resetează</string>
   <string name="ConversationActivity_delete_thread_question">Șterg conversația?</string>
   <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Această acțiune va șterge permanent toate mesajele din conversația curentă.</string>
@@ -151,9 +152,15 @@
     <item quantity="other">Această acțiune va șterge permanent toate cele %1$d conversații selectate.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Se șterge</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Se şterg conversaţiile selectate...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Se şterg conversaţiile selectate...</string>
+  <string name="ConversationListFragment_archived_conversations">Conversații arhivate</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Mută conversația în inbox</string>
+  <string name="ConversationListFragment_archived_conversation">Conversație arhivată</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Conversațiile au fost mutate în inbox</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mesaj pentru schimb de chei...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Conversații arhivate (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Specific %s</string>
   <string name="CustomDefaultPreference_using_default">Implicit: %s</string>
@@ -168,6 +175,7 @@
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">Dispozitiv fără nume</string>
   <string name="DeviceListItem_last_active_s">Ultima oară activ %s</string>
+  <string name="DeviceListItem_today">Azi</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Partajează cu</string>
   <!--ExperienceUpgradeActivity-->
@@ -178,8 +186,13 @@
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure și RedPhone sunt acum o singură aplicație: Signal. Apasă pentru a explora.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Exportă</string>
-  <string name="ExportFragment_cancel">Anulează</string>
+  <string name="ExportFragment_export_plaintext_to_storage">Export în format text pe spațiul de stocare?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Atenție, această acțiune va exporta conținutul mesajelor tale Signal în format text pe spațiul de stocare.</string>
+  <string name="ExportFragment_cancel">Anulare</string>
   <string name="ExportFragment_exporting">Se exportă</string>
+  <string name="ExportFragment_exporting_plaintext_to_storage">Se exportă în format text pe spațiul de stocare...</string>
+  <string name="ExportFragment_error_unable_to_write_to_storage">Eroare, nu se poate scrie pe spațiul de stocare.</string>
+  <string name="ExportFragment_error_while_writing_to_storage">Eroare în timpul scrierii pe spațiul de stocare.</string>
   <string name="ExportFragment_success">Succes!</string>
   <!--GcmRefreshJob-->
   <!--GroupCreateActivity-->
@@ -187,8 +200,9 @@
   <string name="GroupCreateActivity_actionbar_update_title">Actualizează grup</string>
   <string name="GroupCreateActivity_group_name_hint">Nume grup</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Grup MMS nou</string>
+  <string name="GroupCreateActivity_contacts_dont_support_push">Ai selectat un contact care nu suportă grupuri Signal, astfel acest grup va fi de tip MMS.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">A apărut o eroare neprevazută care a dus la imposibilitatea creării grupului.</string>
-  <string name="GroupCreateActivity_contacts_no_members">Este nevoie de cel puțin o persoană în grupul dvs!</string>
+  <string name="GroupCreateActivity_contacts_no_members">Este nevoie de cel puțin o persoană în grupul tău!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Unul dintre membrii grupului dvs. are un număr de telefon ce nu poate fi citit corect. Vă rugăm să remediaţi problema sau să eliminaţi acel contact şi să încercaţi din nou.</string>
   <string name="GroupCreateActivity_avatar_content_description">Avatar de grup</string>
   <string name="GroupCreateActivity_menu_create_title">Creare grup </string>
@@ -203,10 +217,16 @@
   <string name="ImportExportActivity_import">Importă</string>
   <string name="ImportExportActivity_export">Exportă</string>
   <!--ImportFragment-->
-  <string name="ImportFragment_import_system_sms_database">Import baza de date cu SMS-uri?</string>
+  <string name="ImportFragment_import_system_sms_database">Importă baza de date cu SMS-uri?</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Această acțiune va importa 
+mesajele din baza de date SMS implicită de sistem în Signal. Dacă ai importat anterior
+ baza de date cu SMS-uri, importarea repetată va rezulta în mesaje duplicate.</string>
   <string name="ImportFragment_import">Importă</string>
-  <string name="ImportFragment_cancel">Anulează</string>
+  <string name="ImportFragment_cancel">Anulare</string>
   <string name="ImportFragment_restore_encrypted_backup">Restaurează backup criptat?</string>
+  <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
+Restaurarea unui backup criptat va înlocui în totalitate cheile, preferințele și mesajele tale existente.
+Vei pierde orice informație care se află în instalarea curentă de Signal și care nu se află în backup.</string>
   <string name="ImportFragment_restore">Restaurează</string>
   <string name="ImportFragment_import_plaintext_backup">Importă backup necriptat?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Această acțiune va importa mesajele din backup-ul necriptat. Dacă ați mai importat acest backup atunci importarea curentă va crea mesaje duplicate. </string>
@@ -220,10 +240,11 @@
   <string name="ImportFragment_no_encrypted_backup_found">Nu a fost găsit nici un backup criptat!</string>
   <string name="ImportFragment_restore_complete">Restaurare completa!</string>
   <!--InputPanel-->
+  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Ține apăsat pentru a înregistra un mesaj vocal, eliberează pentru a trimite</string>
   <!--InviteActivity-->
   <string name="InviteActivity_share">Partajează</string>
   <string name="InviteActivity_send_sms">Trimite SMS</string>
-  <string name="InviteActivity_cancel">Anulează</string>
+  <string name="InviteActivity_cancel">Anulare</string>
   <string name="InviteActivity_sending">Se trimite...</string>
   <string name="InviteActivity_heart_content_description">Inimă</string>
   <string name="InviteActivity_invitations_sent">Invitațiile au fost trimise!</string>
@@ -275,19 +296,26 @@
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Parola veche este incorectă!</string>
   <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Introduceţi parola nouă!</string>
   <!--DeviceProvisioningActivity-->
-  <string name="DeviceProvisioningActivity_cancel">ANULEAZĂ</string>
+  <string name="DeviceProvisioningActivity_link_this_device">Conectez acest dispozitiv?</string>
+  <string name="DeviceProvisioningActivity_cancel">ANULARE</string>
   <string name="DeviceProvisioningActivity_continue">CONTINUĂ</string>
+  <string name="DeviceProvisioningActivity_title">Conectez acest dispozitiv?</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Se conectează dispozitivul</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Se conectează noul dispozitiv...</string>
   <string name="DeviceProvisioningActivity_content_progress_success">Dispozitiv aprobat!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Nu a fost gasit niciun dispozitiv.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Eroare reţea.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Cod QR invalid.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Ne pare rău, ai prea multe dispozitive conectate deja, încearcă să elimini câteva...</string>
+  <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Ne pare rău. acest cod QR pentru conectarea dispozitivului nu este valid.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Conectez un dispozitiv Signal?</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Introduceţi parola</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icoană Signal</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Trimite parola</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Parolă incorectă!</string>
   <!--PlayServicesProblemFragment-->
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">Această versiune de Google Play Services pe care o ai instalată nu funcționează corect. Te rog reinstalează Google Play Services și încearcă din nou.</string>
   <!--RatingManager-->
   <string name="RatingManager_rate_this_app">Evaluează aplicaţia</string>
   <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Dacă îţi place aplicaţia, te rog ajută-ne cu o evaluare.</string>
@@ -335,6 +363,10 @@ numărul dvs. de telefon</string>
   <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">Numărul de telefon
 furnizat (%s) este invalid.</string>
   <string name="RegistrationActivity_unsupported">Neacceptat</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Ne pare rău,
+acest dispozitiv nu suportă mesagerie de tip date. Dispozitivele care rulează o versiune mai veche 
+de Android 4.0 trebuie să aibe un cont Google înregistrat. Dispozitivele care rulează versiunea de Android 4.0 sau mai noi 
+nu au nevoie de un cont Google, dar au nevoie ca aplicația Magazinul Play să fie instalată.</string>
   <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
 Verifică din nou dacă acesta este numărul tău! Suntem pe cale să-l verificăm printr-un SMS.</string>
   <string name="RegistrationActivity_continue">Continuă</string>
@@ -453,10 +485,11 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="MessageNotifier_media_message">Mesaj media</string>
   <string name="MessageNotifier_reply">Răspunde</string>
   <!--QuickResponseService-->
+  <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>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Mesaj nou!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Mesaj nou</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Imagine</string>
   <string name="attachment_type_selector__audio">Audio</string>
@@ -513,8 +546,12 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="country_selection_fragment__loading_countries">Incarcarea tarilor...</string>
   <string name="country_selection_fragment__search">Caută</string>
   <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scanează codul QR afișat pe dispozitivul care trebuie conectat</string>
   <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Conectează dispozitiv</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Nu există nici un dispozitiv conectat...</string>
+  <string name="device_list_fragment__link_new_device">Conectează dispozitiv nou</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">continuă</string>
   <!--log_submit_activity-->
@@ -523,6 +560,7 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="log_submit_activity__submitting">Se trimite</string>
   <string name="log_submit_activity__posting_logs">Se trimit log-urile către gist...</string>
   <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Vrei să imporţi mesajale tale text existente în baza de date criptată Signal?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Baza de date a sistemului nu va fi modificată în nici un fel.</string>
   <string name="database_migration_activity__skip">Treci peste</string>
   <string name="database_migration_activity__import">Importă</string>
@@ -563,10 +601,12 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Deblochează</string>
   <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal are nevoie de setările MMS pentru a trimite media și mesaje pentru grupuri prin operatorul wireless. Acest dispozitiv nu oferă această informație, lucru care se poate întâmpla uneori pentru dispozitive blocate sau alte configurații restrictive.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Pentru a putea trimite mesaje multimedia cât și mesaje într-un grup, apăsați \'OK\' și completați setările solicitate. Setările MMS pentru operatorul dvs. pot fi găsite cautând după \'APN operatorul tău\'. Această operațiune este necesară o singură dată.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">BLOCAT</string>
   <!--recipient_preferences-->
+  <string name="recipient_preferences__disable_notifications_for_this_conversation">Dezactivează notificări pentru această conversație</string>
   <string name="recipient_preferences__notification_sound">Ton notificare</string>
   <string name="recipient_preferences__vibrate">Vibrează</string>
   <string name="recipient_preferences__block">Blochează</string>
@@ -604,12 +644,15 @@ regiunea dumneavoastră.</string>
     </string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Verificare pe bază de apel vocal</string>
+  <string name="registration_progress_activity__signal_can_also_call_you_to_verify_your_number">
+Signal poate de asemenea să te sune pentru a verifica numărul tău.
+Apasă \"Sună-mă\" și introdu mai jos
+ codul din șase cifre pe care îl vei auzi.</string>
   <string name="registration_progress_activity__verify">Verifica</string>
   <string name="registration_progress_activity__call_me">Sună-mă</string>
   <string name="registration_progress_activity__edit_number">Editează număr</string>
   <string name="registration_progress_activity__connectivity_error">Eroare de conectivitate</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-        Signal nu s-a putut conecta la serviciul de push.
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal nu s-a putut conecta la server.
     </string>
   <string name="registration_progress_activity__some_possible_problems_include">Probleme posibile
 sunt:</string>
@@ -656,7 +699,9 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <string name="AndroidManifest__media_overview">Toate imaginile</string>
   <string name="AndroidManifest__media_overview_named">Toate imaginile cu %1$s</string>
   <string name="AndroidManifest__message_details">Detalii mesaj</string>
+  <string name="AndroidManifest_manage_linked_devices">Administrează dispozitivele conectate</string>
   <string name="AndroidManifest__invite_friends">Invită prieteni</string>
+  <string name="AndroidManifest_conversations_archive">Arhiva conversațiilor</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importă / Exportă</string>
   <string name="arrays__your_identity_key">Cheia ta de identitate</string>
@@ -722,7 +767,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <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__inthread_notifications">Notificări în conversație</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>
   <string name="preferences__repeat_alerts">Repetă alerte</string>
   <string name="preferences__never">Niciodată</string>
@@ -760,12 +805,12 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <string name="preferences__mmsc_password">Parolă MMSC</string>
   <string name="preferences__sms_delivery_reports">Confirmări de livrare SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Cere o confirmare de livrare pentru fiecare SMS trimis</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Șterge automat mesajele vechi când conversația depășește mărimea specificată</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Șterge automat mesajele vechi când conversația depășește mărimea specificată</string>
   <string name="preferences__delete_old_messages">Șterge mesajele vechi</string>
   <string name="preferences__chats">Conversaţii şi media</string>
   <string name="preferences__conversation_length_limit">Limita mărime conversație</string>
-  <string name="preferences__trim_all_threads_now">Scurtează toate conversaţiile acum</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Verifică toate conversațiile și aplică limite de mărime a conversației</string>
+  <string name="preferences__trim_all_conversations_now">Scurtează acum toate conversaţiile </string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Verifică toate conversațiile și aplică limite de mărime a conversației</string>
   <string name="preferences__devices">Dispozitive</string>
   <string name="preferences__light_theme">Deschisă</string>
   <string name="preferences__dark_theme">Închisă</string>
@@ -787,7 +832,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <string name="preferences_chats__when_using_wifi">Când se utilizează Wi-Fi </string>
   <string name="preferences_chats__when_roaming">Când se utilizează roaming-ul </string>
   <string name="preferences_chats__media_auto_download">Descărcare automată Media</string>
-  <string name="preferences_chats__message_trimming">Scurtarea mesajului</string>
+  <string name="preferences_chats__message_trimming">Scurtarea mesajelor</string>
   <string name="preferences_advanced__use_system_emoji">Foloseşte emoji de sistem</string>
   <string name="preferences_advanced__disable_signal_built_in_emoji_support">Dezactivează icoanele emoji oferite de Signal </string>
   <!--****************************************-->
@@ -822,10 +867,12 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Şterge ce este selectat</string>
   <string name="conversation_list_batch__menu_select_all">Selectează tot</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Arhivă selectată</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Caută</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Poză contact</string>
+  <string name="conversation_list_item_view__archived">Arhivat</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Conversație nouă</string>
   <!--conversation_secure_verified-->
@@ -868,6 +915,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <string name="reminder_header_sms_default_title">Utilizează ca și aplicație SMS implicită</string>
   <string name="reminder_header_sms_default_text">Atingeți pentru a seta Signal ca și aplicație SMS implicită.</string>
   <string name="reminder_header_sms_default_button">SETEAZĂ</string>
+  <string name="reminder_header_sms_import_title">Importă SMS de sistem</string>
   <string name="reminder_header_sms_import_text">Atingeți  pentru a copia mesajele SMS din telefon în baza de date criptată.</string>
   <string name="reminder_header_sms_import_button">IMPORTĂ</string>
   <string name="reminder_header_push_title">Activează mesaje și apeluri Signal</string>

res/values-ru/strings.xml

@@ -10,14 +10,16 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Вы ещё не задали парольную фразу!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s сообщений в разговоре</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Удалить все старые сообщения?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Вы уверены, что хотите обрезать все разговоры до %s последних сообщений, удалив более старые?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Это обрежет все разговоры до последних %s сообщений</string>
   <string name="ApplicationPreferencesActivity_delete">Удалить</string>
-  <string name="ApplicationPreferencesActivity_disable_passphrase">Отключить парольную фразу?</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Отключить парольную фразу</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
-Отключить пароль на просмотр сообщений?</string>
+Отключить блокировку экрана сообщений?</string>
   <string name="ApplicationPreferencesActivity_disable">Отключить</string>
   <string name="ApplicationPreferencesActivity_unregistering">Отмена регистрации</string>
-  <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Unregistering from Signal messages and calls...</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_error_connecting_to_server">Ошибка при соединении с сервером!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS включены</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Нажмите для выбора SMS-приложения по умолчанию</string>
@@ -43,6 +45,7 @@
   <string name="AttachmentTypeSelectorAdapter_audio">Аудио</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Контактная информация</string>
   <!--AudioSlidePlayer-->
+  <string name="AudioSlidePlayer_error_playing_audio">Ошибка при воспроизведении аудио!</string>
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Заблокированные контакты</string>
   <!--CallScreen-->
@@ -54,6 +57,7 @@
   <string name="ConfirmIdentityDialog_accept">Принять</string>
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s">Сообщение %s</string>
+  <string name="ContactsDatabase_signal_call_s">Звонок через Signal %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Размер сообщения: %d Kб</string>
   <string name="ConversationItem_expires_s">Истекает: %s</string>
@@ -70,6 +74,11 @@
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Данное сообщение <b>не будет</b> зашифровано, поскольку получатель больше не использует Signal.\n\nОтправить незащищённое сообщение?</string>
   <string name="ConversationItem_unable_to_open_media">Не найдено приложение, которое может открыть этот медиа-файл.</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_reset">Сброс</string>
+  <string name="ConversationActivity_delete_thread_question">Удалить разговор?</string>
+  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Это удалит все ваши сообщения в этой беседе.</string>
   <string name="ConversationActivity_add_attachment">Добавить вложение</string>
   <string name="ConversationActivity_select_contact_info">Выбрать контакт</string>
   <string name="ConversationActivity_compose_message">Написать сообщение</string>
@@ -93,6 +102,8 @@
   <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">Давайте использовать Signal для общения: %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>
@@ -102,11 +113,20 @@
   <string name="ConversationActivity_unblock">Разблокировать</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>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Подробности</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Транспорт: %1$s\nОтправлено/Получено: %2$s</string>
   <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">Отправитель: %1$s\nТранспорт: %2$s\nОтправлено: %3$s\nПолучено: %4$s</string>
+  <plurals name="ConversationFragment_delete_selected_messages">
+    <item quantity="one">Удалить выбранное сообщение?</item>
+    <item quantity="few">Удалить выбранные сообщения?</item>
+    <item quantity="many">Удалить выбранные сообщения?</item>
+    <item quantity="other">Удалить выбранные сообщения?</item>
+  </plurals>
   <string name="ConversationFragment_save_to_sd_card">Сохранить на SD-карту?</string>
+  <string name="ConversationFragment_saving_this_media_to_storage_warning">Если сохранить этот медиа-файл на SD-карту, любое приложение на вашем устройстве сможет иметь к нему доступ.\n\nПродолжить?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Ошибка при сохранении на SD-карту!</string>
   <string name="ConversationFragment_success_exclamation">Успешно!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Невозможно произвести запись на SD-карту!</string>
@@ -121,10 +141,29 @@
   <!--ConversationListActivity-->
   <string name="ConversationListActivity_search">Поиск...</string>
   <!--ConversationListFragment-->
+  <plurals name="ConversationListFragment_delete_selected_conversations">
+    <item quantity="one">Удалить выбранный разговор?</item>
+    <item quantity="few">Удалить выбранный разговор?</item>
+    <item quantity="many">Удалить выбранный разговор?</item>
+    <item quantity="other">Удалить выбранные беседы?</item>
+  </plurals>
+  <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
+    <item quantity="one">Это удалит выбранный разговор.</item>
+    <item quantity="few">Это удалит %1$d выбранных разговоров.</item>
+    <item quantity="many">Это удалит %1$d выбранных разговоров.</item>
+    <item quantity="other">Это удалит %1$d выбранных разговоров.</item>
+  </plurals>
   <string name="ConversationListFragment_deleting">Удаление</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Удаляем выбранные разговоры...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Удаление выбранных разговоров...</string>
+  <string name="ConversationListFragment_archived_conversations">Архивированные разговоры</string>
+  <string name="ConversationListFragment_undo">ОТМЕНИТЬ</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Переместить разговор во входящие</string>
+  <string name="ConversationListFragment_archived_conversation">Архивированные разговоры</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Переместить разговор во входящие</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Сообщениe обмена ключами...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Архивированные разговоры (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Пользовательское: %s</string>
   <string name="CustomDefaultPreference_using_default">По умолчанию: %s</string>
@@ -144,6 +183,7 @@
   <string name="DeviceListItem_unnamed_device">Устройство без названия</string>
   <string name="DeviceListItem_linked_s">Привязано %s</string>
   <string name="DeviceListItem_last_active_s">Было онлайн %s</string>
+  <string name="DeviceListItem_today">Сегодня</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Поделиться с</string>
   <!--ExperienceUpgradeActivity-->
@@ -154,19 +194,24 @@
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure и RedPhone объединились в одно приложение: Signal. Нажмите, чтобы узнать больше.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Экспорт</string>
+  <string name="ExportFragment_export_plaintext_to_storage">Сохранить открытым текстом на SD-карту?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Внимание, этим вы сохраните ваши сообщения на SD-карту в открытом виде.</string>
   <string name="ExportFragment_cancel">Отмена</string>
   <string name="ExportFragment_exporting">Экспорт</string>
+  <string name="ExportFragment_exporting_plaintext_to_storage">Экспорт открытого текста на SD-карту...</string>
+  <string name="ExportFragment_error_unable_to_write_to_storage">Невозможно произвести запись на SD-карту.</string>
+  <string name="ExportFragment_error_while_writing_to_storage">Ошибка при записи на SD-карту.</string>
   <string name="ExportFragment_success">Успешно!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Неустранимая ошибка соединения!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal не смог зарегистрироваться в службах Google Play. Общение через интернет отключено; пожалуйста, попробуйте зарегистрироваться снова через меню настроек Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal не смог зарегистрироваться при помощи Google Play Services. Сообщения и звонки в Signal запрещены. Пожалуйтса, попробуйте зарегистрироваться снова в Наcтройки &gt; Расширенные.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Новая группа</string>
   <string name="GroupCreateActivity_actionbar_update_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_you_dont_support_push">Вы не зарегистрированы для общения через интернет, поэтому Signal-группы отключены.</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>
   <string name="GroupCreateActivity_contacts_invalid_number">Один из участников имеет неправильный номер. Пожалуйста, исправьте или удалите этот контакт и попробуйте снова.</string>
@@ -174,7 +219,9 @@
   <string name="GroupCreateActivity_menu_create_title">Создать группу</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>
   <string name="GroupCreateActivity_loading_group_details">Загружаем подробности о группе...</string>
+  <string name="GroupCreateActivity_youre_already_in_the_group">Вы уже в группе.</string>
   <!--GroupMembersDialog-->
   <string name="GroupMembersDialog_me">Я</string>
   <!--ImportExportActivity-->
@@ -201,7 +248,24 @@
   <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>
   <!--InviteActivity-->
+  <string name="InviteActivity_share">Поделиться</string>
+  <string name="InviteActivity_send_sms">Отправить СМС</string>
+  <string name="InviteActivity_cancel">Отмена</string>
+  <string name="InviteActivity_sending">Отправка...</string>
+  <string name="InviteActivity_heart_content_description">Сердце</string>
+  <string name="InviteActivity_invitations_sent">Приглашения отосланы!</string>
+  <string name="InviteActivity_invite_to_signal">Пригласить в Signal</string>
+  <plurals name="InviteActivity_send_to_friends">
+    <item quantity="one">Отправить одному другу</item>
+    <item quantity="few">Отправить %d друзьям</item>
+    <item quantity="many">Отправить %d друзьям</item>
+    <item quantity="other">Отправить %d друзьям</item>
+  </plurals>
+  <string name="InviteActivity_lets_switch_to_signal">Давайте перейдём на Signal: %1$s</string>
+  <string name="InviteActivity_no_app_to_share_to">Похоже, что у Вас нет приложений через которые можно поделиться.</string>
+  <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">Установить сканер штрих-кодов?</string>
@@ -217,14 +281,22 @@
   <string name="NotificationBarManager_signal_call_in_progress">Выполняется звонок через Signal</string>
   <string name="NotificationBarManager_missed_call_from_s">Пропущен звонок от %s</string>
   <string name="NotificationBarManager_missed_signal_call">Пропущен звонок в Signal</string>
+  <string name="NotificationBarManager__establishing_signal_call">Устанавливаем звонок Signal</string>
+  <string name="NotificationBarManager__incoming_signal_call">Входящий звонок Signal</string>
+  <string name="NotificationBarManager__deny_call">Завершить звонок</string>
+  <string name="NotificationBarManager__answer_call">Ответить на звонок</string>
+  <string name="NotificationBarManager__end_call">Завершить звонок</string>
+  <string name="NotificationBarManager__cancel_call">Отменить звонок</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_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_updated_group">Группа обновлена.</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_is_on_signal_say_hey">%s теперь в Signal, скажите привет!</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Парольные фразы не совпадают!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Неверная старая парольная фраза!</string>
@@ -235,12 +307,19 @@
   <string name="DeviceProvisioningActivity_continue">ПРОДОЛЖИТЬ</string>
   <string name="DeviceProvisioningActivity_title">Привязать это устройство?</string>
   <string name="DeviceProvisioningActivity_content_intro">Оно сможет:</string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+• Читать все Ваши сообщения
+• Отправлять сообщения от Вашего имени</string>
   <string name="DeviceProvisioningActivity_content_progress_title">Привязка устройства</string>
   <string name="DeviceProvisioningActivity_content_progress_content">Привязываем новое устройство...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Устройство подтверждено!</string>
   <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 используя сторонний сканер. Для Вашей защиты, пожалуйста отсканируйте код снова, используя Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Введите парольную фразу</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Иконка Signal</string>
@@ -256,6 +335,7 @@
   <string name="RatingManager_later">Позже</string>
   <!--RecipientPreferencesActivity-->
   <string name="RecipientPreferenceActivity_block_this_contact_question">Заблокировать этот контакт?</string>
+  <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_or_calls_from_this_user">Вы больше не будете получать сообщения или звонки от этого пользователя.</string>
   <string name="RecipientPreferenceActivity_block">Заблокировать</string>
   <string name="RecipientPreferenceActivity_unblock_this_contact_question">Разблокировать этот контакт?</string>
   <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Вы уверены, что хотите разблокировать этот контакт?</string>
@@ -349,11 +429,13 @@
   <string name="ThreadRecord_called_you">Звонили вам</string>
   <string name="ThreadRecord_missed_call">Пропущен звонок</string>
   <string name="ThreadRecord_media_message">Медиа-сообщение</string>
+  <string name="ThreadRecord_s_is_on_signal_say_hey">%s теперь в Signal, скажите привет!</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">У вас нет личного ключа.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">У получателя нет личного ключа.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">У получателя нет личного ключа!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Cканировать ключ собеседника</string>
+  <string name="VerifyIdentityActivity_get_your_key_scanned">Сканировать Ваш ключ</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ВНИМАНИЕ, просканированный ключ НЕ СОВПАДАЕТ! Внимательно проверьте текст отпечатка.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">НЕ подтверждено!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Ключ собеседника верен. Также необходимо, чтобы собеседник подтвердил ваш ключ.</string>
@@ -367,6 +449,7 @@
   <string name="ViewIdentityActivity_not_verified_exclamation">НЕ подтверждено!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Просканированный ключ совпадает.</string>
   <string name="ViewIdentityActivity_verified_exclamation">Подтверждено!</string>
+  <string name="ViewIdentityActivity_your_identity_fingerprint">Ваш идентификационный отпечаток пальца</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Игнорировать предыдущий запрос?</string>
   <string name="KeyExchangeInitiator_send">Отправить</string>
@@ -413,11 +496,21 @@
   <string name="MessageNotifier_media_message">Медиа-сообщение</string>
   <string name="MessageNotifier_reply">Ответить</string>
   <!--QuickResponseService-->
-  <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Быстрые ответы недоступны, когда SIgnal заблокирован!</string>
+  <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Быстрые ответы недоступны, когда Signal заблокирован!</string>
   <string name="QuickResponseService_problem_sending_message">Проблема при отправке сообщения!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Новое сообщение</string>
   <!--attachment_type_selector-->
+  <string name="attachment_type_selector__image">Фото</string>
+  <string name="attachment_type_selector__audio">Аудио</string>
+  <string name="attachment_type_selector__video">Видео</string>
+  <string name="attachment_type_selector__contact">Контакт</string>
+  <string name="attachment_type_selector__camera">Камера</string>
   <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">Старая парольная фраза</string>
+  <string name="change_passphrase_activity__new_passphrase">Новая парольная фраза</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase"> Повторите новую парольную фразу</string>
   <!--contact_selection_activity-->
   <string name="contact_selection_activity__enter_name_or_number">Введите имя или номер</string>
   <!--contact_selection_group_activity-->
@@ -445,6 +538,7 @@
   <string name="conversation_activity__attachment_thumbnail">Миниатюра вложения</string>
   <string name="conversation_activity__quick_attachment_drawer_toggle_description">Вкл/выкл ящик вложений</string>
   <!--conversation_input_panel-->
+  <string name="conversation_input_panel__slide_to_cancel">ПРОВЕДИТЕ, ЧТОБЫ ОТМЕНИТЬ</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">MMS-сообщение загружается</string>
   <string name="conversation_item__mms_image_description">MMS-сообщение</string>
@@ -466,9 +560,12 @@
   <string name="country_selection_fragment__loading_countries">Загружаем страны...</string>
   <string name="country_selection_fragment__search">Поиск</string>
   <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Сканировать QR код, отображаемый на устройстве для того, чтобы связать</string>
   <!--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>
   <!--log_submit_activity-->
@@ -486,8 +583,13 @@
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Обновляем базу данных...</string>
   <string name="export_fragment__export_plaintext_backup">Экспорт простой резервной копии.</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Сохранить резервную копии открытого текста на SD-карту. Совместимо с приложением «SMS Backup And Restore».</string>
   <string name="import_fragment__import_system_sms_database">Импорт системной базы SMS</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Импортировать сообщения из смс-приложения, установленного сейчас по умолчанию</string>
+  <string name="import_fragment__restore_encrypted_backup">Восстановить зашифрованную резервную копию</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">Восстановить ранее экспортированную зашифрованную резервную копию Signal</string>
   <string name="import_fragment__import_plaintext_backup">Импорт простой резервной копии</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">Восстановить из незашиврований резервной копии. Совместимо с приложением «SMS Backup And Restore».</string>
   <!--load_more_header-->
   <string name="load_more_header__see_full_conversation">Посмотреть весь разговор</string>
   <!--media_overview_activity-->
@@ -503,7 +605,14 @@
   <string name="MmsPreferencesFragment__invalid_uri">Введён неверный адрес</string>
   <string name="MmsPreferencesFragment__invalid_host">Введён неверный адрес хоста</string>
   <!--GroupUtil-->
+  <plurals name="GroupUtil_joined_the_group">
+    <item quantity="one">%1$s присоединился к группе.</item>
+    <item quantity="few">%1$s присоединился к группе.</item>
+    <item quantity="many">%1$s присоединились к группе.</item>
+    <item quantity="other">%1$s присоединился к группе.</item>
+  </plurals>
   <string name="GroupUtil_group_updated">Группа обновлена.</string>
+  <string name="GroupUtil_group_name_is_now">Имя группы теперь \'%1$s\'.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Открыть</string>
   <!--prompt_mms_activity-->
@@ -514,6 +623,7 @@
   <!--recipient_preferences-->
   <string name="recipient_preferences__mute_conversation">Выключить звуки разговора</string>
   <string name="recipient_preferences__disable_notifications_for_this_conversation">Отключить уведомления для этого разговора</string>
+  <string name="recipient_preferences__notification_sound">Звук уведомления</string>
   <string name="recipient_preferences__vibrate">Вибрация</string>
   <string name="recipient_preferences__block">Заблокировать</string>
   <string name="recipient_preferences__color">Цвет</string>
@@ -556,14 +666,16 @@ Signal не работает с номерами Google Voice.</string>
   <string name="registration_progress_activity__call_me">Позвонить мне</string>
   <string name="registration_progress_activity__edit_number">Изменить номер</string>
   <string name="registration_progress_activity__connectivity_error">Ошибка связи.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal не смог соединиться с push-службой.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal не смог соединиться с сервером.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Возможные 
 причины:
 </string>
   <string name="registration_progress_activity__no_network_connectivity">Нет соединения 
 с интернетом.
 </string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Вашему
+устройству необходимо подключение к сети для использования этой функции Signal. Убедитесь,
+что устройство подключено к мобильной сети или Wi-Fi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Ограничения брандмауэра.
 </string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
@@ -609,23 +721,29 @@ SMS-подтверждения...
   <string name="AndroidManifest__change_passphrase">Изменить парольную фразу</string>
   <string name="AndroidManifest__verify_identity">Подтвердить личность</string>
   <string name="AndroidManifest__log_submit">Отправить лог отладки</string>
-  <string name="AndroidManifest__media_preview">Предпросмотр</string>
+  <string name="AndroidManifest__media_preview">Предпросмотр медиа</string>
   <string name="AndroidManifest__media_overview">Все изображения</string>
   <string name="AndroidManifest__media_overview_named">Все изображения с %1$s</string>
+  <string name="AndroidManifest__message_details">Детали сообщений</string>
   <string name="AndroidManifest_manage_linked_devices">Управление привязанными устройствами</string>
+  <string name="AndroidManifest__invite_friends">Пригласить друзей в Signal</string>
+  <string name="AndroidManifest_conversations_archive">Архив разговоров</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Импорт / экспорт</string>
+  <string name="arrays__your_identity_key">Ваш идентификационный ключ</string>
   <string name="arrays__use_default">Использовать настройку по умолчанию</string>
   <string name="arrays__use_custom">Использовать пользовательскую настройку</string>
   <string name="arrays__mute_for_one_hour">Выкл. звук на 1 час</string>
   <string name="arrays__mute_for_two_hours">Выкл. звук на 2 часа</string>
   <string name="arrays__mute_for_one_day">Выкл. звук на 1 день</string>
   <string name="arrays__mute_for_seven_days">Выкл. звук на 7 дней</string>
+  <string name="arrays__mute_for_one_year">Выкл. звук на 1 год</string>
   <string name="arrays__settings_default">Настройки по умолчанию</string>
   <string name="arrays__enabled">Включено</string>
   <string name="arrays__disabled">Отключено</string>
   <string name="arrays__name_and_message">Имя и сообщение</string>
   <string name="arrays__name_only">Только имя</string>
+  <string name="arrays__no_name_or_message">Нет имени или сообщения</string>
   <string name="arrays__images">Изображения</string>
   <string name="arrays__audio">Аудио</string>
   <string name="arrays__video">Видео</string>
@@ -652,6 +770,7 @@ SMS-подтверждения...
   <string name="preferences__choose_identity">Выберите личность</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Выберите себя из списка контактов.</string>
   <string name="preferences__change_passphrase">Изменить парольную фразу</string>
+  <string name="preferences__change_your_passphrase">Изменить парольную фразу</string>
   <string name="preferences__enable_passphrase">Включить парольную фразу</string>
   <string name="preferences__passphrase_summary">Парольная фраза %s</string>
   <string name="preferences__enable_lock_screen_for_messages">Требовать пароль для просмотра сообщений</string>
@@ -674,7 +793,8 @@ SMS-подтверждения...
   <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__inthread_notifications">Уведомления при разговоре</string>
+  <string name="preferences__silent">Тихий</string>
+  <string name="preferences__in_conversation_notifications">Уведомления при разговоре</string>
   <string name="preferences__play_inthread_notifications">Проигрывать звук уведомления, даже когда открыт текущий разговор</string>
   <string name="preferences__repeat_alerts">Повторять сигналы</string>
   <string name="preferences__never">Никогда</string>
@@ -712,12 +832,13 @@ SMS-подтверждения...
   <string name="preferences__mmsc_password">Пароль MMSC</string>
   <string name="preferences__sms_delivery_reports">Отчеты о доставке SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Запрашивать отчёт о доставке каждого отправленного SMS-сообщения</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Автоматически удалять старые сообщения, когда длина разговора превышает заданную</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Автоматически удалять старые сообщения, когда длина разговора превышает заданную</string>
   <string name="preferences__delete_old_messages">Удалять старые сообщения</string>
   <string name="preferences__chats">Чаты и медиа</string>
   <string name="preferences__conversation_length_limit">Ограничение длины разговора</string>
-  <string name="preferences__trim_all_threads_now">Обрезать все разговоры</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Привести длину всех разговоров в соответствие с заданной</string>
+  <string name="preferences__trim_all_conversations_now">Обрезать все разговоры сейчас</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Привести длину всех разговоров в соответствие с заданной</string>
+  <string name="preferences__devices">Устройства</string>
   <string name="preferences__light_theme">Светлая</string>
   <string name="preferences__dark_theme">Тёмная</string>
   <string name="preferences__appearance">Внешний вид</string>
@@ -726,6 +847,8 @@ SMS-подтверждения...
   <string name="preferences__default">По умолчанию</string>
   <string name="preferences__language">Язык (Language)</string>
   <string name="preferences__language_summary">Язык %s</string>
+  <string name="preferences__signal_messages_and_calls">Звонки и сообщения Signal</string>
+  <string name="preferences__free_private_messages_and_calls">Бесплатные приватные сообщения и звонки пользователям Signal</string>
   <string name="preferences__submit_debug_log">Отправить лог отладки</string>
   <string name="preferences__support_wifi_calling">Совместимость с Wi-Fi звонками</string>
   <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Включите, если ваше устройство отправляет и принимает SMS и MMS через Wi-Fi (и если Wi-Fi звонки включены)</string>
@@ -754,6 +877,7 @@ SMS-подтверждения...
   <!--conversation_callable_insecure-->
   <string name="conversation_callable_insecure__menu_call">Звонок</string>
   <!--conversation_callable_secure-->
+  <string name="conversation_callable_secure__menu_call">Звонок через Signal</string>
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Подробности</string>
   <string name="conversation_context__menu_copy_text">Копировать текст</string>
@@ -769,11 +893,14 @@ SMS-подтверждения...
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Удалить выбранное</string>
   <string name="conversation_list_batch__menu_select_all">Выбрать все</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Добавить выбранное в архив</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Выбрано разархивировать</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Поиск</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Фотография контакта</string>
   <string name="conversation_list_item_view__error_alert">Предупреждение об ошибке</string>
+  <string name="conversation_list_item_view__archived">Добавлено в архив</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Новый разговор</string>
   <!--conversation_secure_verified-->
@@ -788,6 +915,7 @@ SMS-подтверждения...
   <string name="conversation__menu_add_attachment">Добавить вложение</string>
   <string name="conversation__menu_update_group">Обновить группу</string>
   <string name="conversation__menu_leave_group">Покинуть группу</string>
+  <string name="conversation__menu_delete_thread">Удалить разговор</string>
   <string name="conversation__menu_view_media">Все изображения</string>
   <string name="conversation__menu_conversation_settings">Настройки разговора</string>
   <!--conversation_popup-->
@@ -809,19 +937,27 @@ SMS-подтверждения...
   <string name="text_secure_normal__menu_settings">Настройки</string>
   <string name="text_secure_normal__menu_clear_passphrase">Заблокировать</string>
   <string name="text_secure_normal__mark_all_as_read">Отметить все как прочитанные</string>
+  <string name="text_secure_normal__invite_friends">Пригласить друзей в Signal</string>
+  <string name="text_secure_normal__help">Помощь</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Ваша версия Signal устарела!</string>
   <string name="reminder_header_expired_build_details">Сообщения больше не будут отправляться. Пожалуйста, обновитесь до последней версии.</string>
+  <string name="reminder_header_expired_build_button">ОБНОВЛЕНИЕ</string>
   <string name="reminder_header_sms_default_title">SMS-приложение по умолчанию</string>
   <string name="reminder_header_sms_default_text">Нажмите, чтобы использовать Signal для всех SMS.</string>
   <string name="reminder_header_sms_default_button">ОК</string>
   <string name="reminder_header_sms_import_title">Импорт SMS из системы</string>
   <string name="reminder_header_sms_import_text">Нажмите, чтобы скопировать SMS с вашего устройства в зашифрованную базу данных.</string>
   <string name="reminder_header_sms_import_button">ИМПОРТИРОВАТЬ</string>
+  <string name="reminder_header_push_title">Включить звонки и сообщения Signal</string>
+  <string name="reminder_header_push_text">Улучшите свой опыт общения.</string>
   <string name="reminder_header_push_button">ВКЛЮЧИТЬ</string>
   <string name="reminder_header_invite_title">Пригласить в Signal</string>
   <string name="reminder_header_invite_text">Начните общаться с %1$s на новом уровне.</string>
   <string name="reminder_header_invite_button">ПРИГЛАСИТЬ</string>
+  <string name="reminder_header_share_title">Пригласите Ваших друзей в Signal!</string>
+  <string name="reminder_header_share_text">Чем больше друзей пользуется Signal, тем лучше оно становится.</string>
+  <string name="reminder_header_share_button">ПОДЕЛИТЬСЯ</string>
   <string name="reminder_header_close_button">ЗАКРЫТЬ</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Вы</string>
@@ -830,8 +966,9 @@ SMS-подтверждения...
   <!--media_preview-->
   <string name="media_preview__save_title">Сохранить</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Предпросмотр</string>
+  <string name="media_preview_activity__image_content_description">Предпросмотр изображения</string>
   <!--new_conversation_activity-->
+  <string name="new_conversation_activity__refresh">Обновить</string>
   <!--redphone_audio_popup_menu-->
   <string name="redphone_audio_popup_menu__handset">Динамик</string>
   <string name="redphone_audio_popup_menu__headset">Гарнитура</string>

res/values-sk/strings.xml

@@ -10,7 +10,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Ešte ste si nenastavili heslo!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s správ na rozhovor</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Zmazať všetky staré správy?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste naozaj si istí, že chcete skrátiť všetky rozhovory na %s najnovších správ?</string>
   <string name="ApplicationPreferencesActivity_delete">Zmazať</string>
   <string name="ApplicationPreferencesActivity_disable">Vypnúť</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Chyba pripojenia na server!</string>
@@ -113,9 +112,9 @@ identitu tohto kontaktu.
   <string name="ConversationListActivity_search">Hľadaj...</string>
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_deleting">Vymazanie</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Mažú sa vybrané konverzácie...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Správa vzájomnej výmeny kľúčov...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Používa sa upravené: %s</string>
   <string name="CustomDefaultPreference_using_default">Používa sa predvolené: %s</string>
@@ -336,6 +335,7 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
   <string name="MessageNotifier_media_message">Multimediálna správa</string>
   <!--QuickResponseService-->
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_message">Nová správa</string>
   <!--attachment_type_selector-->
   <!--change_passphrase_activity-->
   <!--contact_selection_activity-->
@@ -489,7 +489,6 @@ zlyhalo.
   <string name="AndroidManifest__change_passphrase">Zmeň heslo</string>
   <string name="AndroidManifest__verify_identity">Over totožnosť</string>
   <string name="AndroidManifest__log_submit">Odošli ladiaci log</string>
-  <string name="AndroidManifest__media_preview">Náhľad</string>
   <string name="AndroidManifest__media_overview">Všetky obrázky</string>
   <string name="AndroidManifest__media_overview_named">Všetky obrázky s %1$s</string>
   <!--arrays.xml-->
@@ -536,7 +535,6 @@ zlyhalo.
   <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__inthread_notifications">Notifikácie počas konverzácie</string>
   <string name="preferences__repeat_alerts">Opakovať hlášky</string>
   <string name="preferences__never">Nikdy</string>
   <string name="preferences__one_time">Raz</string>
@@ -572,11 +570,8 @@ zlyhalo.
   <string name="preferences__mmsc_password">MMSC heslo</string>
   <string name="preferences__sms_delivery_reports">Správy o doručení SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Pre každú odoslanú SMS vyžiadať správu o doručení</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automaticky zmazať najstaršie správy ak dĺžka vlákna presiahne nastavenú hranicu</string>
   <string name="preferences__delete_old_messages">Vymazať staré správy</string>
   <string name="preferences__conversation_length_limit">Obmedzenie dĺžky konverzácie</string>
-  <string name="preferences__trim_all_threads_now">Skráť všetky vlákna</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skontroluj počet správ vo všetkých konverzáciách</string>
   <string name="preferences__light_theme">Svetlá</string>
   <string name="preferences__dark_theme">Tmavá</string>
   <string name="preferences__appearance">Vzhľad</string>
@@ -671,7 +666,6 @@ zlyhalo.
   <!--media_preview-->
   <string name="media_preview__save_title">Uložiť</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Náhľad obrázku</string>
   <!--new_conversation_activity-->
   <!--redphone_audio_popup_menu-->
   <string name="redphone_audio_popup_menu__handset">Slúchadlo</string>

res/values-sl/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Niste še nastavili gesla!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">Število sporočil na pogovor: %s</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Izbrišem stara sporočila?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Ste prepričani, da želite izbrisati vse stare pogovore, razen najnovejših?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">To bo nemudoma obrezalo vse pogovore na %s nedavnih.</string>
   <string name="ApplicationPreferencesActivity_delete">Izbriši</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Izklopim geslo?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -160,9 +160,16 @@ preveriti ta stik.</string>
     <item quantity="other">To bo nepovratno izbrisalo vseh %1$d izbranih pogovorov.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Brisanje</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Brišem izbrane pogovore...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Brišem izbrane pogovore...</string>
+  <string name="ConversationListFragment_archived_conversations">Arhivirani pogovori</string>
+  <string name="ConversationListFragment_undo">RAZVELJAVI</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Premaknjeno v nabiralnik</string>
+  <string name="ConversationListFragment_archived_conversation">Pogovor je bil arhiviran</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Premaknjeno v nabiralnik</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Sporočilo za izmenjavo ključev...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Arhivirani pogovori (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Uporabljam izbirno: %s</string>
   <string name="CustomDefaultPreference_using_default">Prednastavljeno: %s</string>
@@ -182,6 +189,7 @@ preveriti ta stik.</string>
   <string name="DeviceListItem_unnamed_device">Nepoimenovana naprava</string>
   <string name="DeviceListItem_linked_s">Povezan z %s</string>
   <string name="DeviceListItem_last_active_s">Zadnja aktivna %s</string>
+  <string name="DeviceListItem_today">Danes</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Deli z</string>
   <!--ExperienceUpgradeActivity-->
@@ -202,14 +210,14 @@ preveriti ta stik.</string>
   <string name="ExportFragment_success">Uspešno opravljeno!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Trajna okvara pri komunikaciji aplikacije Signal!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Registracija aplikacije Signal z Google Play Services ni bila uspešna. Podatkovna komunikacija je izklopljena, prosimo poskusite s ponovno registracijo v meniju nastavive.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Registracija z Google Play Services ni bila uspešna. Podatkovna komunikacija je izklopljena, prosimo poskusite s ponovno registracijo v meniju Nastavive &gt; Napredno.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Nova skupina</string>
   <string name="GroupCreateActivity_actionbar_update_title">Posodobi skupino</string>
   <string name="GroupCreateActivity_group_name_hint">Ime skupine</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Nova skupina MMS</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Izbrali ste stik, ki ne podpira skupin Signal, zato bo to skupina MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Ker niste prijavljeni za uporabo podatkovne komunikacije, bodo skupine Signal onemogočene.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Ker niste prijavljeni za uporabo podatkovne komunikacije, so skupine Signal onemogočene. Poskusite se registrirati v meniju: Nastavitve &gt; Napredno.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Prišlo je do nepričakovane napake, zato skupina ni bila ustvarjena.</string>
   <string name="GroupCreateActivity_contacts_no_members">V skupini mora biti vsaj ena oseba!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">En izmed članov skupine ima nepravilno zapisano številko. Popravite napako ali odstranite stik iz skupine in poskusite znova.</string>
@@ -310,10 +318,10 @@ Uvoz iz šifrirane varnostne kopije bo popolnoma nadomestil obstoječe ključe,
   <string name="DeviceProvisioningActivity_cancel">PREKINI</string>
   <string name="DeviceProvisioningActivity_continue">NADALJUJ</string>
   <string name="DeviceProvisioningActivity_title">Povežem napravo?</string>
-  <string name="DeviceProvisioningActivity_content_intro">Lahko bo</string>
+  <string name="DeviceProvisioningActivity_content_intro">Lahko bo:</string>
   <string name="DeviceProvisioningActivity_content_bullets">
-• Branje vseh vaših sporočil
-\n• Pošiljanje sporočil v vašem imenu</string>
+• Brala vsa vaša sporočila
+\n• Pošiljala sporočila v vašem imenu</string>
   <string name="DeviceProvisioningActivity_content_progress_title">Povezujem napravo</string>
   <string name="DeviceProvisioningActivity_content_progress_content">Povezujem novo napravo...</string>
   <string name="DeviceProvisioningActivity_content_progress_success">Naprava je potrjena!</string>
@@ -322,6 +330,8 @@ Uvoz iz šifrirane varnostne kopije bo popolnoma nadomestil obstoječe ključe,
   <string name="DeviceProvisioningActivity_content_progress_key_error">Neveljavna koda QR.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Imate preveč povezanih naprav, poskusite kakšno odstraniti...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Koda QR za povezavo naprav ni veljavna.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Povežem z napravo Signal?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Izgleda, da želite za povzavo z napravo Signal uporabiti zunanji optični čitalnik. Prosimo, da storite to znotraj aplikacije Signal, saj je tako najvarneje.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Vnesite geslo</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Ikona Signal</string>
@@ -499,7 +509,7 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="QuickResponseService_problem_sending_message">Težava pri pošiljanju sporočila</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Novo sporočilo!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Novo sporočilo</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Slika</string>
   <string name="attachment_type_selector__audio">Zvok</string>
@@ -665,8 +675,7 @@ in spodaj vnesite šetmestno kodo, ki jo boste zaslišali.</string>
   <string name="registration_progress_activity__call_me">Pokliči me</string>
   <string name="registration_progress_activity__edit_number">Uredi številko</string>
   <string name="registration_progress_activity__connectivity_error">Napaka v povezavi.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Aplikacija Signal se ni mogla povezati s potisno storitvijo.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Aplikacija Signal se ni mogla povezati s strežnikom.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Nekateri možni razlogi
 za težave:</string>
   <string name="registration_progress_activity__no_network_connectivity">Ni povezave
@@ -719,6 +728,7 @@ bila uspešna.</string>
   <string name="AndroidManifest__message_details">Podrobnosti sporočila</string>
   <string name="AndroidManifest_manage_linked_devices">Upravljanje povezanih naprav</string>
   <string name="AndroidManifest__invite_friends">Povabi prijatelje</string>
+  <string name="AndroidManifest_conversations_archive">Arhiv pogovorov</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Uvoz/izvoz</string>
   <string name="arrays__your_identity_key">Moj identifikacijski ključ</string>
@@ -785,7 +795,7 @@ bila uspešna.</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__inthread_notifications">Notranja obvestila</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>
   <string name="preferences__repeat_alerts">Ponavljanje alarma</string>
   <string name="preferences__never">Nikoli</string>
@@ -823,12 +833,12 @@ bila uspešna.</string>
   <string name="preferences__mmsc_password">Geslo MMSC</string>
   <string name="preferences__sms_delivery_reports">Potrdila o dostavi SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Zahtevaj potrdilo o dostavi za vsako poslano sporočilo SMS</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Samodejen izbris starih sporočil, ko pogovor preseže določeno dolžino</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Samodejen izbris starih sporočil, ko pogovor preseže določeno dolžino</string>
   <string name="preferences__delete_old_messages">Samodejen izbris</string>
   <string name="preferences__chats">Pogovori in multimedija</string>
   <string name="preferences__conversation_length_limit">Omejitev dolžine pogovorov</string>
-  <string name="preferences__trim_all_threads_now">Obreži vse pogovore zdaj</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Preišči vse pogovore in uveljavi omejitve njihove dolžine</string>
+  <string name="preferences__trim_all_conversations_now">Obreži vse pogovore zdaj</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Preišči vse pogovore in uveljavi omejitve njihove dolžine</string>
   <string name="preferences__devices">Naprave</string>
   <string name="preferences__light_theme">Svetla</string>
   <string name="preferences__dark_theme">Temna</string>
@@ -884,11 +894,14 @@ bila uspešna.</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Izbriši označeno</string>
   <string name="conversation_list_batch__menu_select_all">Označi vse</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Izbrani arhiv</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Premakni izbrano v nabiralnik</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Poišči</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Slika stika</string>
   <string name="conversation_list_item_view__error_alert">Alarm za napako</string>
+  <string name="conversation_list_item_view__archived">Arhivirano</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Nov pogovor</string>
   <!--conversation_secure_verified-->

res/values-sr/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Још нисте поставили лозинку!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s порука по преписци</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Обрисати старе поруке сада?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Желите ли заиста одмах да скратите све нити преписки на %s најскоријих порука?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Ово ће одмах да скрати све преписке на %s најскоријих порука.</string>
   <string name="ApplicationPreferencesActivity_delete">Обриши</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Да искључим лозинку?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -160,9 +160,16 @@
     <item quantity="other">Ово ће трајно да обрише свих %1$d изабраних преписки.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Брисање</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Бришем изабране нити...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Бришем изабране преписке...</string>
+  <string name="ConversationListFragment_archived_conversations">Архивиране преписке</string>
+  <string name="ConversationListFragment_undo">ВРАТИ</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Преписка померена у пријем</string>
+  <string name="ConversationListFragment_archived_conversation">Архивисана преписка</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Преписке померене у пријем</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Порука размене кључева...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Архивисане преписке (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Користим посебно: %s</string>
   <string name="CustomDefaultPreference_using_default">Користим подразумевано: %s</string>
@@ -182,6 +189,7 @@
   <string name="DeviceListItem_unnamed_device">Неименован уређај</string>
   <string name="DeviceListItem_linked_s">Повезан %s</string>
   <string name="DeviceListItem_last_active_s">Последња активност %s</string>
+  <string name="DeviceListItem_today">Данас</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Подели са</string>
   <!--ExperienceUpgradeActivity-->
@@ -202,14 +210,14 @@
   <string name="ExportFragment_success">Успех!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Трајни неуспех комуникације Сигнала!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Сигнал није успео да се пријави на Гуглов Плеј сервис. Комуникација преко канала података је онемогућена, покушајте поново да се пријавите у поставкама Сигнала.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Сигнал није успео да се пријави на Гуглов Плеј сервис. Комуникација преко канала података је онемогућена, покушајте поново да се пријавите преко Поставке &gt; Напредно.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Нова група</string>
   <string name="GroupCreateActivity_actionbar_update_title">Ажурирај групу</string>
   <string name="GroupCreateActivity_group_name_hint">Назив групе</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Нова ММС група</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Изабрали сте контакт који не подржава Сигналове групе, па ће ово бити ММС група.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Нисте се пријавили за коришћење мрежног канала, па су Сигналове групе онемогућене.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Нисте се пријавили за Сигналове поруке и позиве, па су Сигналове групе онемогућене. Покушајте поново да се пријавите преко Поставке &gt; Напредно.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Десила се неочекивана грешка која је узроковала неуспех прављења групе.</string>
   <string name="GroupCreateActivity_contacts_no_members">Требате бар једну особу у вашој групи!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Један од чланова ваше групе има број који не може бити исправно очитан. Поправите или уклоните тај контакт и покушајте поново.</string>
@@ -327,6 +335,8 @@
   <string name="DeviceProvisioningActivity_content_progress_key_error">Неисправан бар-кôд.</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">Нажалост, ово није исправан бар-кôд везе уређаја.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Повезати Сигнал уређај?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Изгледа да покушавате повезати Сигнал уређај користећи спољашњи читач бар-кôда. Због сопствене заштите, очитајте кôд поново помоћу Сигнала.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Унесите лозинку</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Икона Сигнала</string>
@@ -510,7 +520,7 @@
   <string name="QuickResponseService_problem_sending_message">Проблем са слањем поруке!</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Сигнал</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Нова порука!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Нова порука</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Слика</string>
   <string name="attachment_type_selector__audio">Звук</string>
@@ -680,8 +690,7 @@
   <string name="registration_progress_activity__call_me">Позови ме</string>
   <string name="registration_progress_activity__edit_number">Уреди број</string>
   <string name="registration_progress_activity__connectivity_error">Грешка везе.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Сигнал није могао да се повеже са „push“ сервисом.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Сигнал није могао да се повеже са сервером.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Неки од могућих
 проблема су:</string>
   <string name="registration_progress_activity__no_network_connectivity">Нема везе
@@ -728,12 +737,13 @@
   <string name="AndroidManifest__change_passphrase">Измена лозинке</string>
   <string name="AndroidManifest__verify_identity">Овера идентитета</string>
   <string name="AndroidManifest__log_submit">Слање дневника исправљања грешака</string>
-  <string name="AndroidManifest__media_preview">Приказ медијума</string>
+  <string name="AndroidManifest__media_preview">Преглед медијума</string>
   <string name="AndroidManifest__media_overview">Све слике</string>
   <string name="AndroidManifest__media_overview_named">Све слика са %1$s</string>
   <string name="AndroidManifest__message_details">Детаљи поруке</string>
   <string name="AndroidManifest_manage_linked_devices">Управљај повезаним уређајима</string>
   <string name="AndroidManifest__invite_friends">Позивница пријатељима</string>
+  <string name="AndroidManifest_conversations_archive">Архива преписки</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Увоз/извоз</string>
   <string name="arrays__your_identity_key">Ваш кључ идентитета</string>
@@ -799,7 +809,7 @@
   <string name="preferences__sound">Звук</string>
   <string name="preferences__change_notification_sound">Промени звук обавештења</string>
   <string name="preferences__silent">Без звука</string>
-  <string name="preferences__inthread_notifications">Обавештења унутар нити</string>
+  <string name="preferences__in_conversation_notifications">Обавештења унутар преписки</string>
   <string name="preferences__play_inthread_notifications">Звук обавештења на приказу активне преписке</string>
   <string name="preferences__repeat_alerts">Понављај обавештења</string>
   <string name="preferences__never">Никад</string>
@@ -837,12 +847,12 @@
   <string name="preferences__mmsc_password">ММСЦ лозинка</string>
   <string name="preferences__sms_delivery_reports">Извештаји о испоруци СМС-а</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Захтевај извештај о испоруци за сваку послату СМС поруку</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Аутоматско брисање старих порука када нит преписке пређе наведену дужину</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Аутоматско брисање старих порука када преписка пређе наведену дужину</string>
   <string name="preferences__delete_old_messages">Бриши старе поруке</string>
   <string name="preferences__chats">Ћаскања и медији</string>
   <string name="preferences__conversation_length_limit">Ограничење дужине преписке</string>
-  <string name="preferences__trim_all_threads_now">Скрати све нити сада</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Претражи све нити преписки и наметни ограничења дужине</string>
+  <string name="preferences__trim_all_conversations_now">Скрати све преписке сада</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Претражи све преписке и наметни ограничења дужине</string>
   <string name="preferences__devices">Уређаји</string>
   <string name="preferences__light_theme">Светла</string>
   <string name="preferences__dark_theme">Тамна</string>
@@ -898,11 +908,14 @@
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Обриши изабрано</string>
   <string name="conversation_list_batch__menu_select_all">Изабери све</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Архивирај изабрано</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Деархивирај изабрано</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Тражи</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Фотографија контакта</string>
   <string name="conversation_list_item_view__error_alert">Грешка</string>
+  <string name="conversation_list_item_view__archived">Архивисано</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Нова преписка</string>
   <!--conversation_secure_verified-->
@@ -968,7 +981,7 @@
   <!--media_preview-->
   <string name="media_preview__save_title">Сачувај</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Приказ слике</string>
+  <string name="media_preview_activity__image_content_description">Преглед слике</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Освежи</string>
   <!--redphone_audio_popup_menu-->

res/values-sv/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Du har inte angivit ett lösenord än!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s meddelanden per konversation</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Radera alla gamla meddelanden nu?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Är du säker på att du omedelbart vill trimma alla konversationstrådar till de %s senaste meddelandena?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Detta kommer att omedelbart trimma alla konversationer till de %s senaste meddelandena.</string>
   <string name="ApplicationPreferencesActivity_delete">Radera</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Ta bort lösenordsfras?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -19,7 +19,7 @@ Stäng av låsskärm för meddelanden?</string>
   <string name="ApplicationPreferencesActivity_unregistering">Avregistrering</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Avregistrerar från Signal-meddelanden och samtal...</string>
   <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Inaktivera Signal-meddelanden och samtal?</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Avaktivera Signalmeddelanden och samtal genom att avregistrera dig från servern. Du kommer behöva återregistrera ditt telefonnummer för att använda dem igen senare.</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Avaktivera Signal-meddelanden och samtal genom att avregistrera dig från servern. Du kommer behöva återregistrera ditt telefonnummer för att använda dem igen senare.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Fel vid anslutning till server!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS aktiverat</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Tryck för att ändra din standardapp för SMS</string>
@@ -153,9 +153,16 @@ verifiera denna kontakt.</string>
     <item quantity="other">Detta kommer permanent radera alla %1$d valda konversationer.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Raderar</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Raderar markerade trådar...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Raderar markerade konversationer...</string>
+  <string name="ConversationListFragment_archived_conversations">Arkiverade konversationer</string>
+  <string name="ConversationListFragment_undo">ÅNGRA</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Flyttade konversationen till inkorgen</string>
+  <string name="ConversationListFragment_archived_conversation">Arkiverad konversation</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Flyttade konversationerna till inkorgen</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Meddelande för nyckelutbyte ...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Arkiverade konversationer (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Använder anpassade: %s</string>
   <string name="CustomDefaultPreference_using_default">Använder standard: %s</string>
@@ -175,6 +182,7 @@ verifiera denna kontakt.</string>
   <string name="DeviceListItem_unnamed_device">Namnlös enhet</string>
   <string name="DeviceListItem_linked_s">Länkade %s</string>
   <string name="DeviceListItem_last_active_s">Senast aktiv %s</string>
+  <string name="DeviceListItem_today">Idag</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Dela med</string>
   <!--ExperienceUpgradeActivity-->
@@ -195,14 +203,14 @@ verifiera denna kontakt.</string>
   <string name="ExportFragment_success">Lyckades!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent kommunikationsfel med Signal!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal kunde inte registrera med Google Play Services. Kommunikation över datakanalen har inaktiverats, vänligen försök att omregistrera från Signals inställningsmeny.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal kunde inte registrera med Google Play-tjänster. Meddelanden och samtal med Signal har avaktiverats, vänligen försök återregistrera i inställningar &gt; Avancerade.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Ny grupp</string>
   <string name="GroupCreateActivity_actionbar_update_title">Uppdatera grupp</string>
   <string name="GroupCreateActivity_group_name_hint">Gruppnamn</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Ny MMS-grupp</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Du har valt en kontakt som inte har stöd för Signalgrupper, så denna grupp kommer använda MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Du är inte registrerad för mobildatakanalen, vilket stänger av användandet av Signalgrupper.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Du är inte registrerad för samtal och meddelanden med Signal, så Signalgrupper är inaktiverat. Försök registrera i Inställningar &gt; Avancerade.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Ett oförutsett fel inträffade som gjort att gruppen inte kunde skapas.</string>
   <string name="GroupCreateActivity_contacts_no_members">Du behöver åtminstone en person i din grupp!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">En av deltagarna i din grupp har ett nummer som inte kan läsas ordentligt. Vänligen åtgärda eller ta bort kontakten och försök igen.</string>
@@ -315,6 +323,8 @@ som inte finns i säkerhetskopian.</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Ogiltig QR-kod.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Tyvärr har du redan för många länkade enheter, försök ta bort några...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Tyvärr, det här är ingen giltig QR-kod för enhetslänkning.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Länka en Signal-enhet?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Det verkar som att du försöker länka en Signal-enhet med hjälp av en tredjepartsskanner. För din säkerhet, vänligen skanna koden igen från Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Ange lösenord</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signalikon</string>
@@ -491,6 +501,8 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <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>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Nytt meddelande</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Bild</string>
   <string name="attachment_type_selector__audio">Ljud</string>
@@ -655,10 +667,12 @@ Signal kan också ringa upp dig för att verifiera ditt telefonnummer. Tryck \'R
   <string name="registration_progress_activity__call_me">Ring mig</string>
   <string name="registration_progress_activity__edit_number">Ändra nummer</string>
   <string name="registration_progress_activity__connectivity_error">Anslutningsfel.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal kunde inte ansluta till push-tjänsten.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal kunde inte ansluta till servern.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Några möjliga orsaker:</string>
   <string name="registration_progress_activity__no_network_connectivity">Ingen nätverksanslutning.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Din
+enhet behöver en nätverksuppkoppling för att använda denna funktion i Signal. Vänligen kolla
+så att du är uppkopplad med mobildata eller Wi-Fi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Restriktiv brandvägg.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Om du är uppkopplad med Wi-Fi är det möjligt att en brandvägg blockerat tillgång
@@ -699,11 +713,13 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="AndroidManifest__change_passphrase">Ändra lösenord</string>
   <string name="AndroidManifest__verify_identity">Verifiera identiteten</string>
   <string name="AndroidManifest__log_submit">Skicka in loggarna</string>
-  <string name="AndroidManifest__media_preview">Förhandsvisning av media</string>
+  <string name="AndroidManifest__media_preview">Mediaförhandsgranskning</string>
   <string name="AndroidManifest__media_overview">Alla bilder</string>
   <string name="AndroidManifest__media_overview_named">Alla bilder med %1$s</string>
+  <string name="AndroidManifest__message_details">Meddelandedetaljer</string>
   <string name="AndroidManifest_manage_linked_devices">Hantera länkade enheter</string>
   <string name="AndroidManifest__invite_friends">Bjud in vänner</string>
+  <string name="AndroidManifest_conversations_archive">Konversationsarkiv</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importera / exportera</string>
   <string name="arrays__your_identity_key">Din identitetsnyckel</string>
@@ -747,14 +763,14 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__change_your_passphrase">Ändra ditt lösenord</string>
   <string name="preferences__enable_passphrase">Aktivera lösenordsfras</string>
   <string name="preferences__passphrase_summary">Lösenordsfras %s</string>
-  <string name="preferences__enable_lock_screen_for_messages">Sätt på låsskärm för meddelanden</string>
+  <string name="preferences__enable_lock_screen_for_messages">Börja använd låsskärm för meddelanden</string>
   <string name="preferences__screen_security">Skärmsäkerhet</string>
   <string name="preferences__screen_security_summary">Skärmsäkerhet %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">Blockera skärmdumpar i Senaste-listen samt inuti appen</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Glöm lösenord från minnet efter ett intervall</string>
-  <string name="preferences__timeout_passphrase">Timeout lösenord</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Välj lösenordstimeout</string>
-  <string name="preferences__pref_timeout_interval_title">Timeout intervall</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Glöm lösenord från minnet efter en tid</string>
+  <string name="preferences__timeout_passphrase">Tidsbegränsad upplåsning</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Välj tidsgräns för lösenord</string>
+  <string name="preferences__pref_timeout_interval_title">Fråga om lösenord efter</string>
   <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Väntetiden innan lösenordet glöms från minnet</string>
   <string name="preferences__notifications">Aviseringar</string>
   <string name="preferences__enable_message_notifications">Slå på meddelandeaviseringar</string>
@@ -768,7 +784,7 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</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__inthread_notifications">Aviseringar i tråden</string>
+  <string name="preferences__in_conversation_notifications">Inom-konversation notifikationer</string>
   <string name="preferences__play_inthread_notifications">Spela aviseringsljud när du tittar på en aktiv konversation</string>
   <string name="preferences__repeat_alerts">Upprepa aviseringar</string>
   <string name="preferences__never">Aldrig</string>
@@ -806,12 +822,12 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__mmsc_password">MMSC Lösenord</string>
   <string name="preferences__sms_delivery_reports">SMS-leveransrapporter</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Begär en leveransrapport för varje SMS-meddelande du skickar</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Radera automatiskt gamla meddelanden när en konversationstråd överstiger en specificerad längd</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Radera automatiskt gamla meddelanden när en konversation överstiger en specificerad längd</string>
   <string name="preferences__delete_old_messages">Radera gamla meddelanden</string>
   <string name="preferences__chats">Konversationer och media</string>
   <string name="preferences__conversation_length_limit">Gräns för konversationslängd</string>
-  <string name="preferences__trim_all_threads_now">Trimma alla trådar nu</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Skanna igenom alla konversationstrådar och framtvinga konversationstrådslängder.</string>
+  <string name="preferences__trim_all_conversations_now">Trimma alla konversationer nu</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Sök genom alla konversationer och påtvinga längdbegränsningar på konversationer</string>
   <string name="preferences__devices">Enheter</string>
   <string name="preferences__light_theme">Ljust</string>
   <string name="preferences__dark_theme">Mörkt</string>
@@ -867,11 +883,14 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Radera markerade</string>
   <string name="conversation_list_batch__menu_select_all">Markera alla</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Arkiv valt</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Avarkivera markerade</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Sök</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Kontaktfoto</string>
   <string name="conversation_list_item_view__error_alert">Felmeddelande</string>
+  <string name="conversation_list_item_view__archived">Arkiverad</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Ny konversation</string>
   <!--conversation_secure_verified-->
@@ -909,6 +928,7 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="text_secure_normal__menu_clear_passphrase">Lås</string>
   <string name="text_secure_normal__mark_all_as_read">Markera alla lästa</string>
   <string name="text_secure_normal__invite_friends">Bjud in vänner</string>
+  <string name="text_secure_normal__help">Hjälp</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Din version av Signal har utgått!</string>
   <string name="reminder_header_expired_build_details">Meddelanden kommer inte längre att skickas framgångsrikt, vänligen uppdatera till den senaste versionen.</string>
@@ -936,7 +956,7 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Spara</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Förhandsvisning av bild</string>
+  <string name="media_preview_activity__image_content_description">Bildförhandsgranskning</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Uppdatera</string>
   <!--redphone_audio_popup_menu-->

res/values-ta/strings.xml

@@ -9,7 +9,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet"> நீங்கள் இன்னும் ஒரு கடவுச்சொல்லை அமைக்கவில்லை!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">ஓர் உரையாடலில் %s செய்திகள்</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">அனைத்து பழைய செய்திகளையும் நீக்கலாமா?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">நீங்கள் உடனடியாக  உரையாடல் நூல்களிலுள்ள மிக சமீபத்திய %s செய்திகளுக்கு முன் உள்ள செய்திகளை நீக்குவதற்கு உறுதி செய்கிறீர்களா?</string>
   <string name="ApplicationPreferencesActivity_delete">நீக்கு</string>
   <string name="ApplicationPreferencesActivity_disable">முடக்கு</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">சர்வருடன் இணைவதில் பிழை!</string>
@@ -91,9 +90,9 @@
   <!--ConversationListActivity-->
   <!--ConversationListFragment-->
   <string name="ConversationListFragment_deleting">நீக்கப்படுகிறது</string>
-  <string name="ConversationListFragment_deleting_selected_threads">தேர்ந்தெடுக்கப்பட்ட செய்திநூல்கள் நீக்கப்படுகிறது...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">சாவி பரிமாற்றச் செய்தி...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">பயன்படுத்தப்படும் விருப்பம்: %s</string>
   <string name="CustomDefaultPreference_using_default">பயன்படுத்தப்படும் இயல்புநிலை: %s</string>
@@ -299,6 +298,7 @@
   <string name="MessageNotifier_media_message">மீடியா செய்தி</string>
   <!--QuickResponseService-->
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_new_message">புதிய செய்தி</string>
   <!--attachment_type_selector-->
   <!--change_passphrase_activity-->
   <!--contact_selection_activity-->
@@ -448,7 +448,6 @@
   <string name="AndroidManifest__change_passphrase">கடவுச்சொல்லை மாற்று</string>
   <string name="AndroidManifest__verify_identity">அடையாளத்தை சரிபார்</string>
   <string name="AndroidManifest__log_submit">பிழைத்திருத்த பதிவுகளை சமர்ப்பி</string>
-  <string name="AndroidManifest__media_preview">ஊடகக் கோப்பு முன்னோட்டம்</string>
   <string name="AndroidManifest__media_overview">அனைத்து படங்கள்</string>
   <string name="AndroidManifest__media_overview_named">%1$s உடன் உள்ள அனைத்து படங்கள்</string>
   <!--arrays.xml-->
@@ -495,7 +494,6 @@
   <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__inthread_notifications">உரையாடல்நூலில் உள்ளிருக்கும் போது அறிவிப்புகள்</string>
   <string name="preferences__repeat_alerts">பலமுறை எச்சரிக்கைகள்</string>
   <string name="preferences__never">ஒருபோதுமில்லை</string>
   <string name="preferences__one_time">ஒரு முறை</string>
@@ -530,11 +528,8 @@
   <string name="preferences__mmsc_password">MMSC Password</string>
   <string name="preferences__sms_delivery_reports">SMS விநியோக அறிக்கைகள்</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">நீங்கள் அனுப்பும் அனைத்து SMS-களுக்கும் விநியோக அறிக்கைகளை வேண்டவும்</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">ஒரு உரையாடல் நூல் குறிப்பிட்ட நீளத்தைவிட அதிகமானவுடன் தானாக பழைய செய்திகளை நீக்கவும் </string>
   <string name="preferences__delete_old_messages">பழைய செய்திகளை நீக்க</string>
   <string name="preferences__conversation_length_limit">உரையாடலின் நீள அளவு</string>
-  <string name="preferences__trim_all_threads_now">அனைத்து உரையாடல்நூல்களையும் இப்போது ஒழுங்கமைக்க </string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">அனைத்து உரையாடல்நூல்களின் உள்ளே சென்று, உரையாடல் நீள வரம்பை செயலாக்கு</string>
   <string name="preferences__light_theme">வெளிச்சமிக்க</string>
   <string name="preferences__dark_theme">இருள்கொண்ட </string>
   <string name="preferences__appearance">தோற்றம்</string>
@@ -620,7 +615,6 @@
   <!--media_preview-->
   <string name="media_preview__save_title">சேமி</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">பட முன்னோட்டம்</string>
   <!--new_conversation_activity-->
   <!--redphone_audio_popup_menu-->
   <!--Trimmer-->

res/values-tr/strings.xml

@@ -10,21 +10,21 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Hala bir parola belirlememişsiniz!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">sohbet başına %s mesaj</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Tüm eski mesajlar silinsin mi?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Tüm konuşma başlıklarını hemen  %s en son konuşmaya kırpmak istediğinizden emin misiniz?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Bu tüm sohbetleri hemen  %s en son mesaja kadar kırpar.</string>
   <string name="ApplicationPreferencesActivity_delete">Sil</string>
-  <string name="ApplicationPreferencesActivity_disable_passphrase">Şifreyi devre dışı bırak?</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Parolayı etkisizleştir?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
 Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <string name="ApplicationPreferencesActivity_disable">Etkisizleştir</string>
   <string name="ApplicationPreferencesActivity_unregistering">Kayıt siliniyor</string>
   <string name="ApplicationPreferencesActivity_unregistering_from_signal_messages_and_calls">Signal mesajları ve aramalarından kaydınız siliniyor...</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Signal mesajlarını ve aramalarını devre dışı bırak?</string>
-  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Sunucudaki kaydınızı silerek Signal mesajlarını ve aramalarını devre dışı bırakın. Bu özellikleri gelecekte yeniden kullanabilmeniz için telefon numaranızı tekrar kaydetmeniz gerekir.</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls">Signal mesajlarını ve aramalarını etkisizleştir?</string>
+  <string name="ApplicationPreferencesActivity_disable_signal_messages_and_calls_by_unregistering">Sunucudaki kaydınızı silerek Signal mesajlarını ve aramalarını etkisizleştirin. Bu özellikleri gelecekte yeniden kullanabilmeniz için telefon numaranızı tekrar kaydetmeniz gerekir.</string>
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">Sunucu bağlantı hatası!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS Etkinleştirildi</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Varsayılan SMS uygulamanızı değiştirmek için dokunun</string>
   <string name="ApplicationPreferencesActivity_sms_disabled">SMS Etkisizleştirildi.</string>
-  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Signal\'ı varsayılan SMS uygulaması yapmak için dokunun</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">Signal\'i varsayılan SMS uygulaması yapmak için dokunun</string>
   <string name="ApplicationPreferencesActivity_on">açık</string>
   <string name="ApplicationPreferencesActivity_On">Açık</string>
   <string name="ApplicationPreferencesActivity_off">kapalı</string>
@@ -43,7 +43,7 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <string name="AttachmentTypeSelectorAdapter_picture">Resim</string>
   <string name="AttachmentTypeSelectorAdapter_video">Görüntü</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Ses</string>
-  <string name="AttachmentTypeSelectorAdapter_contact">Kişi bilgisi</string>
+  <string name="AttachmentTypeSelectorAdapter_contact">Kişi</string>
   <!--AudioSlidePlayer-->
   <string name="AudioSlidePlayer_error_playing_audio">Ses çalınırken hata oluştu!</string>
   <!--BlockedContactsActivity-->
@@ -66,24 +66,24 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <string name="ConversationItem_error_received_stale_key_exchange_message">Hata, bozuk anahtar takas mesajı alındı.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Anahtar takas mesajı alındı, işlemek için tıklayın.</string>
   <string name="ConversationItem_group_action_left">%1$s gruptan ayrıldı.</string>
-  <string name="ConversationItem_click_for_details">Detaylar için dokunun</string>
-  <string name="ConversationItem_click_to_approve_unencrypted">Güvensize geri düşmek için dokun</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Şifrelenmemiş SMS geri düşülmesi?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Şifrelenmemiş MMS geri düşülmesi?</string>
+  <string name="ConversationItem_click_for_details">Detaylar için tıklayın</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Güvensize geri dönmek için dokun</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Şifrelenmemiş SMS\'e geri dönülsün mü?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Şifrelenmemiş MMS\'e geri dönülsün mü?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Bu mesaj alıcının artık Signal kullanıcısı olmaması nedeni ile şifrelenmiş olarak <b>gönderilemez</b>. \n\nGüvensiz mesaj gönderilsin mi?</string>
   <string name="ConversationItem_unable_to_open_media">Bu medyayı açabilen bir uygulama bulunamadı.</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_reset_secure_session_question">Güvenli oturumu sıfırla?</string>
   <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Bu sohbette şifreleme sorunları yaşıyorsanız bu işlem yardımcı olabilir. Mesajlarınız saklanacaktır.</string>
   <string name="ConversationActivity_reset">Sıfırla</string>
-  <string name="ConversationActivity_delete_thread_question">Konuşmayı sil?</string>
-  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Bu konuşmadaki tüm mesajları kalıcı olarak silecektir.</string>
+  <string name="ConversationActivity_delete_thread_question">Sohbeti sil?</string>
+  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Bu işlem bu sohbetteki tüm mesajları kalıcı olarak silecektir.</string>
   <string name="ConversationActivity_add_attachment">Ek ekle</string>
   <string name="ConversationActivity_select_contact_info">Kişi bilgisi seç</string>
   <string name="ConversationActivity_compose_message">Mesaj Yaz</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Ekiniz gönderilirken bir hata oluştu.</string>
   <string name="ConversationActivity_the_gif_you_selected_was_too_big">Seçtiğiniz gif boyutu çok büyük!</string>
-  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Maalesef, seçilen video mesaj boyutu limitini aşıyor (%1$skB).</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Maalesef, seçilen görüntü mesaj boyutu limitini aşıyor (%1$skB).</string>
   <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Maalesef, seçilen ses mesaj boyutu limitini aşıyor (%1$skB).</string>
   <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">Alıcı geçerli bir SMS veya e-posta adresi değil!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Mesaj boş!</string>
@@ -122,7 +122,7 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
     <item quantity="other">Seçilen mesajları sil?</item>
   </plurals>
   <plurals name="ConversationFragment_this_will_permanently_delete_all_n_selected_messages">
-    <item quantity="other">Bu işlem seçtiğiniz %1$d mesajların hepsini kalıcı olarak silecek.</item>
+    <item quantity="other">Bu işlem seçtiğiniz %1$d mesajların hepsini kalıcı olarak silecektir.</item>
   </plurals>
   <string name="ConversationFragment_save_to_sd_card">Depolama alanına kaydedilsin mi?</string>
   <string name="ConversationFragment_saving_this_media_to_storage_warning">Bu medyayı depolama alanına kaydetmekle, telefondaki diğer uygulamaların erişmesine izin vereceksiniz.\n\nDevam etmek istiyor musunuz?</string>
@@ -132,7 +132,7 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <string name="ConversationFragment_saving_attachment">Ek kaydediliyor</string>
   <string name="ConversationFragment_saving_attachment_to_sd_card">Depolama alanına ek kaydediliyor...</string>
   <string name="ConversationFragment_pending">Bekleyen...</string>
-  <string name="ConversationFragment_push">Veri (Signal)</string>
+  <string name="ConversationFragment_push">Push</string>
   <string name="ConversationFragment_mms">MMS</string>
   <string name="ConversationFragment_sms">SMS</string>
   <string name="ConversationFragment_deleting">Siliniyor</string>
@@ -141,15 +141,22 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <string name="ConversationListActivity_search">Ara...</string>
   <!--ConversationListFragment-->
   <plurals name="ConversationListFragment_delete_selected_conversations">
-    <item quantity="other">Seçilen konuşmaları sil?</item>
+    <item quantity="other">Seçilmiş sohbetleri sil?</item>
   </plurals>
   <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
-    <item quantity="other">Bu işlem seçilmiş %1$d konuşmaları kalıcı olarak silecek.</item>
+    <item quantity="other">Bu işlem seçilmiş %1$d sohbetleri kalıcı olarak silecektir.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Siliniyor</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Seçilmiş başlıklar siliniyor...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Seçilmiş sohbetler siliniyor...</string>
+  <string name="ConversationListFragment_archived_conversations">Arşivlenen sohbetler</string>
+  <string name="ConversationListFragment_undo">Geri Al</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Sohbet gelen kutusuna taşındı</string>
+  <string name="ConversationListFragment_archived_conversation">Arşivlenen sohbetler</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Sohbetler gelen kutusuna taşındı</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Anahtar takas mesajı...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Arşivlenen sohbetler (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Kullanılan özelleştirilmiş: %s</string>
   <string name="CustomDefaultPreference_using_default">Kullanılan varsayılan: %s</string>
@@ -168,35 +175,36 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <!--DeviceListItem-->
   <string name="DeviceListItem_unnamed_device">İsimsiz cihaz</string>
   <string name="DeviceListItem_linked_s">%s bağlandı </string>
-  <string name="DeviceListItem_last_active_s">Son etkin %s</string>
+  <string name="DeviceListItem_last_active_s">Son görülme %s</string>
+  <string name="DeviceListItem_today">Bugün</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Paylaşılan kişi</string>
   <!--ExperienceUpgradeActivity-->
-  <string name="ExperienceUpgradeActivity_welcome_to_signal_dgaf">Signal\'a hoşgeldiniz.</string>
-  <string name="ExperienceUpgradeActivity_textsecure_is_now_called_signal">TextSecure ve RedPhone artık her durum için, tek bir özel haberleşme uygulaması: Signal</string>
-  <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Signal\'a 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_welcome_to_signal_dgaf">Signal\'e hoşgeldiniz.</string>
+  <string name="ExperienceUpgradeActivity_textsecure_is_now_called_signal">TextSecure ve RedPhone artık tek bir özel haberleşme uygulaması \"Signal\"</string>
+  <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>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Dışarı Aktar</string>
-  <string name="ExportFragment_export_plaintext_to_storage">Düz metni dışarı aktar?</string>
-  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Dikkat, bu işlem düz metindeki içeriği dışarı aktaracak.</string>
+  <string name="ExportFragment_export_plaintext_to_storage">Metni dışarı aktar?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Dikkat, bu işlem Signal mesajlarınızın içeriğini şifrelenmemiş olarak dışa aktaracaktır.</string>
   <string name="ExportFragment_cancel">İptal</string>
   <string name="ExportFragment_exporting">Dışarı aktarılıyor</string>
-  <string name="ExportFragment_exporting_plaintext_to_storage">Düz metin dışarıya aktarılıyor...</string>
+  <string name="ExportFragment_exporting_plaintext_to_storage">Metin dışa aktarılıyor...</string>
   <string name="ExportFragment_error_unable_to_write_to_storage">Hata, depolama alanına yazılamıyor.</string>
   <string name="ExportFragment_error_while_writing_to_storage">Depolama alanına yazılırken hata.</string>
   <string name="ExportFragment_success">Başarılı!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Kalıcı Signal haberleşme hatası!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal Google Play Servislerine kayıt olmadı. Veri kanallarından iletişim etkisizleştirilmiş, Signal ayarlar menüsünden yeniden kaydolmayı deneyiniz.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal Google Play Servislerine kayıt olamadı. Signal mesajları ve aramaları etkisizleştirildi, Lütfen Ayarlar &gt; Gelişmiş kısmından tekrardan kayıt olmayı deneyin.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Yeni grup</string>
   <string name="GroupCreateActivity_actionbar_update_title">Grubu güncelle</string>
   <string name="GroupCreateActivity_group_name_hint">Grup adı</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Yeni MMS grubu</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Signal gruplarını desteklemeyen bir kişiyi seçtiniz, bu nedenle bu grup MMS olacaktır.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Veri kanalını kullanarak kaydolmadığınız için Signal grupları devre dışı bırakıldı.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Signal mesajları ve aramaları için kayıtlı değilsiniz, bundan dolayı Signal grupları etkisizleştirildi. Lütfen Ayarlar &gt; Gelişmiş kısmından tekrardan kayıt olmayı deneyin.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Grup yaratılmasına engel olan beklenmedik bir hata oluştu.</string>
   <string name="GroupCreateActivity_contacts_no_members">Grubunuzda en az bir kişi olmalıdır.</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Grubunuzun üyelerinden birinin doğru okunamayan bir numarası var. Lütfen numarayı düzeltiniz veya kişiyi siliniz ve tekrar deneyiniz.</string>
@@ -214,17 +222,17 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <string name="ImportExportActivity_export">Dışarı Aktar</string>
   <!--ImportFragment-->
   <string name="ImportFragment_import_system_sms_database">Sistem SMS veritabanı içe aktarılsın mı?</string>
-  <string name="ImportFragment_this_will_import_messages_from_the_system">Bu işlem mesajları varsayılan SMS uygulamasından Signal\'e aktaracak. Daha önce bu işlemi yaptıysanız mesajların tekrarlanmasına sebep olacaktır.</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">Bu işlem varsayılan SMS uygulamasından mesajları Signal\'e aktaracak. Daha önce bu işlemi yaptıysanız mesajların tekrarlanmasına sebep olacaktır.</string>
   <string name="ImportFragment_import">İçe Aktar</string>
   <string name="ImportFragment_cancel">İptal</string>
   <string name="ImportFragment_restore_encrypted_backup">Şifrelenmiş yedek yeniden yüklensin mi?</string>
   <string name="ImportFragment_restoring_an_encrypted_backup_will_completely_replace_your_existing_keys">
-Şifreli bir yedeğini geri yüklemek tamamen mevcut anahtarların, tercihlerin ve mesajların yerini alacak. Bu işlem uygulamanın bütün verilerini silip, yedekteki verileri geri yükleyecektir.  </string>
+Şifreli bir yedeği geri yüklemek tamamen mevcut anahtarların, tercihlerin ve mesajların yerini alacak. Bu işlem uygulamanın bütün verilerini silip, yedekteki verileri geri yükleyecektir.  </string>
   <string name="ImportFragment_restore">Yeniden yükle</string>
   <string name="ImportFragment_import_plaintext_backup">Şifresiz metin yedeği içe aktarılsın mı?</string>
   <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">Bu mesajları açık metin bir yedekten TextSecure\'a aktarır. Eğer bu yedeği daha önce aktardı iseniz, yeniden aktarım çifte mesajlarla sonuçlanabilir.</string>
   <string name="ImportFragment_importing">İçe aktarılıyor</string>
-  <string name="ImportFragment_import_plaintext_backup_elipse">Düz metin yedeği içe aktarılıyor...</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">Metin yedeği içe aktarılıyor...</string>
   <string name="ImportFragment_no_plaintext_backup_found">Şifresiz metin yedeği bulunamadı!</string>
   <string name="ImportFragment_error_importing_backup">Yedek içe aktarımında hata!</string>
   <string name="ImportFragment_import_complete">İçe aktarma tamamlandı!</string>
@@ -239,14 +247,14 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <string name="InviteActivity_send_sms">SMS Gönder</string>
   <string name="InviteActivity_cancel">İptal</string>
   <string name="InviteActivity_sending">Gönderiliyor...</string>
-  <string name="InviteActivity_heart_content_description">Kalp</string>
+  <string name="InviteActivity_heart_content_description">İçerik açıklaması</string>
   <string name="InviteActivity_invitations_sent">Davetler gönderildi!</string>
   <string name="InviteActivity_invite_to_signal">Signal\'e davet et</string>
   <plurals name="InviteActivity_send_to_friends">
-    <item quantity="other">Arkadaşlara %d gönder</item>
+    <item quantity="other">Arkadaşlara gönder %d</item>
   </plurals>
   <plurals name="InviteActivity_send_sms_invites">
-    <item quantity="other">SMS %d daveti yolla?</item>
+    <item quantity="other">%d SMS daveti yolla?</item>
   </plurals>
   <string name="InviteActivity_lets_switch_to_signal">Hadi Signal\'e geçelim: %1$s</string>
   <string name="InviteActivity_no_app_to_share_to">Paylaşmak için herhangi bir uygulamanız yok gibi görünüyor.</string>
@@ -281,7 +289,7 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</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_is_on_signal_say_hey">%s Signal\'e katıldı, merhaba de!</string>
+  <string name="MessageRecord_s_is_on_signal_say_hey">%s Signal\'e katıldı, ona merhaba de!</string>
   <!--PassphraseChangeActivity-->
   <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">Parolalar uyuşmuyor!</string>
   <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Yanlış eski parola!</string>
@@ -291,7 +299,7 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <string name="DeviceProvisioningActivity_cancel">VAZGEÇ</string>
   <string name="DeviceProvisioningActivity_continue">DEVAM ET</string>
   <string name="DeviceProvisioningActivity_title">Bu cihazı bağla?</string>
-  <string name="DeviceProvisioningActivity_content_intro">mümkün olacak</string>
+  <string name="DeviceProvisioningActivity_content_intro">Mümkün olacak</string>
   <string name="DeviceProvisioningActivity_content_bullets">
 • Tüm mesajlarınızı okuyun \n•Mesajları adınızla gönderin</string>
   <string name="DeviceProvisioningActivity_content_progress_title">Cihaz bağlama</string>
@@ -302,19 +310,21 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Geçersiz QR kodu.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Maalesef, bağlı olan çok sayıda cihazınız var, bazılarını kaldırmayı deneyin...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Maalesef, bu geçerli bir aygıt bağlama QR kodu değil.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Bir Signal cihazına bağlanılsın mı?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">3. parti bir tarayıcı kullanarak bir Signal cihazına bağlanmaya çalışıyor gibi görünüyorsunuz. Kendi güvenliğinizi korumak için, Kodu lütfen Signal içinden tarayınız.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Parola girin</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signal simgesi</string>
   <string name="PassphrasePromptActivity_ok_button_content_description">Parola gönder</string>
   <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Geçersiz parola!</string>
   <!--PlayServicesProblemFragment-->
-  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">Google Play Services\'in kurulu sürümü doğru çalışmıyor. Lütfen Google Play Services\'i tekrar kurun ve yeniden deneyin.</string>
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">Google Play Services\'in kurulu sürümü doğru çalışmıyor. Lütfen Google Play Services\'i tekrar kurun, güncelleyin veya yeniden deneyin.</string>
   <!--RatingManager-->
   <string name="RatingManager_rate_this_app">Bu uygulamaya puan verin</string>
-  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Bu uygulamayı kullanmaktan hoşlanıyorsanız, lütfen bir dakikanızı ayırıp ona puan vererek bize yardımcı olun.</string>
-  <string name="RatingManager_rate_now">Şimdi puan ver!</string>
-  <string name="RatingManager_no_thanks">Hayır teşekkürler</string>
-  <string name="RatingManager_later">Daha sonra</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">Bu uygulamayı kullanmaktan hoşlanıyorsanız, lütfen bir dakikanızı ayırıp puan vererek bize yardımcı olun.</string>
+  <string name="RatingManager_rate_now">Şimdi</string>
+  <string name="RatingManager_no_thanks">Hayır</string>
+  <string name="RatingManager_later">Sonra</string>
   <!--RecipientPreferencesActivity-->
   <string name="RecipientPreferenceActivity_block_this_contact_question">Bu kişiyi engelle?</string>
   <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_or_calls_from_this_user">Artık bu kullanıcıdan mesaj ya da çağrı almayacaksınız.</string>
@@ -346,7 +356,7 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">Aradığınız numara güvenli ses sistemini desteklemiyor!</string>
   <string name="RedPhone_got_it">Anladım</string>
   <!--RegistrationActivity-->
-  <string name="RegistrationActivity_connect_with_signal">Signal\'la Bağlan</string>
+  <string name="RegistrationActivity_connect_with_signal">Signal ile Bağlan</string>
   <string name="RegistrationActivity_select_your_country">Ülkenizi seçin</string>
   <string name="RegistrationActivity_you_must_specify_your_country_code">Ülke kodunuzu
         girmelisiniz
@@ -361,7 +371,7 @@ Mesajlar için kilit ekranı devre dışı bırakılsın mı?</string>
   <string name="RegistrationActivity_unsupported">Desteklenmiyor</string>
   <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Üzgünüz, bu cihaz veri mesajlaşmasını desteklemiyor. Android sürümleri 4.0\'dan eski olan cihazların kayıtlı bir Google hesabı olması gerekir. Android sürümü 4.0 ve üstü olan cihazlar için bir Google hesabı gerekmez, fakat Play Store uygulamasının yüklü olması gerekir.</string>
   <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
-Numaranızı ikinci kez kontrol ediniz! Onu bir SMS ile doğrulamak üzereyiz.</string>
+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>
   <!--RegistrationProblemsActivity-->
@@ -405,7 +415,7 @@ Geçersiz protokol sürümünde anahtar değişim mesajı alındı.</string>
 Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntülemek için tıklayın.</string>
   <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Güncellenmiş fakat bilinmeyen bir kimlik bilgisi alındı. Kimlik doğrulaması için haififçe vurun.</string>
   <string name="SmsMessageRecord_secure_session_reset">Güvenli oturumu sıfırla.</string>
-  <string name="SmsMessageRecord_duplicate_message">Çift mesaj.</string>
+  <string name="SmsMessageRecord_duplicate_message">Çifte mesaj.</string>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Gruptan ayrıldı...</string>
   <string name="ThreadRecord_secure_session_reset">Güvenli oturumu sıfırla.</string>
@@ -414,7 +424,7 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <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_is_on_signal_say_hey">%s Signal\'de, merhaba de!</string>
+  <string name="ThreadRecord_s_is_on_signal_say_hey">%s Signal\'de, ona merhaba de!</string>
   <!--VerifyIdentityActivity-->
   <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">Kimlik anahtarınız yok.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Alıcının kimlik anahtarı yok.</string>
@@ -468,7 +478,7 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="KeyCachingService_passphrase_cached">Signal kilidi açıldı</string>
   <string name="KeyCachingService_lock">Parola ile kilitle</string>
   <!--MessageNotifier-->
-  <string name="MessageNotifier_d_new_messages_in_d_conversations">%2$d konuşmadan %1$d yeni mesaj</string>
+  <string name="MessageNotifier_d_new_messages_in_d_conversations">%2$d sohbetden %1$d yeni mesaj</string>
   <string name="MessageNotifier_most_recent_from_s">En yeni mesaj: %1$s</string>
   <string name="MessageNotifier_locked_message">Kilitli mesaj...</string>
   <string name="MessageNotifier_media_message_with_text">Medya mesajı: %s</string>
@@ -477,15 +487,15 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="MessageNotifier_failed_to_deliver_message">Mesaj iletimi başarısız oldu.</string>
   <string name="MessageNotifier_error_delivering_message">Hata mesaj iletimi</string>
   <string name="MessageNotifier_mark_all_as_read">Tümünü okundu işaretle</string>
-  <string name="MessageNotifier_mark_read">Okundu işaretle</string>
+  <string name="MessageNotifier_mark_read">Okundu</string>
   <string name="MessageNotifier_media_message">Medya mesajı</string>
   <string name="MessageNotifier_reply">Cevapla</string>
   <!--QuickResponseService-->
   <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>
+  <string name="QuickResponseService_problem_sending_message">Mesaj gönderilirken hata!</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">Yeni Mesaj!</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Yeni mesaj</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Resim</string>
   <string name="attachment_type_selector__audio">Ses</string>
@@ -495,7 +505,7 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <!--change_passphrase_activity-->
   <string name="change_passphrase_activity__old_passphrase">Eski parola</string>
   <string name="change_passphrase_activity__new_passphrase">Yeni parola</string>
-  <string name="change_passphrase_activity__repeat_new_passphrase">Tekrar yeni parola </string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">Yeni parolayı tekrarlayın</string>
   <!--contact_selection_activity-->
   <string name="contact_selection_activity__enter_name_or_number">Ad ya da numara girin</string>
   <!--contact_selection_group_activity-->
@@ -510,7 +520,7 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <!--contact_selection_recent_activity-->
   <string name="contact_selection_recent_activity__no_recent_calls">Yakın zamanda arama yok.</string>
   <!--conversation_title_view-->
-  <string name="conversation_title_view__conversation_muted">Görüşme sessize alındı</string>
+  <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>
@@ -520,7 +530,7 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="conversation_activity__window_description">%1$s ile sohbet</string>
   <string name="conversation_activity__compose_description">Mesaj yazma</string>
   <string name="conversation_activity__emoji_toggle_description">Emoji klavyesini göster/gizle</string>
-  <string name="conversation_activity__attachment_thumbnail">Ek Küçük Resmi</string>
+  <string name="conversation_activity__attachment_thumbnail">Küçük resim ekle</string>
   <string name="conversation_activity__quick_attachment_drawer_toggle_description">Geçiş eki çekmecesi</string>
   <!--conversation_input_panel-->
   <string name="conversation_input_panel__slide_to_cancel">İPTAL ETMEK İÇİN KAYDIR</string>
@@ -557,7 +567,7 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="log_submit_activity__log_fetch_failed">Cihazınızdaki loglara erişilemedi. Hata ayıklama loglarını almak için ADB kullanabilirsiniz.</string>
   <string name="log_submit_activity__thanks">Yardımınız için teşekkürler!</string>
   <string name="log_submit_activity__submitting">Gönderilme</string>
-  <string name="log_submit_activity__posting_logs">loglar gist\'e gönderiliyor...</string>
+  <string name="log_submit_activity__posting_logs">loglar gönderiliyor...</string>
   <!--database_migration_activity-->
   <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">Mevcut metin mesajlarınızı Signal\'in şifreli veritabanına almak ister misiniz?</string>
   <string name="database_migration_activity__the_default_system_database_will_not_be_modified">Varsayılan sistem veritabanı hiçbir şekilde değiştirilemez veya dönüştürülemez.</string>
@@ -568,15 +578,15 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Veritabanı güncelleniyor...</string>
   <string name="export_fragment__export_plaintext_backup">Şifrelenmemiş açık metin yedeği dışa aktar</string>
-  <string name="export_fragment__export_a_plaintext_backup_compatible_with">SMS yedeği ile uyumlu bir düz metin yedeğini dışa aktar &amp; Depolama alanına geri yükle</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">SMS yedeği ile uyumlu bir metin yedeğini dışa aktar &amp; Depolama alanına geri yükle</string>
   <string name="import_fragment__import_system_sms_database">Sistem SMS veritabanını içe aktar</string>
   <string name="import_fragment__import_the_database_from_the_default_system">Varsayılan sistem mesajlaşma uygulamasının veritabanını içe aktar</string>
   <string name="import_fragment__restore_encrypted_backup">Şifrelenmiş yedeğini geri yükleyin</string>
   <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">Daha önce dışa aktarılmış şifreli Signal yedeğini geri yükleyin</string>
   <string name="import_fragment__import_plaintext_backup">Şifrelenmemiş açık metin yedeği içe aktar</string>
-  <string name="import_fragment__import_a_plaintext_backup_file">SMS yedeği ile uyumlu bir düz metin yedeğini içe aktar &amp; Geri yükle</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">SMS yedeği ile uyumlu bir metin yedeğini içe aktar &amp; Geri yükle</string>
   <!--load_more_header-->
-  <string name="load_more_header__see_full_conversation">Tüm konuşmayı gör</string>
+  <string name="load_more_header__see_full_conversation">Tüm sohbeti gör</string>
   <!--media_overview_activity-->
   <string name="media_overview_activity__no_images">Resim yok</string>
   <!--message_recipients_list_item-->
@@ -603,8 +613,8 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">ENGELLİ</string>
   <!--recipient_preferences-->
-  <string name="recipient_preferences__mute_conversation">Konuşmayı sessize al</string>
-  <string name="recipient_preferences__disable_notifications_for_this_conversation">Bu konuşma için bildirimleri devre dışı bırak</string>
+  <string name="recipient_preferences__mute_conversation">Sohbeti sessize al</string>
+  <string name="recipient_preferences__disable_notifications_for_this_conversation">Bu sohbet için bildirimleri etkisizleştir</string>
   <string name="recipient_preferences__notification_sound">Bildirim sesi</string>
   <string name="recipient_preferences__vibrate">Titreş</string>
   <string name="recipient_preferences__block">Engelle</string>
@@ -613,7 +623,7 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="recipient_preferences__verify_identity">Kimliği doğrula</string>
   <!--- redphone_call_controls-->
   <string name="redphone_call_card__signal_call">Signal Araması</string>
-  <string name="redphone_call_controls__end_call">aramayı sonlandır</string>
+  <string name="redphone_call_controls__end_call">Aramayı sonlandır</string>
   <string name="redphone_call_controls__audio">Ses</string>
   <string name="redphone_call_controls__mute">Sessiz</string>
   <string name="redphone_call_controls__signal_call">Signal araması</string>
@@ -634,7 +644,7 @@ Signal ile bağlanmak için telefon numaranızı doğrulayın.</string>
     </string>
   <string name="registration_problems__sms_interceptors">SMS yakalayıcılar.</string>
   <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
-Bazı üçüncü taraf metin mesajlaşma uygulamaları, olumsuz davranıyor ve gelen tüm SMS mesajlarına müdahale ediyor. Eğer \'Your Signal verification code:\', ile başlayan bir metin mesajı aldıysanız görmek için üçüncü parti uygulamalarınızı kontrol edin. Bu gibi durumlarda üçüncü taraf metin mesajlaşma uygulamalarınızı diğer uygulamaların erişimine izin verecek şekilde yapılandırmanız gerekir.</string>
+Bazı üçüncü taraf metin mesajlaşma uygulamaları, olumsuz davranıyor ve gelen tüm SMS mesajlara müdahale ediyor. Eğer \'Your Signal verification code:\', ile başlayan bir metin mesajı aldıysanız görmek için üçüncü parti uygulamalarınızı kontrol edin. Bu gibi durumlarda üçüncü taraf metin mesajlaşma uygulamalarınızı diğer uygulamaların erişimine izin verecek şekilde yapılandırmanız gerekir.</string>
   <string name="registration_problems__incorrect_number">Geçersiz numara</string>
   <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
 Lütfen girdiğiniz numaranın ve alan kodlarının doğruluğunu kontrol ediniz.</string>
@@ -649,8 +659,7 @@ Signal ayrıca numaranızı doğrulamak için sizi arayabilir. \'Beni Ara\' kıs
   <string name="registration_progress_activity__call_me">Beni ara</string>
   <string name="registration_progress_activity__edit_number">Numarayı düzenle</string>
   <string name="registration_progress_activity__connectivity_error">Bağlantı hatası.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal push hizmetine bağlanamadı.</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal sunucuya bağlanamadı.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Bazı olası problemler:</string>
   <string name="registration_progress_activity__no_network_connectivity">Ağ bağlantısı
         yok.
@@ -683,10 +692,10 @@ başarısız.</string>
   <string name="verify_identity_activity__their_identity_they_read">Onların kimliği (onların okuduğu):</string>
   <string name="verify_identity_activity__your_identity_you_read">Sizin kimliğiniz (sizin okuduğunuz):</string>
   <!--message_details_header-->
-  <string name="message_details_header__issues_need_your_attention">Bazı sonular ilginizi gerektiriyor.</string>
+  <string name="message_details_header__issues_need_your_attention">Bazı sorunlar ilginizi gerektiriyor.</string>
   <string name="message_details_header__sent">Gönderildi</string>
   <string name="message_details_header__received">Alındı</string>
-  <string name="message_details_header__via">Eliyle</string>
+  <string name="message_details_header__via">Vasıtasıyla</string>
   <string name="message_details_header__to">Alıcı:</string>
   <string name="message_details_header__from">Gönderici:</string>
   <string name="message_details_header__with">İle:</string>
@@ -699,23 +708,24 @@ başarısız.</string>
   <string name="AndroidManifest__change_passphrase">Parola değiştir</string>
   <string name="AndroidManifest__verify_identity">Kimliği doğrula</string>
   <string name="AndroidManifest__log_submit">Hata ayıklama kayıtlarını gönder</string>
-  <string name="AndroidManifest__media_preview">Medya Önizleme</string>
+  <string name="AndroidManifest__media_preview">Media önizleme</string>
   <string name="AndroidManifest__media_overview">Tüm resimler</string>
   <string name="AndroidManifest__media_overview_named">%1$s ile tüm resimler</string>
   <string name="AndroidManifest__message_details">Mesaj detayları</string>
   <string name="AndroidManifest_manage_linked_devices">Bağlanmış cihazları yönetin</string>
   <string name="AndroidManifest__invite_friends">Arkadaşlarını davet et!</string>
+  <string name="AndroidManifest_conversations_archive">Sohbet arşivi</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">İçeri / Dışarı Aktar</string>
   <string name="arrays__your_identity_key">Kimlik anahtarınız</string>
   <string name="arrays__use_default">Varsayılanı kullan</string>
   <string name="arrays__use_custom">Özelleştirilmiş kullan</string>
-  <string name="arrays__mute_for_one_hour">1  saatliğine sustur</string>
+  <string name="arrays__mute_for_one_hour">1 saatliğine sustur</string>
   <string name="arrays__mute_for_two_hours">2 saatliğine sustur</string>
   <string name="arrays__mute_for_one_day">1 günlüğüne sustur</string>
   <string name="arrays__mute_for_seven_days">7 günlüğüne sustur</string>
   <string name="arrays__mute_for_one_year">1 yıllığına sustur</string>
-  <string name="arrays__settings_default">Ayarlar varsayılan</string>
+  <string name="arrays__settings_default">Varsayılan ayarlar</string>
   <string name="arrays__enabled">Etkinleştirildi</string>
   <string name="arrays__disabled">Etkisizleştirildi</string>
   <string name="arrays__name_and_message">İsim ve mesaj</string>
@@ -745,9 +755,9 @@ başarısız.</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Kişi girdinizi kişi listesinden seçin.</string>
   <string name="preferences__change_passphrase">Parola değiştir</string>
   <string name="preferences__change_your_passphrase">Parolanı değiştir</string>
-  <string name="preferences__enable_passphrase">Parola etkinleştir</string>
+  <string name="preferences__enable_passphrase">Parolayı etkinleştir</string>
   <string name="preferences__passphrase_summary">Parola %s</string>
-  <string name="preferences__enable_lock_screen_for_messages">Mesajları için kilit ekranını etkinleştir</string>
+  <string name="preferences__enable_lock_screen_for_messages">Mesajlar için kilit ekranını etkinleştir</string>
   <string name="preferences__screen_security">Ekran güvenliği</string>
   <string name="preferences__screen_security_summary">Ekran güvenliği %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">En son listelerde ve uygulama içinde ekran görüntüsü alınmasını engelle</string>
@@ -755,7 +765,7 @@ başarısız.</string>
   <string name="preferences__timeout_passphrase">Parola zaman aşımı</string>
   <string name="preferences__pref_timeout_interval_dialogtitle">Seçili anahtar parolasının süresi dolmuş</string>
   <string name="preferences__pref_timeout_interval_title">Zaman aşımı aralığı</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hafızadaki parolanın unutulması için geçmesi gereken zaman miktarı</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">Hafızadaki parolanın unutulması için geçmesi gereken süre</string>
   <string name="preferences__notifications">Bildirimler</string>
   <string name="preferences__enable_message_notifications">Mesaj bildirimlerini etkinleştir</string>
   <string name="preferences__led_color">LED rengi</string>
@@ -768,8 +778,8 @@ başarısız.</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__inthread_notifications">Başlık içi bildirimler</string>
-  <string name="preferences__play_inthread_notifications">Etkin bir konuşma görüntülerken bildirim sesi çal</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>
   <string name="preferences__repeat_alerts">Uyarıları tekrarla</string>
   <string name="preferences__never">Asla</string>
   <string name="preferences__one_time">Bir kez</string>
@@ -796,8 +806,8 @@ başarısız.</string>
   <string name="preferences__advanced">Gelişmiş</string>
   <string name="preferences__privacy">Gizlilik</string>
   <string name="preferences__mms_user_agent">MMS Kullanıcı Aracı</string>
-  <string name="preferences__advanced_mms_access_point_names">Manüel MMS ayarları</string>
-  <string name="preferences__enable_manual_mms">Manüel MMS ayarlarını kullan</string>
+  <string name="preferences__advanced_mms_access_point_names">Manuel MMS ayarları</string>
+  <string name="preferences__enable_manual_mms">Manuel MMS ayarlarını kullan</string>
   <string name="preferences__override_system_mms_settings">Sistem MMS ayarları yerine aşağıda bilgileri olanları kullan.</string>
   <string name="preferences__mmsc_url">MMSC URL</string>
   <string name="preferences__mms_proxy_host">MMS Vekil Sunucu</string>
@@ -806,12 +816,12 @@ başarısız.</string>
   <string name="preferences__mmsc_password">MMSC Şifresi</string>
   <string name="preferences__sms_delivery_reports">SMS iletim raporları</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Gönderdiğiniz her SMS için iletim raporu iste</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Bir konuşma konu başlığı belirlenmiş bir uzunluğu aşınca eski mesajları otomatik olarak sil</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Bir sohbet belirlenmiş bir uzunluğu aşınca eski mesajları otomatik olarak sil</string>
   <string name="preferences__delete_old_messages">Eski mesajları sil</string>
   <string name="preferences__chats">Sohbet ve medya</string>
   <string name="preferences__conversation_length_limit">Sohbet uzunluk sınırı</string>
-  <string name="preferences__trim_all_threads_now">Tüm başlıkları kırp</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Tüm sohbet başlıklarını gözden geçir ve sohbet uzunluk sınırını uygula</string>
+  <string name="preferences__trim_all_conversations_now">Tüm sohbetleri şimdi kırp</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Tüm sohbetleri tara ve sohbet uzunluğu limitlerini uygula</string>
   <string name="preferences__devices">Cihazlar</string>
   <string name="preferences__light_theme">Açık</string>
   <string name="preferences__dark_theme">Koyu</string>
@@ -831,10 +841,10 @@ başarısız.</string>
   <string name="preferences_chats__when_using_mobile_data">Mobil veri kullanırken</string>
   <string name="preferences_chats__when_using_wifi">Wi-Fi kullanırken</string>
   <string name="preferences_chats__when_roaming">Dolaşımdayken</string>
-  <string name="preferences_chats__media_auto_download">Otomatik medya indirmesi</string>
+  <string name="preferences_chats__media_auto_download">Otomatik medya indirme</string>
   <string name="preferences_chats__message_trimming">Mesaj kırpma</string>
-  <string name="preferences_advanced__use_system_emoji">Sistem emojileri kullan</string>
-  <string name="preferences_advanced__disable_signal_built_in_emoji_support">Signal\'in dahili emoji desteğini devre dışı bırak</string>
+  <string name="preferences_advanced__use_system_emoji">Sistem emojilerini kullan</string>
+  <string name="preferences_advanced__disable_signal_built_in_emoji_support">Signal\'in dahili emoji desteğini etkisizleştir</string>
   <!--****************************************-->
   <!--menus-->
   <!--****************************************-->
@@ -842,7 +852,7 @@ başarısız.</string>
   <string name="contact_selection_list__menu_select_all">Hepsini seç</string>
   <string name="contact_selection_list__menu_unselect_all">Tüm seçimleri kaldır</string>
   <string name="contact_selection_list__header_signal_users">SIGNAL KULLANICILARI</string>
-  <string name="contact_selection_list__header_other">TÜM KONTAKTLAR</string>
+  <string name="contact_selection_list__header_other">TÜM KİŞİLER</string>
   <string name="contact_selection_list__unknown_contact">Yeni mesajın gittiği...</string>
   <!--contact_selection-->
   <string name="contact_selection__menu_finished">Tamamlanmış</string>
@@ -867,11 +877,14 @@ başarısız.</string>
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Seçileni sil</string>
   <string name="conversation_list_batch__menu_select_all">Hepsini seç</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Seçilen arşiv</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Seçilenleri arşivden çıkar</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Ara</string>
   <!--conversation_list_item_view-->
-  <string name="conversation_list_item_view__contact_photo_image">Kişi Fotosu Resmi</string>
+  <string name="conversation_list_item_view__contact_photo_image">Kişi fotoğrafı</string>
   <string name="conversation_list_item_view__error_alert">Hata uyarısı</string>
+  <string name="conversation_list_item_view__archived">Arşivlendi</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Yeni sohbet</string>
   <!--conversation_secure_verified-->
@@ -886,7 +899,7 @@ başarısız.</string>
   <string name="conversation__menu_add_attachment">Ek ekle</string>
   <string name="conversation__menu_update_group">Grubu güncelle</string>
   <string name="conversation__menu_leave_group">Grubtan ayrıl</string>
-  <string name="conversation__menu_delete_thread">Konuşmayı sil</string>
+  <string name="conversation__menu_delete_thread">Sohbeti sil</string>
   <string name="conversation__menu_view_media">Tüm resimler</string>
   <string name="conversation__menu_conversation_settings">Sohbet ayarları</string>
   <!--conversation_popup-->
@@ -913,18 +926,18 @@ başarısız.</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Signal derlemesinin süresi doldu!</string>
   <string name="reminder_header_expired_build_details">Mesajlar artık başarılı olarak gönderilemeyecektir, lütfen en yeni sürüme güncelleyiniz. </string>
-  <string name="reminder_header_expired_build_button">GÜNCELLEME</string>
+  <string name="reminder_header_expired_build_button">GÜNCELLEŞTİR</string>
   <string name="reminder_header_sms_default_title">Varsayılan SMS uygulaması olarak ayarla</string>
-  <string name="reminder_header_sms_default_text">Signal\'ı varsayılan SMS uygulaması yapmak için dokun.</string>
+  <string name="reminder_header_sms_default_text">Signal\'i varsayılan SMS uygulaması yapmak için dokun.</string>
   <string name="reminder_header_sms_default_button">Belirle</string>
   <string name="reminder_header_sms_import_title">Sistem SMS\'lerini içe aktar</string>
-  <string name="reminder_header_sms_import_text">Telefonunuzdaki SMS mesajlarınızı, şifreli veritabanına aktarmak için hafifçe vurun.</string>
+  <string name="reminder_header_sms_import_text">Telefonunuzdaki SMS mesajlarınızı, şifrelenmiş veritabanına aktarmak için dokunun.</string>
   <string name="reminder_header_sms_import_button">İÇE AKTAR</string>
   <string name="reminder_header_push_title">Signal mesajlarını ve aramalarını etkinleştir</string>
   <string name="reminder_header_push_text">İletişim deneyiminizi yükseltin.</string>
   <string name="reminder_header_push_button">ETKİNLEŞTİR</string>
-  <string name="reminder_header_invite_title">Signal\'a davet et</string>
-  <string name="reminder_header_invite_text">%1$s ile konuşmanızı bir sonraki seviyeye alın.</string>
+  <string name="reminder_header_invite_title">Signal\'e davet et</string>
+  <string name="reminder_header_invite_text">%1$s ile sohbetinizi bir sonraki seviyeye alın.</string>
   <string name="reminder_header_invite_button">DAVET ET</string>
   <string name="reminder_header_share_title">Arkadaşlarını davet et!</string>
   <string name="reminder_header_share_text">Ne kadar çok arkadaşın Signal kullanırsa, o kadar iyi hale gelir.</string>
@@ -937,11 +950,11 @@ başarısız.</string>
   <!--media_preview-->
   <string name="media_preview__save_title">Kaydet</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Resim Önizleme</string>
+  <string name="media_preview_activity__image_content_description">Resim önizleme</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Yenile</string>
   <!--redphone_audio_popup_menu-->
-  <string name="redphone_audio_popup_menu__handset">Kulaklık</string>
+  <string name="redphone_audio_popup_menu__handset">Ahize</string>
   <string name="redphone_audio_popup_menu__headset">Kulaklık</string>
   <string name="redphone_audio_popup_menu__speaker">Hoparlör</string>
   <!--Trimmer-->
@@ -949,6 +962,6 @@ başarısız.</string>
   <string name="trimmer__deleting_old_messages">Eski mesajlar siliniyor...</string>
   <string name="trimmer__old_messages_successfully_deleted">Eski mesajlar silindi</string>
   <!--transport_selection_list_item-->
-  <string name="transport_selection_list_item__transport_icon">Taşıma simgesi</string>
+  <string name="transport_selection_list_item__transport_icon">Ulaştırma simgesi</string>
   <!--EOF-->
 </resources>

res/values-vi/strings.xml

@@ -10,7 +10,7 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Bạn chưa thiết lập cụm từ mật khẩu!</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">%s tin nhắn cho mỗi cuộc chuyện trò</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Xóa tất cả tin nhắn cũ bây giờ?</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Bạn có chắc là muốn thu ngắn tức thì các chuỗi chuyện trò xuống còn %s tin nhắn mới nhất?</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">Thao tác này sẽ thu ngắn tức thì tất cả các cuộc hội thoại đến %s tin nhắn gần nhất.</string>
   <string name="ApplicationPreferencesActivity_delete">Xóa</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Tắt cụm từ mật khẩu?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -155,9 +155,16 @@ chặn cuộc hội thoại của bạn hoặc chỉ đơn giản là %2$s đã
     <item quantity="other">Thao tác này sẽ xóa vĩnh viễn %1$d cuộc hội thoại đã chọn?</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Đang xóa</string>
-  <string name="ConversationListFragment_deleting_selected_threads">Xóa các chuỗi đã chọn...</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">Đang xoá các cuộc hội thoại đã chọn...</string>
+  <string name="ConversationListFragment_archived_conversations">Các cuộc hội thoại đã bảo lưu</string>
+  <string name="ConversationListFragment_undo">HOÀN TÁC</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Đã chuyển cuộc hội thoại vào hộp thư đến</string>
+  <string name="ConversationListFragment_archived_conversation">Cuộc hội thoại đã bảo lưu</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Đã chuyển các cuộc hội thoại vào hộp thư đến</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Thông tin trao đổi chìa khóa...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">Các cuộc hội thoại đã bảo lưu (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Dùng tùy chỉnh: %s</string>
   <string name="CustomDefaultPreference_using_default">Dùng mặc định: %s</string>
@@ -177,6 +184,7 @@ chặn cuộc hội thoại của bạn hoặc chỉ đơn giản là %2$s đã
   <string name="DeviceListItem_unnamed_device">Thiết bị chưa có tên</string>
   <string name="DeviceListItem_linked_s">Liênt kết %s</string>
   <string name="DeviceListItem_last_active_s">Lần chót hoạt động %s</string>
+  <string name="DeviceListItem_today">Hôm nay</string>
   <!--ShareActivity-->
   <string name="ShareActivity_share_with">Chia sẻ với</string>
   <!--ExperienceUpgradeActivity-->
@@ -197,14 +205,14 @@ chặn cuộc hội thoại của bạn hoặc chỉ đơn giản là %2$s đã
   <string name="ExportFragment_success">Thành công!</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Lỗi thường trực khi giao tiếp qua Signal!</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal không thể đăng ký với Google Play Services. Giao tiếp thông qua kênh dữ liệu đã ngưng hoạt động, hãy thử đăng ký lại từ trình đơn cài đặt của Signal.</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal không thể đăng ký với Google Play Services. Cuộc gọi và tin nhắn Signal đã ngừng hoạt động, hãy thử đăng ký lại từ mục Cài đặt &gt; Nâng cao.</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">Tạo nhóm mới</string>
   <string name="GroupCreateActivity_actionbar_update_title">Cập nhật nhóm</string>
   <string name="GroupCreateActivity_group_name_hint">Tên nhóm</string>
   <string name="GroupCreateActivity_actionbar_mms_title">Tạo nhóm MMS mới</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">Bạn đã chọn một liên hệ không hỗ trợ nhóm Signal, vậy nên nhóm này sẽ dùng MMS.</string>
-  <string name="GroupCreateActivity_you_dont_support_push">Bạn chưa đăng ký để sử dụng kênh dữ liệu, vậy nên nhóm Signal sẽ không hoạt động.</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">Bạn chưa đăng ký dịch vụ gọi và nhắn tin Signal, vậy nên nhóm Signal không khả dụng. Hãy thử đăng ký từ mục Cài đặt &gt; Nâng cao.</string>
   <string name="GroupCreateActivity_contacts_mms_exception">Có lỗi bất ngờ xảy ra do đó không lập nhóm được.</string>
   <string name="GroupCreateActivity_contacts_no_members">Cần có ít nhất một người trong nhóm!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Một người trong nhóm có số điện thoại không đọc được. Xin điều chỉnh hoặc xóa đi và thử lại.</string>
@@ -319,6 +327,8 @@ sao lưu này trước đó, nhập lần nữa sẽ dẫn đến việc có tin
   <string name="DeviceProvisioningActivity_content_progress_key_error">Mã QR không đúng.</string>
   <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Xin lỗi, bạn có quá nhiều thiết bị đã được liên kết, thử tháo bỏ vài cái...</string>
   <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Xin lỗi, đây không phải là mã QR liên kết thiết bị chính xác.</string>
+  <string name="DeviceProvisioningActivity_link_a_signal_device">Liên kết một thiết bị dùng Signal?</string>
+  <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">Có vẻ như bạn đang cố liên kết một thiết bị dùng Signal bằng phần mềm quét bên thứ 3. Để bảo vệ mình, hãy quét lại đoạn mã sử dụng Signal.</string>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Điền vào cụm từ mật khẩu</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Biểu tượng Signal</string>
@@ -502,6 +512,8 @@ Nhận thông tin về chìa khóa danh tính không rõ. Bấm để xử lý v
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Trả lời nhanh không khả thi khi Signal bị khoá!</string>
   <string name="QuickResponseService_problem_sending_message">Có vấn đề khi gửi tin nhắn!</string>
   <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">Tin nhắn mới</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Hình ảnh</string>
   <string name="attachment_type_selector__audio">Âm thanh</string>
@@ -672,13 +684,15 @@ Signal cũng có thể gọi cho bạn để xác minh số điện thoại. Ch
   <string name="registration_progress_activity__call_me">Gọi tôi</string>
   <string name="registration_progress_activity__edit_number">Sửa số</string>
   <string name="registration_progress_activity__connectivity_error">Có lỗi kết nối.</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-Signal không thể kết nối đến dịch vụ push.
-</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal không thể kết nối đến máy chủ.</string>
   <string name="registration_progress_activity__some_possible_problems_include">Một số vấn đề có
 thể gặp bao gồm:</string>
   <string name="registration_progress_activity__no_network_connectivity">Không có đường
 truyền mạng.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Thiết bị
+của bạn cần kết nối mạng để có thể sử dụng tính năng Signal này. Hãy kiểm tra để chắc
+rằng thiết bị có kết nối 3G hoặc Wi-Fi.
+</string>
   <string name="registration_progress_activity__restrictive_firewall">Tường lửa ngăn chận.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Nếu bạn đang kết nối Wi-Fi, có khả năng là tường lửa đã chặn đường
@@ -726,11 +740,13 @@ SMS thất bại.
   <string name="AndroidManifest__change_passphrase">Đổi cụm từ mật khẩu</string>
   <string name="AndroidManifest__verify_identity">Kiểm chứng danh tính</string>
   <string name="AndroidManifest__log_submit">Nộp ký sự dò lỗi</string>
-  <string name="AndroidManifest__media_preview">Xem Trước Truyền Thông</string>
+  <string name="AndroidManifest__media_preview">Xem trước tệp đa phương tiện</string>
   <string name="AndroidManifest__media_overview">Tất cả hình ảnh</string>
   <string name="AndroidManifest__media_overview_named">Tất cả hình ảnh với %1$s</string>
+  <string name="AndroidManifest__message_details">Chi tiết tin nhắn</string>
   <string name="AndroidManifest_manage_linked_devices">Quản trị các thiết bị liên kết</string>
   <string name="AndroidManifest__invite_friends">Mời bạn bè</string>
+  <string name="AndroidManifest_conversations_archive">Bản lưu các cuộc hội thoại</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Xuất / nhập</string>
   <string name="arrays__your_identity_key">Khóa danh tính</string>
@@ -794,7 +810,7 @@ SMS thất bại.
   <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__inthread_notifications">Thông báo bên trong chuỗi</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>
   <string name="preferences__repeat_alerts">Lập lại cảnh báo</string>
   <string name="preferences__never">Không bao giờ</string>
@@ -832,12 +848,12 @@ SMS thất bại.
   <string name="preferences__mmsc_password">Mật khẩu MMSC</string>
   <string name="preferences__sms_delivery_reports">Báo cáo phân phối SMS</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Yêu cầu có báo cáo phân phối cho từng tin nhắn SMS gửi đi</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Tự động xóa các tin nhắn cũ một khi chuỗi chuyện trò vượt quá độ dài đã ấn định</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Tự động xóa các tin nhắn cũ một khi cuộc hội thoại vượt quá độ dài ấn định</string>
   <string name="preferences__delete_old_messages">Xóa tin nhắn cũ</string>
   <string name="preferences__chats">Các cuộc trò chuyện và dữ liệu truyền thông</string>
   <string name="preferences__conversation_length_limit">Giới hạn độ dài cuộc chuyện trò</string>
-  <string name="preferences__trim_all_threads_now">Rút ngắn mọi chuỗi ngay bây giờ</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Xem xét các chuỗi chuyện trò và buộc tuân theo giới hạn độ dài</string>
+  <string name="preferences__trim_all_conversations_now">Lập tức rút ngắn tất cả các cuộc hội thoại</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Quét tất cả các cuộc hội thoại và áp dụng giới hạn độ dài hội thoại</string>
   <string name="preferences__devices">Các thiết bị</string>
   <string name="preferences__light_theme">Lợt</string>
   <string name="preferences__dark_theme">Đậm</string>
@@ -895,11 +911,14 @@ Các tin nhắn và cuộc gọi riêng tư miễn phí đến người dùng Si
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">Xóa cái chọn</string>
   <string name="conversation_list_batch__menu_select_all">Chọn tất cả</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">Đã chọn bản lưu</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Đã chọn bản chưa lưu</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">Tìm kiếm</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">Hình Chân Dung Liên Lạc</string>
   <string name="conversation_list_item_view__error_alert">Cảnh báo lỗi</string>
+  <string name="conversation_list_item_view__archived">Đã bảo lưu</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">Chuyện trò mới</string>
   <!--conversation_secure_verified-->
@@ -937,6 +956,7 @@ Các tin nhắn và cuộc gọi riêng tư miễn phí đến người dùng Si
   <string name="text_secure_normal__menu_clear_passphrase">Khóa</string>
   <string name="text_secure_normal__mark_all_as_read">Đánh dấu tất cả đã đọc</string>
   <string name="text_secure_normal__invite_friends">Mời bạn bè</string>
+  <string name="text_secure_normal__help">Trợ giúp</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Bản dựng Signal này đã hết hạn!</string>
   <string name="reminder_header_expired_build_details">Tin nhắn không còn gửi đi được nữa, xin vui lòng cập nhật lên phiên bản mới nhất.</string>
@@ -964,7 +984,7 @@ Các tin nhắn và cuộc gọi riêng tư miễn phí đến người dùng Si
   <!--media_preview-->
   <string name="media_preview__save_title">Lưu</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">Xem trước Hình</string>
+  <string name="media_preview_activity__image_content_description">Xem trước hình</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">Làm mới</string>
   <!--redphone_audio_popup_menu-->

res/values-zh-rCN/strings.xml

@@ -10,7 +10,6 @@
   <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">您尚未设置密码！</string>
   <string name="ApplicationPreferencesActivity_messages_per_conversation">每个会话 %s 个信息</string>
   <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">删除所有旧信息？</string>
-  <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">你确定处理与%s的最近的对话消息？</string>
   <string name="ApplicationPreferencesActivity_delete">删除</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">禁用密码？</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -150,9 +149,15 @@
     <item quantity="other">这将会永久的删除所有 %1$d 已选择的会话。</item>
   </plurals>
   <string name="ConversationListFragment_deleting">正在删除</string>
-  <string name="ConversationListFragment_deleting_selected_threads">正在删除选中的对话...</string>
+  <string name="ConversationListFragment_archived_conversations">存档的会话</string>
+  <string name="ConversationListFragment_undo">撤销</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">移动会话到收件箱</string>
+  <string name="ConversationListFragment_archived_conversation">存档的会话</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">已移动会话到收件箱</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">密钥交换消息...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">存档的会话 (%d)</string>
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">使用定制：%s</string>
   <string name="CustomDefaultPreference_using_default">使用默认：%s</string>
@@ -192,14 +197,14 @@
   <string name="ExportFragment_success">成功！</string>
   <!--GcmRefreshJob-->
   <string name="GcmRefreshJob_Permanent_Signal_communication_failure">暗号持续连接失效！</string>
-  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">暗号无法在 Google Play 服务中注册，基于数据通道的通信已经被禁用，请尝试在暗号的设置菜单中重新注册。</string>
+  <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">暗号无法在 Google Play 服务中注册。暗号消息和呼叫已经被金庸。请尝试在设置 &gt; 高级中重新注册。</string>
   <!--GroupCreateActivity-->
   <string name="GroupCreateActivity_actionbar_title">新群组</string>
   <string name="GroupCreateActivity_actionbar_update_title">更新群组</string>
   <string name="GroupCreateActivity_group_name_hint">群组名称</string>
   <string name="GroupCreateActivity_actionbar_mms_title">新彩信群组</string>
   <string name="GroupCreateActivity_contacts_dont_support_push">您所选择的联系人并不支持暗号群组，所以此组将以彩信形式存在。</string>
-  <string name="GroupCreateActivity_you_dont_support_push">您还没有注册以使用数据频道，所以暗号群组将会被禁用。</string>
+  <string name="GroupCreateActivity_youre_not_registered_for_signal">您没有注册暗号的信息和呼叫，所以暗号群组已经被急用弄。请尝试在设置 &gt; 高级中重新注册。</string>
   <string name="GroupCreateActivity_contacts_mms_exception">发生不可预料的错误导致创建群组失败。</string>
   <string name="GroupCreateActivity_contacts_no_members">群组中至少要有一个人！</string>
   <string name="GroupCreateActivity_contacts_invalid_number">目前无法正确获取您组内一名成员的信息，请尝试修复或移除这名联系人以重试。</string>
@@ -493,7 +498,7 @@
   <string name="QuickResponseService_problem_sending_message">发送信息时遇到问题！</string>
   <!--SingleRecipientNotificationBuilder-->
   <string name="SingleRecipientNotificationBuilder_signal">暗号</string>
-  <string name="SingleRecipientNotificationBuilder_new_message">新信息！</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">新信息</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">图片</string>
   <string name="attachment_type_selector__audio">音频</string>
@@ -660,8 +665,7 @@
   <string name="registration_progress_activity__call_me">呼叫我</string>
   <string name="registration_progress_activity__edit_number">编辑号码</string>
   <string name="registration_progress_activity__connectivity_error">连接错误。</string>
-  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-暗号无法连接推送服务器。</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">暗号无法连接到服务器。</string>
   <string name="registration_progress_activity__some_possible_problems_include">一些可能的问题
 包括：</string>
   <string name="registration_progress_activity__no_network_connectivity">无网络
@@ -712,12 +716,12 @@
   <string name="AndroidManifest__change_passphrase"> 修改密码</string>
   <string name="AndroidManifest__verify_identity">验证身份</string>
   <string name="AndroidManifest__log_submit">发送调试日志</string>
-  <string name="AndroidManifest__media_preview">媒体预览</string>
   <string name="AndroidManifest__media_overview">所有图片</string>
   <string name="AndroidManifest__media_overview_named">所有图片和%1$s</string>
   <string name="AndroidManifest__message_details">信息详情</string>
   <string name="AndroidManifest_manage_linked_devices">管理已连接的设备</string>
   <string name="AndroidManifest__invite_friends">邀请好友</string>
+  <string name="AndroidManifest_conversations_archive">会话存档</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">导入/导出</string>
   <string name="arrays__your_identity_key">你的身份密钥</string>
@@ -781,7 +785,6 @@
   <string name="preferences__sound">声音</string>
   <string name="preferences__change_notification_sound">改变提示音</string>
   <string name="preferences__silent">静音</string>
-  <string name="preferences__inthread_notifications">线程内通知</string>
   <string name="preferences__play_inthread_notifications">在查看活动的会话时播放提示音</string>
   <string name="preferences__repeat_alerts">重复警报</string>
   <string name="preferences__never">永不</string>
@@ -819,12 +822,9 @@
   <string name="preferences__mmsc_password">MMSC 密码</string>
   <string name="preferences__sms_delivery_reports">短信发送报告</string>
   <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">请求发送报告</string>
-  <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">对话超过指定数量时自动删除旧的信息</string>
   <string name="preferences__delete_old_messages">删除旧信息</string>
   <string name="preferences__chats">聊天与媒体</string>
   <string name="preferences__conversation_length_limit">对话数量限制</string>
-  <string name="preferences__trim_all_threads_now">现在处理所有对话</string>
-  <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">查找并处理所有超过限制的对话</string>
   <string name="preferences__devices">设备</string>
   <string name="preferences__light_theme">明亮</string>
   <string name="preferences__dark_theme">黑暗</string>
@@ -880,11 +880,13 @@
   <!--conversation_list_batch-->
   <string name="conversation_list_batch__menu_delete_selected">删除已选</string>
   <string name="conversation_list_batch__menu_select_all">选择全部</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">存档已选择</string>
   <!--conversation_list-->
   <string name="conversation_list__menu_search">搜索</string>
   <!--conversation_list_item_view-->
   <string name="conversation_list_item_view__contact_photo_image">联系人照片</string>
   <string name="conversation_list_item_view__error_alert">错误警报</string>
+  <string name="conversation_list_item_view__archived">存档</string>
   <!--conversation_list_fragment-->
   <string name="conversation_list_fragment__fab_content_description">新会话</string>
   <!--conversation_secure_verified-->
@@ -950,7 +952,6 @@
   <!--media_preview-->
   <string name="media_preview__save_title">保存</string>
   <!--media_preview_activity-->
-  <string name="media_preview_activity__image_content_description">图片预览</string>
   <!--new_conversation_activity-->
   <string name="new_conversation_activity__refresh">刷新</string>
   <!--redphone_audio_popup_menu-->

res/values-zh-rTW/strings.xml

@@ -0,0 +1,986 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <string name="app_name">Signal</string>
+  <string name="yes">是</string>
+  <string name="no">否</string>
+  <string name="delete">刪除</string>
+  <string name="please_wait">請稍候...</string>
+  <!--ApplicationPreferencesActivity-->
+  <string name="ApplicationPreferencesActivity_currently_s">目前: %s</string>
+  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">您還沒有建立密碼！</string>
+  <string name="ApplicationPreferencesActivity_messages_per_conversation">每個對話群組中有 %s 個訊息</string>
+  <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">刪除\"全部\"的舊訊息？</string>
+  <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">這將會立即裁剪所有對話至 %s 最新訊息。</string>
+  <string name="ApplicationPreferencesActivity_delete">刪除</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">停用密碼嗎?</string>
+  <string name="ApplicationPreferencesActivity_disable_lock_screen">
+        訊息來時停用螢幕鎖？
+    </string>
+  <string name="ApplicationPreferencesActivity_disable">停用</string>
+  <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_error_connecting_to_server">與伺服器的連線發生錯誤！</string>
+  <string name="ApplicationPreferencesActivity_sms_enabled">簡訊功能已啟動</string>
+  <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">按這裡來變更您預設的簡訊應用</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">簡訊功能已停用</string>
+  <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">按這裡將 Signal 設為預設的簡訊應用</string>
+  <string name="ApplicationPreferencesActivity_on">開</string>
+  <string name="ApplicationPreferencesActivity_On">開</string>
+  <string name="ApplicationPreferencesActivity_off">關</string>
+  <string name="ApplicationPreferencesActivity_Off">關</string>
+  <string name="ApplicationPreferencesActivity_sms_mms_summary">%1$s 則簡訊，%2$s 則MMS</string>
+  <!--AppProtectionPreferenceFragment-->
+  <string name="AppProtectionPreferenceFragment_minutes">%d 分鐘</string>
+  <!--DraftDatabase-->
+  <string name="DraftDatabase_Draft_image_snippet">(圖片)</string>
+  <string name="DraftDatabase_Draft_audio_snippet">(音訊)</string>
+  <string name="DraftDatabase_Draft_video_snippet">(影片)</string>
+  <!--AttchmentManager-->
+  <string name="AttachmentManager_cant_open_media_selection">找不到合適的應用來選擇媒體檔案。</string>
+  <!--AttachmentTypeSelectorAdapter-->
+  <string name="AttachmentTypeSelectorAdapter_camera">相機</string>
+  <string name="AttachmentTypeSelectorAdapter_picture">照片</string>
+  <string name="AttachmentTypeSelectorAdapter_video">影片</string>
+  <string name="AttachmentTypeSelectorAdapter_audio">音訊</string>
+  <string name="AttachmentTypeSelectorAdapter_contact">連絡人資訊</string>
+  <!--AudioSlidePlayer-->
+  <string name="AudioSlidePlayer_error_playing_audio">播放音訊時出現錯誤！</string>
+  <!--BlockedContactsActivity-->
+  <string name="BlockedContactsActivity_blocked_contacts">已封鎖的聯絡人</string>
+  <!--CallScreen-->
+  <string name="CallScreen_Incoming_call">來電</string>
+  <!--ConfirmIdentityDialog-->
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">當前 %1$s 的識別金鑰已經改變。這可能是由於有人嘗試破解您和對方的通信，也可能是有 %2$s 重裝了Signal然後產生了新的識別金鑰。</string>
+  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">您想要對這名連絡人
+進行認證嗎？</string>
+  <string name="ConfirmIdentityDialog_accept">接受</string>
+  <!--ContactsDatabase-->
+  <string name="ContactsDatabase_message_s">%s 則訊息</string>
+  <string name="ContactsDatabase_signal_call_s">Signal 通話 %s</string>
+  <!--ConversationItem-->
+  <string name="ConversationItem_message_size_d_kb">訊息大小: %d KB</string>
+  <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">由於這個媒體檔案已被加密。如果要用外部的媒體瀏覽APP來開啟／檢視它，則需將其解密並儲存至未加密的空間。您確定要這樣做嗎？</string>
+  <string name="ConversationItem_error_received_stale_key_exchange_message">錯誤，收到的是過期的金鑰交換訊息。</string>
+  <string name="ConversationItem_received_key_exchange_message_click_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_to_approve_unencrypted_dialog_message">
+由於對方已經不再是Signal的使用者，當前消息<b>不會</b>被發送。\n\n發送不加密的資料？</string>
+  <string name="ConversationItem_unable_to_open_media">找不到合適的應用來開啟媒體檔案。</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_reset">重置</string>
+  <string name="ConversationActivity_delete_thread_question">刪除對話？</string>
+  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">這將會永久性地刪除對話中的所有訊息。</string>
+  <string name="ConversationActivity_add_attachment">增加附件檔案</string>
+  <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_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">收件人並不是一個有效的 手機門號 或 email 位址！</string>
+  <string name="ConversationActivity_message_is_empty_exclamation">訊息內容是空的！</string>
+  <string name="ConversationActivity_group_members">群組成員</string>
+  <string name="ConversationActivity_group_conversation">群組聊天</string>
+  <string name="ConversationActivity_unnamed_group">未命名的群組</string>
+  <string name="ConversationActivity_d_recipients_in_group">有 %d 名成員</string>
+  <string name="ConversationActivity_d_recipients_in_group_singular">有 1 名成員</string>
+  <string name="ConversationActivity_saved_draft">草稿已存</string>
+  <string name="ConversationActivity_invalid_recipient">無效的連絡人！</string>
+  <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">不安全的簡訊</string>
+  <string name="ConversationActivity_transport_insecure_mms">不安全的MMS</string>
+  <string name="ConversationActivity_transport_signal">Signal</string>
+  <string name="ConversationActivity_lets_switch_to_signal">讓我們切換到 Signa %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">多媒體簡訊不被支持</string>
+  <string name="ConversationActivity_mms_not_supported_message">此訊息無法發送，因爲您的運營商不支持多媒體簡訊。</string>
+  <string name="ConversationActivity_specify_recipient">請選擇聯絡人</string>
+  <string name="ConversationActivity_unblock_question">解除封鎖？</string>
+  <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">您確定要解除封鎖此聯絡人嗎？</string>
+  <string name="ConversationActivity_unblock">接觸封鎖</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>
+  <!--ConversationFragment-->
+  <string name="ConversationFragment_message_details">訊息細節</string>
+  <string name="ConversationFragment_transport_s_sent_received_s">傳送狀態: %1$s\n已傳送/已接收: %2$s</string>
+  <string name="ConversationFragment_sender_s_transport_s_sent_s_received_s">傳送者: %1$s\n傳送狀態: %2$s\n已傳送: %3$s\n已接收: %4$s</string>
+  <plurals name="ConversationFragment_delete_selected_messages">
+    <item quantity="other">刪除已選訊息？</item>
+  </plurals>
+  <plurals name="ConversationFragment_this_will_permanently_delete_all_n_selected_messages">
+    <item quantity="other">這將會永久性地刪除所有 %1$d 已選訊息。</item>
+  </plurals>
+  <string name="ConversationFragment_save_to_sd_card">儲存到儲存裝置？</string>
+  <string name="ConversationFragment_saving_this_media_to_storage_warning">將檔案儲存到儲存裝置，將會使得手機上的其他 apps 也能存取它。\n\n您要繼續嗎？</string>
+  <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">儲存檔案到儲存裝置時發生錯誤！</string>
+  <string name="ConversationFragment_success_exclamation">成功！</string>
+  <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">無法寫入儲存裝置！</string>
+  <string name="ConversationFragment_saving_attachment">正在儲存附件檔案</string>
+  <string name="ConversationFragment_saving_attachment_to_sd_card">正在寫入儲存裝置中...</string>
+  <string name="ConversationFragment_pending">待定...</string>
+  <string name="ConversationFragment_push">數據 (Signal)</string>
+  <string name="ConversationFragment_mms">多媒體簡訊</string>
+  <string name="ConversationFragment_sms">簡訊</string>
+  <string name="ConversationFragment_deleting">正在刪除</string>
+  <string name="ConversationFragment_deleting_messages">正在刪除訊息...</string>
+  <!--ConversationListActivity-->
+  <string name="ConversationListActivity_search">搜尋...</string>
+  <!--ConversationListFragment-->
+  <plurals name="ConversationListFragment_delete_selected_conversations">
+    <item quantity="other">刪除已選對話？</item>
+  </plurals>
+  <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
+    <item quantity="other">這將會永久性地刪除所有 %1$d 已選對話。</item>
+  </plurals>
+  <string name="ConversationListFragment_deleting">正在刪除</string>
+  <string name="ConversationListFragment_deleting_selected_conversations">正在刪除已選擇的對話...</string>
+  <string name="ConversationListFragment_archived_conversations">存檔對話</string>
+  <string name="ConversationListFragment_undo">撤銷</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">移動對話至收件箱</string>
+  <string name="ConversationListFragment_archived_conversation">存檔對話</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">移動對話至收件箱</string>
+  <!--ConversationListItem-->
+  <string name="ConversationListItem_key_exchange_message">金鑰交換訊息...</string>
+  <!--ConversationListItemAction-->
+  <string name="ConversationListItemAction_archived_conversations_d">存檔對話 (%d)</string>
+  <!--CustomDefaultPreference-->
+  <string name="CustomDefaultPreference_using_custom">使用定製：%s</string>
+  <string name="CustomDefaultPreference_using_default">使用預設：%s</string>
+  <string name="CustomDefaultPreference_none">無</string>
+  <!--DateUtils-->
+  <string name="DateUtils_now">現在</string>
+  <string name="DateUtils_minutes_ago">%d 分鐘</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>
+  <string name="DeviceListActivity_network_connection_failed">網絡連接失敗...</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>
+  <!--DeviceListItem-->
+  <string name="DeviceListItem_unnamed_device">未命名的設備</string>
+  <string name="DeviceListItem_linked_s">已連接 %s</string>
+  <string name="DeviceListItem_last_active_s">最後活躍 %s</string>
+  <string name="DeviceListItem_today">今天</string>
+  <!--ShareActivity-->
+  <string name="ShareActivity_share_with">分享給</string>
+  <!--ExperienceUpgradeActivity-->
+  <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_textsecure_is_now_signal">TextSecure 已命名爲 Signal。</string>
+  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">從現在起 TextSecure 與 RedPhone 將會是同一個訊息平臺：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_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_success">成功！</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 Services。Signal 訊息與通話已經停用，請嘗試在設定 &gt; 高級中重新註冊。</string>
+  <!--GroupCreateActivity-->
+  <string name="GroupCreateActivity_actionbar_title">新增群組</string>
+  <string name="GroupCreateActivity_actionbar_update_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 群組，所以此組將以多媒體訊息形式存在。</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>
+  <string name="GroupCreateActivity_contacts_invalid_number">群組中某個連絡人的號碼有誤，請更正或移除該名連絡人，並再試一次。</string>
+  <string name="GroupCreateActivity_avatar_content_description">群組的大頭照</string>
+  <string name="GroupCreateActivity_menu_create_title">建立群組</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>
+  <string name="GroupCreateActivity_loading_group_details">讀取群組詳情...</string>
+  <string name="GroupCreateActivity_youre_already_in_the_group">您已在此群組中。</string>
+  <!--GroupMembersDialog-->
+  <string name="GroupMembersDialog_me">我</string>
+  <!--ImportExportActivity-->
+  <string name="ImportExportActivity_import">匯入</string>
+  <string name="ImportExportActivity_export">匯出</string>
+  <!--ImportFragment-->
+  <string name="ImportFragment_import_system_sms_database">匯入目前裝置上的手機簡訊？</string>
+  <string name="ImportFragment_this_will_import_messages_from_the_system">這將會從系統預設的簡訊數據庫匯入
+訊息至 Signal。如果您事先
+已匯入系統簡訊數據庫，再次匯入將會出現重複的訊息。</string>
+  <string name="ImportFragment_import">匯入</string>
+  <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>
+  <string name="ImportFragment_restore">還原</string>
+  <string name="ImportFragment_import_plaintext_backup">匯入未加密的備份資料庫？</string>
+  <string name="ImportFragment_this_will_import_messages_from_a_plaintext_backup">這將會匯入
+       未經加密的訊息紀錄備份檔案。 如果您之前已經做過，
+       再匯入一次訊息紀錄將會使 TextSecure 中出現重複的訊息紀錄。
+    </string>
+  <string name="ImportFragment_importing">匯入中</string>
+  <string name="ImportFragment_import_plaintext_backup_elipse">匯入未加密的資料備份...</string>
+  <string name="ImportFragment_no_plaintext_backup_found">找不到任何未加密的備份檔案！</string>
+  <string name="ImportFragment_error_importing_backup">匯入備份時發生錯誤！</string>
+  <string name="ImportFragment_import_complete">匯入完成！</string>
+  <string name="ImportFragment_restoring">正在還原</string>
+  <string name="ImportFragment_restoring_encrypted_backup">正在還原已加密的備份...</string>
+  <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>
+  <!--InviteActivity-->
+  <string name="InviteActivity_share">分享</string>
+  <string name="InviteActivity_send_sms">傳送手機簡訊</string>
+  <string name="InviteActivity_cancel">取消</string>
+  <string name="InviteActivity_sending">正在傳送...</string>
+  <string name="InviteActivity_heart_content_description">心</string>
+  <string name="InviteActivity_invitations_sent">邀請已發送！</string>
+  <string name="InviteActivity_invite_to_signal">邀請至 Signal</string>
+  <plurals name="InviteActivity_send_to_friends">
+    <item quantity="other">已發送至 %d 位朋友</item>
+  </plurals>
+  <plurals name="InviteActivity_send_sms_invites">
+    <item quantity="other">發送 %d 則簡訊邀請？</item>
+  </plurals>
+  <string name="InviteActivity_lets_switch_to_signal">讓我們切換到 Signal：%1$s</string>
+  <string name="InviteActivity_no_app_to_share_to">看起來您沒有任何可以分享的應用。</string>
+  <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">安裝條碼掃描器？</string>
+  <string name="KeyScanningActivity_this_application_requires_barcode_scanner_would_you_like_to_install_it">Signal 需要條碼掃描器來掃描二維碼。</string>
+  <!--MessageDetailsRecipient-->
+  <string name="MessageDetailsRecipient_failed_to_send">發送失敗</string>
+  <string name="MessageDetailsRecipient_new_identity">新身份</string>
+  <!--MmsDownloader-->
+  <string name="MmsDownloader_error_storing_mms">儲存 MMS 多媒體簡訊時有誤！</string>
+  <string name="MmsDownloader_error_connecting_to_mms_provider">連線到 MMS 多媒體簡訊伺服器時有誤！</string>
+  <string name="MmsDownloader_error_reading_mms_settings">讀取 MMS多媒體簡訊伺服器的無線設定時有誤！</string>
+  <!--- NotificationBarManager-->
+  <string name="NotificationBarManager_signal_call_in_progress">正在處理 Signal 通話</string>
+  <string name="NotificationBarManager_missed_call_from_s">來自 %s 的未接來電</string>
+  <string name="NotificationBarManager_missed_signal_call">Signal 未接來電</string>
+  <string name="NotificationBarManager__establishing_signal_call">正在建立 Signal 通話</string>
+  <string name="NotificationBarManager__incoming_signal_call">Signal 通話來電</string>
+  <string name="NotificationBarManager__deny_call">拒絕接聽</string>
+  <string name="NotificationBarManager__answer_call">接聽通話</string>
+  <string name="NotificationBarManager__end_call">結束通話</string>
+  <string name="NotificationBarManager__cancel_call">取消通話</string>
+  <!--NotificationMmsMessageRecord-->
+  <string name="NotificationMmsMessageRecord_multimedia_message">多媒體訊息</string>
+  <!--MessageRecord-->
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">收到一則使用舊版本並已經不再支持的 Signal 加密訊息。請聯繫發送人將 Signal 升級到最新的版本並再次發送該訊息。</string>
+  <string name="MessageRecord_left_group">您已經離開了此群組。</string>
+  <string name="MessageRecord_updated_group">已更新群組。</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_is_on_signal_say_hey">%s 正在 Signal 線上，打個招呼吧！</string>
+  <!--PassphraseChangeActivity-->
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">輸入的「自訂密碼」不相符！</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">輸入的是舊的「自訂密碼」！</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">輸入新的『自訂密碼』</string>
+  <!--DeviceProvisioningActivity-->
+  <string name="DeviceProvisioningActivity_link_this_device">連接此設備？</string>
+  <string name="DeviceProvisioningActivity_cancel">取消</string>
+  <string name="DeviceProvisioningActivity_continue">繼續</string>
+  <string name="DeviceProvisioningActivity_title">連接此設備？</string>
+  <string name="DeviceProvisioningActivity_content_intro">它將能夠</string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+• 閱讀您的所有訊息
+\n• 以您的名義發送訊息</string>
+  <string name="DeviceProvisioningActivity_content_progress_title">正在連接設備</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">正在連接新的設備...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">設備已認可！</string>
+  <string name="DeviceProvisioningActivity_content_progress_no_device">沒有找到設備。</string>
+  <string name="DeviceProvisioningActivity_content_progress_network_error">網路錯誤。</string>
+  <string name="DeviceProvisioningActivity_content_progress_key_error">二維碼無效。</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">抱歉，這不是有些的設備連接二維碼。</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">看起來您正在嘗試使用第 3 方掃描器連接 Signal 設備。爲了安全着想，請使用 Signal 重新掃描代碼一次。</string>
+  <!--PassphrasePromptActivity-->
+  <string name="PassphrasePromptActivity_enter_passphrase">輸入「自訂密碼」</string>
+  <string name="PassphrasePromptActivity_watermark_content_description">Signal 圖示</string>
+  <string name="PassphrasePromptActivity_ok_button_content_description">確認『自訂密碼』</string>
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">無效的『自訂密碼』！</string>
+  <!--PlayServicesProblemFragment-->
+  <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">您當前安裝的 Google Play 服務無法正常運作。請重新安裝 Google Play 服務然後重試一次。</string>
+  <!--RatingManager-->
+  <string name="RatingManager_rate_this_app">對此應用評分</string>
+  <string name="RatingManager_if_you_enjoy_using_this_app_please_take_a_moment">如果您喜歡使用此應用，請使用片刻時間幫我們對其進行評分。</string>
+  <string name="RatingManager_rate_now">立即評分！</string>
+  <string name="RatingManager_no_thanks">不，謝謝。</string>
+  <string name="RatingManager_later">稍後</string>
+  <!--RecipientPreferencesActivity-->
+  <string name="RecipientPreferenceActivity_block_this_contact_question">封鎖此聯絡人？</string>
+  <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_or_calls_from_this_user">您將不會再次收到來自此用戶的訊息與通話。</string>
+  <string name="RecipientPreferenceActivity_block">封鎖</string>
+  <string name="RecipientPreferenceActivity_unblock_this_contact_question">解除封鎖此聯絡人？</string>
+  <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">您確定要解除封鎖此聯絡人嗎？</string>
+  <string name="RecipientPreferenceActivity_unblock">接觸封鎖</string>
+  <string name="RecipientPreferenceActivity_enabled">啓用</string>
+  <string name="RecipientPreferenceActivity_disabled">停用</string>
+  <!--RedPhone-->
+  <string name="RedPhone_answering">正在通話</string>
+  <string name="RedPhone_ending_call">掛斷通話</string>
+  <string name="RedPhone_dialing">撥電中</string>
+  <string name="RedPhone_canceling_call">正在取消通話</string>
+  <string name="RedPhone_call_rejected">通話被拒絕</string>
+  <string name="RedPhone_ringing">響鈴中</string>
+  <string name="RedPhone_busy">忙碌</string>
+  <string name="RedPhone_connected">已連接</string>
+  <string name="RedPhone_connecting">連接中</string>
+  <string name="RedPhone_handshake_failed">握手失敗！</string>
+  <string name="RedPhone_recipient_unavailable">無此接收人</string>
+  <string name="RedPhone_performing_handshake">正在執行握手</string>
+  <string name="RedPhone_network_failed">網絡失敗！</string>
+  <string name="RedPhone_client_failed">客戶端失敗</string>
+  <string name="RedPhone_fatal_error">嚴重錯誤</string>
+  <string name="RedPhone_login_failed">登入失敗！</string>
+  <string name="RedPhone_message_from_the_server">來自伺服器的訊息</string>
+  <string name="RedPhone_number_not_registered">號碼尚未註冊</string>
+  <string name="RedPhone_the_number_you_dialed_does_not_support_secure_voice">您撥通的號碼不支持加密語音！</string>
+  <string name="RedPhone_got_it">收到</string>
+  <!--RegistrationActivity-->
+  <string name="RegistrationActivity_connect_with_signal">連接 Signal</string>
+  <string name="RegistrationActivity_select_your_country">選擇您的國家／地區</string>
+  <string name="RegistrationActivity_you_must_specify_your_country_code">您必須輸入
+您的國碼</string>
+  <string name="RegistrationActivity_you_must_specify_your_phone_number">您必須輸入
+您的手機號碼</string>
+  <string name="RegistrationActivity_invalid_number">無效的手機號碼</string>
+  <string name="RegistrationActivity_the_number_you_specified_s_is_invalid">您輸入的
+        號碼 (%s) 是無效的
+    </string>
+  <string name="RegistrationActivity_unsupported">不支援</string>
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">抱歉，
+        你目前使用裝置不支援 TextSecure 即時訊息功能。.採用早於 Android 4.0 或更舊版
+        必須登入已註冊的 Google Account. 採用 Android 4.0 或更新版
+        的手機則無須 Google account，但須具備 Play Store APP。
+    </string>
+  <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
+請仔細檢查您的號碼！我們將通過簡訊進行驗證。</string>
+  <string name="RegistrationActivity_continue">繼續</string>
+  <string name="RegistrationActivity_edit">更正</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>
+  <string name="RegistrationProgressActivity_unable_to_connect">無法連線。請確認網路連線後再試。</string>
+  <string name="RegistrationProgressActivity_verification_failed">驗證失敗！</string>
+  <string name="RegistrationProgressActivity_the_verification_code_you_submitted_is_incorrect">您輸入的驗證碼不正確。請再試一次。</string>
+  <string name="RegistrationProgressActivity_too_many_attempts">您已重複嘗試太多次</string>
+  <string name="RegistrationProgressActivity_youve_submitted_an_incorrect_verification_code_too_many_times">您已重複嘗試輸入錯誤的驗證碼數次，請等約莫一分鐘後再試。</string>
+  <string name="RegistrationProgressActivity_requesting_call">請求語音通話</string>
+  <string name="RegistrationProgressActivity_requesting_incoming_call">請求撥出語音通話告知驗證碼...</string>
+  <string name="RegistrationProgressActivity_server_error">伺服器錯誤</string>
+  <string name="RegistrationProgressActivity_the_server_encountered_an_error">伺服器發生錯誤，請稍後再試。</string>
+  <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 伺服器 (CyanogenMod?) 註冊過了。您必需先將其撤銷才能在此進行註冊。</string>
+  <!--RegistrationService-->
+  <string name="RegistrationService_registration_complete">註冊完成</string>
+  <string name="RegistrationService_signal_registration_has_successfully_completed">已成功註冊 Signal。</string>
+  <string name="RegistrationService_registration_error">註冊失敗</string>
+  <string name="RegistrationService_signal_registration_has_encountered_a_problem">Signal 註冊遭遇到了問題。</string>
+  <!--Slide-->
+  <string name="Slide_image">圖片</string>
+  <string name="Slide_audio">音訊</string>
+  <string name="Slide_video">影片</string>
+  <!--SmsMessageRecord-->
+  <string name="SmsMessageRecord_received_corrupted_key_exchange_message">收到一組毀損的
+金鑰交換訊息！</string>
+  <string name="SmsMessageRecord_received_key_exchange_message_for_invalid_protocol_version">
+        收到的金鑰交換訊息是未知的協定／版本。
+    </string>
+  <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
+        收到的金鑰交換訊息夾帶未知的身分值，按此顯示細節並執行。
+    </string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">已接收金鑰交換更新請求但未知對方身分。按此進行身分確認。</string>
+  <string name="SmsMessageRecord_secure_session_reset">安全連線重置。</string>
+  <string name="SmsMessageRecord_duplicate_message">複製訊息。</string>
+  <!--ThreadRecord-->
+  <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_is_on_signal_say_hey">%s 正在 Signal 線上，打個招呼吧！</string>
+  <!--VerifyIdentityActivity-->
+  <string name="VerifyIdentityActivity_you_do_not_have_an_identity_key">您不具備身分認證金鑰。</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key">收件者不具備身分認證金鑰。</string>
+  <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">收件者不具備身分認證金鑰！</string>
+  <string name="VerifyIdentityActivity_scan_their_key_to_compare">比對他們的金鑰</string>
+  <string name="VerifyIdentityActivity_get_your_key_scanned">驗證您的金鑰</string>
+  <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">警告！驗證結果不符合！請再目視並仔細比對一次指紋碼。</string>
+  <string name="VerifyIdentityActivity_not_verified_exclamation">無法驗證！</string>
+  <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">對方提供的金鑰是正確的。但您也必須將您的金鑰與其比對。</string>
+  <string name="VerifyIdentityActivity_verified_exclamation">已驗證！</string>
+  <string name="VerifyIdentityActivity_you_don_t_have_an_identity_key_exclamation">您不具備身分認證金鑰！</string>
+  <!--ViewIdentityActivity-->
+  <string name="ViewIdentityActivity_you_do_not_have_an_identity_key">您不具備身分認證金鑰。</string>
+  <string name="ViewIdentityActivity_scan_to_compare">掃描以比對</string>
+  <string name="ViewIdentityActivity_get_scanned_to_compare">掃描並且進行比對</string>
+  <string name="ViewIdentityActivity_warning_the_scanned_key_does_not_match_exclamation">警告！掃描的值並不相符！</string>
+  <string name="ViewIdentityActivity_not_verified_exclamation">無法驗證！</string>
+  <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">掃描的金鑰相符！</string>
+  <string name="ViewIdentityActivity_verified_exclamation">已驗證！</string>
+  <string name="ViewIdentityActivity_your_identity_fingerprint">您的身份辨識指紋碼</string>
+  <!--KeyExchangeInitiator-->
+  <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-->
+  <string name="ThreadDatabase_error_decrypting_message">解密訊息時發生錯誤。</string>
+  <!--MmsDatabase-->
+  <string name="MmsDatabase_connecting_to_mms_server">連線到 MMS多媒體訊息伺服器...</string>
+  <string name="MmsDatabase_downloading_mms">正在下載 MMS多媒體訊息...</string>
+  <string name="MmsDatabase_mms_download_failed">MMS多媒體訊息下載失敗！</string>
+  <string name="MmsDatabase_downloading">下載中...</string>
+  <string name="MmsDatabase_mms_pending_download">按一下進行MMS多媒體訊息設定值調整，以利繼續下載。</string>
+  <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-->
+  <string name="ApplicationMigrationService_import_in_progress">匯入中</string>
+  <string name="ApplicationMigrationService_importing_text_messages">匯入文字簡訊</string>
+  <!--KeyCachingService-->
+  <string name="KeyCachingService_signal_passphrase_cached">按一下開啓。</string>
+  <string name="KeyCachingService_signal_passphrase_cached_with_lock">按一下開啟，或按一下鎖住並關閉。</string>
+  <string name="KeyCachingService_passphrase_cached">Signal 已經解鎖</string>
+  <string name="KeyCachingService_lock">以『自訂密碼』進行鎖定</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>
+  <string name="MessageNotifier_locked_message">訊息鎖定...</string>
+  <string name="MessageNotifier_media_message_with_text">媒體訊息：%s</string>
+  <string name="MessageNotifier_no_subject">(在此輸入主題)</string>
+  <string name="MessageNotifier_message_delivery_failed">訊息傳送失敗。</string>
+  <string name="MessageNotifier_failed_to_deliver_message">無法傳送訊息。</string>
+  <string name="MessageNotifier_error_delivering_message">傳送訊息發生失誤。</string>
+  <string name="MessageNotifier_mark_all_as_read">全部標示為已讀</string>
+  <string name="MessageNotifier_mark_read">標示已讀</string>
+  <string name="MessageNotifier_media_message">媒體訊息</string>
+  <string name="MessageNotifier_reply">回覆</string>
+  <!--QuickResponseService-->
+  <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">當 Signal 鎖定時無法使用快速回覆！</string>
+  <string name="QuickResponseService_problem_sending_message">傳送訊息出現問題！</string>
+  <!--SingleRecipientNotificationBuilder-->
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+  <string name="SingleRecipientNotificationBuilder_new_message">新訊息</string>
+  <!--attachment_type_selector-->
+  <string name="attachment_type_selector__image">圖片</string>
+  <string name="attachment_type_selector__audio">音訊</string>
+  <string name="attachment_type_selector__video">影片</string>
+  <string name="attachment_type_selector__contact">聯絡人</string>
+  <string name="attachment_type_selector__camera">相機</string>
+  <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">舊的『自訂密碼』</string>
+  <string name="change_passphrase_activity__new_passphrase">新的『自訂密碼』</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">重複新的『自訂密碼』</string>
+  <!--contact_selection_activity-->
+  <string name="contact_selection_activity__enter_name_or_number">輸入名字或號碼</string>
+  <!--contact_selection_group_activity-->
+  <string name="contact_selection_group_activity__no_contacts">沒有連絡人。</string>
+  <string name="contact_selection_group_activity__finding_contacts">載入連絡人中...</string>
+  <!--single_contact_selection_activity-->
+  <string name="SingleContactSelectionActivity_contact_photo">連絡人的相片</string>
+  <!--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">傳送未加密的手機簡訊</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>
+  <string name="conversation_activity__compose_description">編輯簡訊</string>
+  <string name="conversation_activity__emoji_toggle_description">叫出「表情符號」列表</string>
+  <string name="conversation_activity__attachment_thumbnail">附件縮略圖</string>
+  <string name="conversation_activity__quick_attachment_drawer_toggle_description">切換附件抽屜</string>
+  <!--conversation_input_panel-->
+  <string name="conversation_input_panel__slide_to_cancel">滑動以取消</string>
+  <!--conversation_item-->
+  <string name="conversation_item__mms_downloading_description">正在下載媒體訊息</string>
+  <string name="conversation_item__mms_image_description">媒體訊息</string>
+  <string name="conversation_item__secure_message_description">安全的訊息</string>
+  <!--conversation_item_sent-->
+  <string name="conversation_item_sent__download">下載</string>
+  <string name="conversation_item_sent__downloading">正在下載</string>
+  <string name="conversation_item_sent__send_failed_indicator_description">傳送失敗</string>
+  <string name="conversation_item_sent__pending_approval_description">等待核准</string>
+  <string name="conversation_item_sent__delivered_description">已傳送</string>
+  <!--conversation_item_received-->
+  <string name="conversation_item_received__download">下載</string>
+  <string name="conversation_item_received__contact_photo_description">連絡人的相片</string>
+  <string name="conversation_item_received__downloading">下載中...</string>
+  <!--conversation_fragment_cab-->
+  <string name="conversation_fragment_cab__batch_selection_mode">批次選擇模式</string>
+  <string name="conversation_fragment_cab__batch_selection_amount">%s 已選</string>
+  <!--country_selection_fragment-->
+  <string name="country_selection_fragment__loading_countries">載入國家清單中...</string>
+  <string name="country_selection_fragment__search">搜尋</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">掃描設備上顯示的二維碼以便連接</string>
+  <!--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>
+  <!--log_submit_activity-->
+  <string name="log_submit_activity__log_fetch_failed">無法從您的裝置上取得紀錄資料。 您還是可以改透過 ADB 來擷取除錯記錄檔。</string>
+  <string name="log_submit_activity__thanks">感謝您的協助！</string>
+  <string name="log_submit_activity__submitting">上傳中</string>
+  <string name="log_submit_activity__posting_logs">正在把登錄資料轉貼到gist上...</string>
+  <!--database_migration_activity-->
+  <string name="database_migration_activity__would_you_like_to_import_your_existing_text_messages">您想要把已存在的訊息匯入 Signal 的加密數據庫嗎？</string>
+  <string name="database_migration_activity__the_default_system_database_will_not_be_modified">裝置上預設的資料庫將不會被做任何修改或變更。</string>
+  <string name="database_migration_activity__skip">略過</string>
+  <string name="database_migration_activity__import">匯入</string>
+  <string name="database_migration_activity__this_could_take_a_moment_please_be_patient">這可能花上一點時間處理。請耐心等候，當匯入完成我們將告知您。</string>
+  <string name="database_migration_activity__importing">匯入中</string>
+  <!--database_upgrade_activity-->
+  <string name="database_upgrade_activity__updating_database">更新資料庫...</string>
+  <string name="export_fragment__export_plaintext_backup">匯出未加密的備份資料</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">匯出兼容於“SMS Backup &amp; Restore”的純文字格式至儲存空間。</string>
+  <string name="import_fragment__import_system_sms_database">匯入裝置上的手機簡訊</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">從系統預設訊息程序匯入數據庫</string>
+  <string name="import_fragment__restore_encrypted_backup">自加密的備份資料庫中還原</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">還原前一個匯出的 Signal 加密備份資料庫</string>
+  <string name="import_fragment__import_plaintext_backup">匯入未加密的資料備份</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">匯入一個純文字格式備份。兼容於“SMS Backup &amp; Restore.”</string>
+  <!--load_more_header-->
+  <string name="load_more_header__see_full_conversation">查看完整對話</string>
+  <!--media_overview_activity-->
+  <string name="media_overview_activity__no_images">無圖片</string>
+  <!--message_recipients_list_item-->
+  <string name="message_recipients_list_item__verify">驗證</string>
+  <string name="message_recipients_list_item__resend">重新發送</string>
+  <!--MmsPreferencesFragment-->
+  <string name="MmsPreferencesFragment__manual_mms_settings_are_required">您的手機需要手動設定 MMS多媒體簡訊。</string>
+  <string name="MmsPreferencesFragment__enabled">啓用</string>
+  <string name="MmsPreferencesFragment__disabled">停用</string>
+  <string name="MmsPreferencesFragment__not_set">未設置</string>
+  <string name="MmsPreferencesFragment__invalid_uri">輸入的文字並非真實的 URI</string>
+  <string name="MmsPreferencesFragment__invalid_host">輸入的文字並非真實的主機</string>
+  <!--GroupUtil-->
+  <plurals name="GroupUtil_joined_the_group">
+    <item quantity="other">%1$s 加入了群組。</item>
+  </plurals>
+  <string name="GroupUtil_group_updated">群組已更新。</string>
+  <string name="GroupUtil_group_name_is_now">群組現在名爲 \'%1$s\'。</string>
+  <!--prompt_passphrase_activity-->
+  <string name="prompt_passphrase_activity__unlock">解鎖</string>
+  <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal 需要多媒體簡訊設定以通過運營商傳輸媒體與群組訊息。您的設備沒有所需的信息，有可能是由於設備被鎖定或者訪問受到限制。</string>
+  <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">傳送媒體檔案或群組訊息，請按下 \"OK\" 並完成必要的設定。您所使用電信業者相關的MMS多媒體簡訊設定可能羅列在 \'無線與網路／行動網路\'的設定項目內。且您只需設定一次。</string>
+  <!--recipient_preferences_activity-->
+  <string name="recipient_preference_activity__blocked">已封鎖</string>
+  <!--recipient_preferences-->
+  <string name="recipient_preferences__mute_conversation">靜音對話</string>
+  <string name="recipient_preferences__disable_notifications_for_this_conversation">停用此對話通知提示</string>
+  <string name="recipient_preferences__notification_sound">通知提示音</string>
+  <string name="recipient_preferences__vibrate">震動</string>
+  <string name="recipient_preferences__block">封鎖</string>
+  <string name="recipient_preferences__color">顏色</string>
+  <string name="recipient_preferences__color_for_this_contact">此聯絡人的顏色</string>
+  <string name="recipient_preferences__verify_identity">驗證身份</string>
+  <!--- redphone_call_controls-->
+  <string name="redphone_call_card__signal_call">Signal 通話</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">Signal 通話</string>
+  <!--registration_activity-->
+  <string name="registration_activity__verify_your_number_to_connect_with_signal">
+驗證您的手機號碼以連接 Signal。</string>
+  <string name="registration_activity__your_country">您的國家／區域</string>
+  <string name="registration_activity__your_country_code_and_phone_number">您的國碼與
+手機號碼</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">註冊過程中將會傳送某些您手機上的連絡人資訊到我們的伺服器端。不過它們不會被保存在伺服器上。</string>
+  <string name="registration_activity__powered_by_twilio">來自 twilio</string>
+  <!--registration_problems-->
+  <string name="registration_problems__some_possible_problems_include">某些可能的問題
+包含：</string>
+  <string name="registration_problems__sms_interceptors">手機簡訊攔截</string>
+  <string name="registration_problems__some_third_party_text_messaging_clients_such_as_handcent">
+一些第三方的簡訊客戶端，例如 Handcent 或 GoSMS，
+可能會攔截所有的簡訊訊息。如果您收到一個內容
+包含“您的 Signal 驗證碼：”（Your Signal verification code:），您則需要設置
+第三方簡訊應用允許簡訊通過。</string>
+  <string name="registration_problems__incorrect_number">手機號碼不正確</string>
+  <string name="registration_problems__please_checkt_to_make_sure_you_entered_your_number_correctly">
+請再確認您輸入的號碼的正確性，並且依照您所處的位置
+給予正確的區碼／國碼。</string>
+  <string name="registration_problems__google_voice">Google 語音輸入</string>
+  <string name="registration_problems__signal_will_not_work_with_google_voice_numbers">Signal 無法利用 Google語音輸入來撥號。</string>
+  <!--registration_progress_activity-->
+  <string name="registration_progress_activity__voice_verification">語音認證</string>
+  <string name="registration_progress_activity__signal_can_also_call_you_to_verify_your_number">
+Signal 也可撥出電話到您的手機並告知您驗證碼。 按下 \'打給我\' 並且輸入您聽到的 6 位數
+驗證碼。</string>
+  <string name="registration_progress_activity__verify">驗證</string>
+  <string name="registration_progress_activity__call_me">打給我</string>
+  <string name="registration_progress_activity__edit_number">輸入號碼</string>
+  <string name="registration_progress_activity__connectivity_error">連線失敗。</string>
+  <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal 無法連接到伺服器。</string>
+  <string name="registration_progress_activity__some_possible_problems_include">幾個可能的
+問題點，包含:</string>
+  <string name="registration_progress_activity__no_network_connectivity">沒有網路
+連線可用。</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">您的
+設備需要連接網絡以便使用 Signal 功能。請確保
+已連接移動數據或 Wi-Fi 網絡。</string>
+  <string name="registration_progress_activity__restrictive_firewall">已被防火牆限制。</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
+如果您已連接到了 Wi-Fi，有可能是防火牆阻止了您訪問
+ Signal 伺服器。請嘗試使用另一個網絡或移動數據。</string>
+  <string name="registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+Signal 將會自動通過簡訊訊息自動驗證您的手機號碼。</string>
+  <string name="registration_progress_activity__connecting">連線中...</string>
+  <string name="registration_progress_activity__waiting_for_sms_verification">等待手機簡訊
+驗證中...</string>
+  <string name="registration_progress_activity__registering_with_server">透過伺服器來進行註冊...</string>
+  <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">這
+可能花上一點時間。請耐心等候，將流程完成時，我們將告知您。</string>
+  <string name="registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message">
+Signal 在等待簡訊驗證時超時。</string>
+  <string name="registration_progress_activity__sms_verification_failed">手機簡訊驗證
+已失敗。</string>
+  <string name="registration_progress_activity__generating_keys">產生新的金鑰中...</string>
+  <string name="registration_progress_activity__alert">警告</string>
+  <string name="registration_progress_activity__telephone">電話</string>
+  <string name="registration_progress_activity__check">檢查</string>
+  <!--recipients_panel-->
+  <string name="recipients_panel__to"><small>輸入名稱或手機號碼</small></string>
+  <string name="recipients_panel__add_member">新增成員</string>
+  <!--verify_identity_activity-->
+  <string name="verify_identity_activity__their_identity_they_read">他們的身份 (請他們唸出)</string>
+  <string name="verify_identity_activity__your_identity_you_read">你的驗證碼 (你自己唸出)</string>
+  <!--message_details_header-->
+  <string name="message_details_header__issues_need_your_attention">一些問題需要您的注意。</string>
+  <string name="message_details_header__sent">發送</string>
+  <string name="message_details_header__received">接受</string>
+  <string name="message_details_header__via">來自</string>
+  <string name="message_details_header__to">到：</string>
+  <string name="message_details_header__from">來自：</string>
+  <string name="message_details_header__with">與：</string>
+  <!--AndroidManifest.xml-->
+  <string name="AndroidManifest__create_passphrase">新增『自訂密碼』</string>
+  <string name="AndroidManifest__enter_passphrase">輸入『自訂密碼』</string>
+  <string name="AndroidManifest__select_contacts">選擇多個連絡人</string>
+  <string name="AndroidManifest__signal_detected">已偵測到 Signal</string>
+  <string name="AndroidManifest__public_identity_key">公鑰／公開金鑰</string>
+  <string name="AndroidManifest__change_passphrase">變更『自訂密碼』</string>
+  <string name="AndroidManifest__verify_identity">驗證身分</string>
+  <string name="AndroidManifest__log_submit">送出偵錯紀錄</string>
+  <string name="AndroidManifest__media_preview">媒體預覽</string>
+  <string name="AndroidManifest__media_overview">所有圖片</string>
+  <string name="AndroidManifest__media_overview_named">所有圖片與 %1$s</string>
+  <string name="AndroidManifest__message_details">訊息細節</string>
+  <string name="AndroidManifest_manage_linked_devices">管理已連接設備</string>
+  <string name="AndroidManifest__invite_friends">邀請好友</string>
+  <string name="AndroidManifest_conversations_archive">對話存檔</string>
+  <!--arrays.xml-->
+  <string name="arrays__import_export">匯入／匯出</string>
+  <string name="arrays__your_identity_key">您的身份密鑰</string>
+  <string name="arrays__use_default">使用預設</string>
+  <string name="arrays__use_custom">使用定製</string>
+  <string name="arrays__mute_for_one_hour">靜音 1 小時</string>
+  <string name="arrays__mute_for_two_hours">靜音 2 小時</string>
+  <string name="arrays__mute_for_one_day">靜音 1 天</string>
+  <string name="arrays__mute_for_seven_days">靜音 7 天</string>
+  <string name="arrays__mute_for_one_year">靜音 1 年</string>
+  <string name="arrays__settings_default">預設設定</string>
+  <string name="arrays__enabled">啓用</string>
+  <string name="arrays__disabled">停用</string>
+  <string name="arrays__name_and_message">名字與訊息</string>
+  <string name="arrays__name_only">僅名字</string>
+  <string name="arrays__no_name_or_message">沒有名字或訊息</string>
+  <string name="arrays__images">圖片</string>
+  <string name="arrays__audio">音訊</string>
+  <string name="arrays__video">影片</string>
+  <!--plurals.xml-->
+  <plurals name="hours_ago">
+    <item quantity="other">%d 小時</item>
+  </plurals>
+  <!--preferences.xml-->
+  <string name="preferences__general">一般</string>
+  <string name="preferences__sms_mms">簡訊與多媒體簡訊</string>
+  <string name="preferences__pref_all_sms_title">接收所有手機簡訊</string>
+  <string name="preferences__pref_all_mms_title">接收所有MMS多媒體簡訊</string>
+  <string name="preferences__use_signal_for_viewing_and_storing_all_incoming_text_messages">使用 Signal 接收所有簡訊</string>
+  <string name="preferences__use_signal_for_viewing_and_storing_all_incoming_multimedia_messages">使用 Signal 接收所有多媒體簡訊</string>
+  <string name="preferences__input_settings">輸入設定</string>
+  <string name="preferences__enable_enter_key_title">啟用 Enter 鍵</string>
+  <string name="preferences__replace_smiley_with_enter_key">把介面上的表情符號按鈕，換成 Enter 按鈕</string>
+  <string name="preferences__pref_enter_sends_title">啟用 按 Enter 鍵 就送出訊息</string>
+  <string name="preferences__pressing_the_enter_key_will_send_text_messages">若按下 Enter 鍵，不會換行，而是直接把訊息送出</string>
+  <string name="preferences__display_settings">顯示設定</string>
+  <string name="preferences__choose_identity">選擇身份識別</string>
+  <string name="preferences__choose_your_contact_entry_from_the_contacts_list">從您的連絡人清單中選擇連絡人。</string>
+  <string name="preferences__change_passphrase">變更『自訂密碼』</string>
+  <string name="preferences__change_your_passphrase">變更您的『自訂密碼』</string>
+  <string name="preferences__enable_passphrase">啓用『自訂密碼』</string>
+  <string name="preferences__passphrase_summary">『自訂密碼』 %s</string>
+  <string name="preferences__enable_lock_screen_for_messages">啓用訊息鎖屏</string>
+  <string name="preferences__screen_security">螢幕安全設定</string>
+  <string name="preferences__screen_security_summary">熒幕安全設定 %s</string>
+  <string name="preferences__disable_screen_security_to_allow_screen_shots">停用畫面擷取功能，在對話清單或APP內</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">若閒置太久沒用，讓『自訂密碼』自動幫 TextSecure上鎖</string>
+  <string name="preferences__timeout_passphrase">『自訂密碼』上鎖倒數</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">選擇『自訂密碼』上鎖倒數的區間</string>
+  <string name="preferences__pref_timeout_interval_title">倒數時間</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">等候『自訂密碼』幫 TextSecure 上鎖的等候時間</string>
+  <string name="preferences__notifications">通知</string>
+  <string name="preferences__enable_message_notifications">啓用訊息通知</string>
+  <string name="preferences__led_color">LED燈號顏色</string>
+  <string name="preferences__led_color_unknown">未知</string>
+  <string name="preferences__pref_led_blink_title">LED 閃爍模式</string>
+  <string name="preferences__pref_led_blink_custom_pattern_title">自訂 LED 閃爍模式</string>
+  <string name="preferences__pref_led_blink_custom_pattern_on_for">開啟，當:</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>
+  <string name="preferences__repeat_alerts">重複警報</string>
+  <string name="preferences__never">永不</string>
+  <string name="preferences__one_time">一次</string>
+  <string name="preferences__two_times">兩次</string>
+  <string name="preferences__three_times">三次</string>
+  <string name="preferences__five_times">五次</string>
+  <string name="preferences__ten_times">十次</string>
+  <string name="preferences__vibrate">震動</string>
+  <string name="preferences__also_vibrate_when_notified">通知時一併啟用震動</string>
+  <string name="preferences__minutes">分</string>
+  <string name="preferences__hours">小時</string>
+  <string name="preferences__green">綠色</string>
+  <string name="preferences__red">紅色</string>
+  <string name="preferences__blue">藍色</string>
+  <string name="preferences__orange">橘色</string>
+  <string name="preferences__cyan">青色</string>
+  <string name="preferences__magenta">洋紅色</string>
+  <string name="preferences__white">白色</string>
+  <string name="preferences__none">無</string>
+  <string name="preferences__fast">快速</string>
+  <string name="preferences__normal">正常</string>
+  <string name="preferences__slow">緩慢</string>
+  <string name="preferences__custom">自訂</string>
+  <string name="preferences__advanced">進階</string>
+  <string name="preferences__privacy">隱私</string>
+  <string name="preferences__mms_user_agent">多媒體用戶代理</string>
+  <string name="preferences__advanced_mms_access_point_names">手動多媒體設定</string>
+  <string name="preferences__enable_manual_mms">使用手動多媒體設定</string>
+  <string name="preferences__override_system_mms_settings">您可自訂 MMS多媒體簡訊設定，並覆蓋過系統的預設值。</string>
+  <string name="preferences__mmsc_url">MMSC URL</string>
+  <string name="preferences__mms_proxy_host">多媒體代理地址</string>
+  <string name="preferences__mms_proxy_port">多媒體代理端口</string>
+  <string name="preferences__mmsc_username">MMSC 用戶名</string>
+  <string name="preferences__mmsc_password">MMSC 密碼</string>
+  <string name="preferences__sms_delivery_reports">手機簡訊傳送狀態報告</string>
+  <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">針對每則手機簡訊都要求回覆傳送報告</string>
+  <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">當對話群組超過一定長度時自動刪除舊的簡訊</string>
+  <string name="preferences__delete_old_messages">刪除舊的簡訊</string>
+  <string name="preferences__chats">聊天與媒體</string>
+  <string name="preferences__conversation_length_limit">對話群組長度上限</string>
+  <string name="preferences__trim_all_conversations_now">現在開始精簡所有的對話群組</string>
+  <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">這會掃描目前所有的對話群組，並且強制刪除超過長度上限的部分。</string>
+  <string name="preferences__devices">設備</string>
+  <string name="preferences__light_theme">明亮</string>
+  <string name="preferences__dark_theme">黑暗</string>
+  <string name="preferences__appearance">介面設定</string>
+  <string name="preferences__theme">主題</string>
+  <string name="preferences__theme_summary">主題 %s</string>
+  <string name="preferences__default">預設</string>
+  <string name="preferences__language">語言選項</string>
+  <string name="preferences__language_summary">語言 %s</string>
+  <string name="preferences__signal_messages_and_calls">Signal訊息與通話</string>
+  <string name="preferences__free_private_messages_and_calls">免費加密訊息與通話至Signal用戶</string>
+  <string name="preferences__submit_debug_log">送出偵錯紀錄</string>
+  <string name="preferences__support_wifi_calling">“WiFi 呼叫”兼容模式</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">如果您的設備使用 WiFi 發送簡訊或多媒體簡訊，請啓用此選項 (僅當“WiFi 語音呼叫”在您的設備上啓用的時候才可用)</string>
+  <string name="preferences_app_protection__blocked_contacts">封鎖聯絡人</string>
+  <string name="preferences_notifications__display_in_notifications">在通知欄中顯示</string>
+  <string name="preferences_chats__when_using_mobile_data">當使用移動數據時</string>
+  <string name="preferences_chats__when_using_wifi">當使用 Wi-Fi 時</string>
+  <string name="preferences_chats__when_roaming">當漫遊時</string>
+  <string name="preferences_chats__media_auto_download">媒體自動下載</string>
+  <string name="preferences_chats__message_trimming">訊息整理</string>
+  <string name="preferences_advanced__use_system_emoji">使用系統表情符號</string>
+  <string name="preferences_advanced__disable_signal_built_in_emoji_support">禁用 Signal 內置的表情支持</string>
+  <!--****************************************-->
+  <!--menus-->
+  <!--****************************************-->
+  <!--contact_selection_list-->
+  <string name="contact_selection_list__menu_select_all">全選</string>
+  <string name="contact_selection_list__menu_unselect_all">取消全選</string>
+  <string name="contact_selection_list__header_signal_users">SIGNAL 用戶</string>
+  <string name="contact_selection_list__header_other">所有使用者</string>
+  <string name="contact_selection_list__unknown_contact">傳送新訊息給...</string>
+  <!--contact_selection-->
+  <string name="contact_selection__menu_finished">完成</string>
+  <!--refreshing push directory from menu-->
+  <string name="push_directory__menu_refresh">更新連絡人清單</string>
+  <!--conversation_callable_insecure-->
+  <string name="conversation_callable_insecure__menu_call">撥出</string>
+  <!--conversation_callable_secure-->
+  <string name="conversation_callable_secure__menu_call">Signal 通話</string>
+  <!--conversation_context-->
+  <string name="conversation_context__menu_message_details">訊息細節</string>
+  <string name="conversation_context__menu_copy_text">複製文字</string>
+  <string name="conversation_context__menu_delete_message">刪除訊息</string>
+  <string name="conversation_context__menu_forward_message">轉寄訊息</string>
+  <string name="conversation_context__menu_resend_message">重送訊息</string>
+  <!--conversation_context_image-->
+  <string name="conversation_context_image__save_attachment">另存附件檔案</string>
+  <!--conversation_insecure-->
+  <string name="conversation_insecure__invite">邀請</string>
+  <!--conversation_insecure_no_push-->
+  <string name="conversation_insecure__security">安全設定</string>
+  <!--conversation_list_batch-->
+  <string name="conversation_list_batch__menu_delete_selected">刪除已選項目</string>
+  <string name="conversation_list_batch__menu_select_all">全選</string>
+  <string name="conversation_list_batch_archive__menu_archive_selected">已選擇存檔</string>
+  <string name="conversation_list_batch_unarchive__menu_unarchive_selected">取消存檔已選擇的</string>
+  <!--conversation_list-->
+  <string name="conversation_list__menu_search">搜尋</string>
+  <!--conversation_list_item_view-->
+  <string name="conversation_list_item_view__contact_photo_image">聯絡人照片</string>
+  <string name="conversation_list_item_view__error_alert">錯誤警報</string>
+  <string name="conversation_list_item_view__archived">存檔</string>
+  <!--conversation_list_fragment-->
+  <string name="conversation_list_fragment__fab_content_description">新對話</string>
+  <!--conversation_secure_verified-->
+  <string name="conversation_secure_verified__menu_security">安全設定</string>
+  <string name="conversation_secure_verified__menu_verify_identity">驗證身分</string>
+  <string name="conversation_secure_verified__menu_reset_secure_session">重置安全連線</string>
+  <!--conversation_muted-->
+  <string name="conversation_muted__unmute">接觸靜音</string>
+  <!--conversation_unmuted-->
+  <string name="conversation_unmuted__mute_notifications">靜音通知</string>
+  <!--conversation-->
+  <string name="conversation__menu_add_attachment">增加附件檔案</string>
+  <string name="conversation__menu_update_group">更新群組</string>
+  <string name="conversation__menu_leave_group">離開對話群組</string>
+  <string name="conversation__menu_delete_thread">刪除對話</string>
+  <string name="conversation__menu_view_media">所有圖片</string>
+  <string name="conversation__menu_conversation_settings">對話設定</string>
+  <!--conversation_popup-->
+  <string name="conversation_popup__menu_expand_popup">展開彈窗</string>
+  <!--conversation_callable_insecure-->
+  <string name="conversation_add_to_contacts__menu_add_to_contacts">添加至聯絡人</string>
+  <!--conversation_group_options-->
+  <string name="convesation_group_options__recipients_list">收件人清單</string>
+  <string name="conversation_group_options__delivery">傳送</string>
+  <string name="conversation_group_options__conversation">對話</string>
+  <string name="conversation_group_options__broadcast">訊息廣播</string>
+  <!--key_scanning-->
+  <string name="key_scanning__menu_compare">比對</string>
+  <string name="key_scanning__menu_get_scanned_to_compare">掃描並且進行比對</string>
+  <string name="key_scanning__menu_scan_to_compare">掃描以比對</string>
+  <!--text_secure_normal-->
+  <string name="text_secure_normal__menu_new_message">新訊息</string>
+  <string name="text_secure_normal__menu_new_group">新增群組</string>
+  <string name="text_secure_normal__menu_settings">設定</string>
+  <string name="text_secure_normal__menu_clear_passphrase">鎖定</string>
+  <string name="text_secure_normal__mark_all_as_read">全部標示為已讀</string>
+  <string name="text_secure_normal__invite_friends">邀請好友</string>
+  <string name="text_secure_normal__help">幫助</string>
+  <!--reminder_header-->
+  <string name="reminder_header_expired_build">您的 Signal 版本已過期！</string>
+  <string name="reminder_header_expired_build_details">您的訊息將無法成功發送，請更新至最新版本。</string>
+  <string name="reminder_header_expired_build_button">更新</string>
+  <string name="reminder_header_sms_default_title">設置爲預設簡訊應用</string>
+  <string name="reminder_header_sms_default_text">點擊將 Signal 設置爲預設的簡訊應用。</string>
+  <string name="reminder_header_sms_default_button">設置</string>
+  <string name="reminder_header_sms_import_title">導入系統簡訊</string>
+  <string name="reminder_header_sms_import_text">點擊將手機中的簡訊訊息複製至加密數據庫中。</string>
+  <string name="reminder_header_sms_import_button">導入</string>
+  <string name="reminder_header_push_title">啓用 Signal 訊息與通話</string>
+  <string name="reminder_header_push_text">升級您的通訊體驗。</string>
+  <string name="reminder_header_push_button">啓用</string>
+  <string name="reminder_header_invite_title">邀請至 Signal</string>
+  <string name="reminder_header_invite_text">與 %1$s 一同將你們的對話提升至更高的等級。</string>
+  <string name="reminder_header_invite_button">邀請</string>
+  <string name="reminder_header_share_title">邀請您的好友！</string>
+  <string name="reminder_header_share_text">當更多的朋友使用 Signal，它將變得更好。</string>
+  <string name="reminder_header_share_button">分享</string>
+  <string name="reminder_header_close_button">關閉</string>
+  <!--MediaPreviewActivity-->
+  <string name="MediaPreviewActivity_you">您</string>
+  <string name="MediaPreviewActivity_cant_display">預覽圖片失敗</string>
+  <string name="MediaPreviewActivity_unssuported_media_type">不支持的媒體類型</string>
+  <!--media_preview-->
+  <string name="media_preview__save_title">儲存</string>
+  <!--media_preview_activity-->
+  <string name="media_preview_activity__image_content_description">圖片預覽</string>
+  <!--new_conversation_activity-->
+  <string name="new_conversation_activity__refresh">刷新</string>
+  <!--redphone_audio_popup_menu-->
+  <string name="redphone_audio_popup_menu__handset">聽筒</string>
+  <string name="redphone_audio_popup_menu__headset">耳機</string>
+  <string name="redphone_audio_popup_menu__speaker">揚聲器</string>
+  <!--Trimmer-->
+  <string name="trimmer__deleting">正在刪除</string>
+  <string name="trimmer__deleting_old_messages">正在刪除舊訊息...</string>
+  <string name="trimmer__old_messages_successfully_deleted">已完成刪除舊訊息。</string>
+  <!--transport_selection_list_item-->
+  <string name="transport_selection_list_item__transport_icon">傳輸圖標</string>
+  <!--EOF-->
+</resources>

res/values/attrs.xml

@@ -139,6 +139,14 @@
         <attr name="backgroundColorHint" format="color" />
     </declare-styleable>
 
+    <declare-styleable name="DeliveryStatusView">
+        <attr name="iconColor" format="color" />
+    </declare-styleable>
+
+    <declare-styleable name="AlertView">
+        <attr name="useSmallIcon" format="boolean" />
+    </declare-styleable>
+
     <declare-styleable name="AudioView">
         <attr name="tintColor" format="color" />
     </declare-styleable>

res/values/strings.xml

@@ -11,7 +11,7 @@
     <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">You haven\'t set a passphrase yet!</string>
     <string name="ApplicationPreferencesActivity_messages_per_conversation">%s messages per conversation</string>
     <string name="ApplicationPreferencesActivity_delete_all_old_messages_now">Delete all old messages now?</string>
-    <string name="ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages">Are you sure you would like to immediately trim all conversation threads to the %s most recent messages?</string>
+    <string name="ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages">This will immediately trim all conversations to the %s most recent messages.</string>
     <string name="ApplicationPreferencesActivity_delete">Delete</string>
     <string name="ApplicationPreferencesActivity_disable_passphrase">Disable passphrase?</string>
     <string name="ApplicationPreferencesActivity_disable_lock_screen">
@@ -173,7 +173,7 @@
         <item quantity="other">This will permanently delete all %1$d selected conversations.</item>
     </plurals>
     <string name="ConversationListFragment_deleting">Deleting</string>
-    <string name="ConversationListFragment_deleting_selected_threads">Deleting selected threads...</string>
+    <string name="ConversationListFragment_deleting_selected_conversations">Deleting selected conversations...</string>
     <string name="ConversationListFragment_archived_conversations">Archived conversations</string>
     <string name="ConversationListFragment_undo">UNDO</string>
     <string name="ConversationListFragment_moved_conversation_to_inbox">Moved conversation to inbox</string>
@@ -208,6 +208,7 @@
     <string name="DeviceListItem_unnamed_device">Unnamed device</string>
     <string name="DeviceListItem_linked_s">Linked %s</string>
     <string name="DeviceListItem_last_active_s">Last active %s</string>
+    <string name="DeviceListItem_today">Today</string>
 
     <!-- ShareActivity -->
     <string name="ShareActivity_share_with">Share with</string>
@@ -372,6 +373,8 @@
     <string name="DeviceProvisioningActivity_content_progress_key_error">Invalid QR code.</string>
     <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sorry, you have too many devices linked already, try removing some...</string>
     <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Sorry, this is not a valid device link QR code.</string>
+    <string name="DeviceProvisioningActivity_link_a_signal_device">Link a Signal device?</string>
+    <string name="DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner">It looks like you\'re trying to link a Signal device using a 3rd party scanner.  For your protection, please scan the code again from within Signal.</string>
 
     <!-- PassphrasePromptActivity -->
     <string name="PassphrasePromptActivity_enter_passphrase">Enter passphrase</string>
@@ -589,7 +592,7 @@
 
     <!-- SingleRecipientNotificationBuilder -->
     <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
-    <string name="SingleRecipientNotificationBuilder_new_message">New Message!</string>
+    <string name="SingleRecipientNotificationBuilder_new_message">New message</string>
 
     <!-- attachment_type_selector -->
     <string name="attachment_type_selector__image">Image</string>
@@ -867,13 +870,13 @@
     <string name="AndroidManifest__change_passphrase">Change passphrase</string>
     <string name="AndroidManifest__verify_identity">Verify identity</string>
     <string name="AndroidManifest__log_submit">Submit debug logs</string>
-    <string name="AndroidManifest__media_preview">Media Preview</string>
+    <string name="AndroidManifest__media_preview">Media preview</string>
     <string name="AndroidManifest__media_overview">All images</string>
     <string name="AndroidManifest__media_overview_named">All images with %1$s</string>
     <string name="AndroidManifest__message_details">Message details</string>
     <string name="AndroidManifest_manage_linked_devices">Manage linked devices</string>
     <string name="AndroidManifest__invite_friends">Invite friends</string>
-    <string name="AndroidManifeset_conversations_archive">Conversations archive</string>
+    <string name="AndroidManifest_conversations_archive">Conversations archive</string>
 
     <!-- arrays.xml -->
     <string name="arrays__import_export">Import / export</string>
@@ -945,7 +948,7 @@
     <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__inthread_notifications">In-thread notifications</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>
     <string name="preferences__repeat_alerts">Repeat alerts</string>
     <string name="preferences__never">Never</string>
@@ -983,12 +986,12 @@
     <string name="preferences__mmsc_password">MMSC Password</string>
     <string name="preferences__sms_delivery_reports">SMS delivery reports</string>
     <string name="preferences__request_a_delivery_report_for_each_sms_message_you_send">Request a delivery report for each SMS message you send</string>
-    <string name="preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length">Automatically delete older messages once a conversation thread exceeds a specified length</string>
+    <string name="preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length">Automatically delete older messages once a conversation exceeds a specified length</string>
     <string name="preferences__delete_old_messages">Delete old messages</string>
     <string name="preferences__chats">Chats and media</string>
     <string name="preferences__conversation_length_limit">Conversation length limit</string>
-    <string name="preferences__trim_all_threads_now">Trim all threads now</string>
-    <string name="preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits">Scan through all conversation threads and enforce conversation length limits</string>
+    <string name="preferences__trim_all_conversations_now">Trim all conversations now</string>
+    <string name="preferences__scan_through_all_conversations_and_enforce_conversation_length_limits">Scan through all conversations and enforce conversation length limits</string>
     <string name="preferences__devices">Devices</string>
     <string name="preferences__light_theme">Light</string>
     <string name="preferences__dark_theme">Dark</string>
@@ -1055,7 +1058,8 @@
     <!-- conversation_list_batch -->
     <string name="conversation_list_batch__menu_delete_selected">Delete selected</string>
     <string name="conversation_list_batch__menu_select_all">Select all</string>
-    <string name="conversation_list_batch__archive_selected">Archive selected</string>
+    <string name="conversation_list_batch_archive__menu_archive_selected">Archive selected</string>
+    <string name="conversation_list_batch_unarchive__menu_unarchive_selected">Unarchive selected</string>
 
     <!-- conversation_list -->
     <string name="conversation_list__menu_search">Search</string>
@@ -1143,7 +1147,7 @@
     <string name="media_preview__save_title">Save</string>
 
     <!-- media_preview_activity -->
-    <string name="media_preview_activity__image_content_description">Image Preview</string>
+    <string name="media_preview_activity__image_content_description">Image preview</string>
 
     <!-- new_conversation_activity -->
     <string name="new_conversation_activity__refresh">Refresh</string>

res/values/styles.xml

@@ -31,7 +31,6 @@
         <item name="android:icon">@drawable/actionbar_icon_holo_dark</item>
         <item name="icon">@drawable/actionbar_icon_holo_dark</item>
         <item name="background">@color/gray95</item>
-        <item name="android:background">@color/gray95</item>
         <item name="logo">@drawable/actionbar_icon_holo_dark</item>
         <item name="android:popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>

res/values/themes.xml

@@ -34,6 +34,7 @@
         <item name="actionBarStyle">@style/TextSecure.FlatLightActionBar</item>
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="android:windowBackground">@color/signal_primary</item>
+        <item name="android:windowContentOverlay">@null</item>
         <item name="colorButtonNormal">@color/white</item>
     </style>
 

res/xml/preferences_chats.xml

@@ -31,7 +31,7 @@
         <org.thoughtcrime.securesms.components.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="pref_trim_threads"
-            android:summary="@string/preferences__automatically_delete_older_messages_once_a_conversation_thread_exceeds_a_specified_length"
+            android:summary="@string/preferences__automatically_delete_older_messages_once_a_conversation_exceeds_a_specified_length"
             android:title="@string/preferences__delete_old_messages" />
 
         <EditTextPreference android:defaultValue="500"
@@ -41,8 +41,8 @@
                             android:dependency="pref_trim_threads" />
 
         <Preference android:key="pref_trim_now"
-                    android:title="@string/preferences__trim_all_threads_now"
-                    android:summary="@string/preferences__scan_through_all_conversation_threads_and_enforce_conversation_length_limits"
+                    android:title="@string/preferences__trim_all_conversations_now"
+                    android:summary="@string/preferences__scan_through_all_conversations_and_enforce_conversation_length_limits"
                     android:dependency="pref_trim_threads" />
     </PreferenceCategory>
 </PreferenceScreen>

res/xml/preferences_notifications.xml

@@ -37,7 +37,7 @@
         android:entryValues="@array/pref_led_blink_pattern_values" />
 
     <CheckBoxPreference android:key="pref_key_inthread_notifications"
-                        android:title="@string/preferences__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" />

src/org/thoughtcrime/securesms/ConversationActivity.java

@@ -163,6 +163,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   public static final String RECIPIENTS_EXTRA        = "recipients";
   public static final String THREAD_ID_EXTRA         = "thread_id";
+  public static final String IS_ARCHIVED_EXTRA       = "is_archived";
   public static final String TEXT_EXTRA              = "draft_text";
   public static final String DISTRIBUTION_TYPE_EXTRA = "distribution_type";
 
@@ -199,6 +200,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   private Recipients recipients;
   private long       threadId;
   private int        distributionType;
+  private boolean    archived;
   private boolean    isSecureText;
   private boolean    isSecureVoice;
   private boolean    isMmsEnabled = true;
@@ -426,7 +428,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
   //////// Event Handlers
 
   private void handleReturnToConversationList() {
-    Intent intent = new Intent(this, ConversationListActivity.class);
+    Intent intent = new Intent(this, (archived ? ConversationListArchiveActivity.class : ConversationListActivity.class));
     intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
     startActivity(intent);
     finish();
@@ -917,6 +919,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     
     recipients       = RecipientFactory.getRecipientsForIds(this, getIntent().getLongArrayExtra(RECIPIENTS_EXTRA), true);
     threadId         = getIntent().getLongExtra(THREAD_ID_EXTRA, -1);
+    archived         = getIntent().getBooleanExtra(IS_ARCHIVED_EXTRA, false);
     distributionType = getIntent().getIntExtra(DISTRIBUTION_TYPE_EXTRA, ThreadDatabase.DistributionTypes.DEFAULT);
 
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) {

src/org/thoughtcrime/securesms/ConversationItem.java

@@ -23,7 +23,6 @@ import android.content.Intent;
 import android.content.res.TypedArray;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
-import android.os.Build;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AlertDialog;
@@ -31,7 +30,6 @@ import android.text.TextUtils;
 import android.text.util.Linkify;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
@@ -42,6 +40,8 @@ import android.widget.Toast;
 
 import org.thoughtcrime.securesms.components.AudioView;
 import org.thoughtcrime.securesms.components.AvatarImageView;
+import org.thoughtcrime.securesms.components.DeliveryStatusView;
+import org.thoughtcrime.securesms.components.AlertView;
 import org.thoughtcrime.securesms.components.ThumbnailView;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
@@ -90,22 +90,18 @@ public class ConversationItem extends LinearLayout
   private boolean       groupThread;
   private Recipient     recipient;
 
-  private View            bodyBubble;
-  private TextView        bodyText;
-  private TextView        dateText;
-  private TextView        indicatorText;
-  private TextView        groupStatusText;
-  private ImageView       secureImage;
-  private AvatarImageView contactPhoto;
-  private ImageView       failedIndicator;
-  private ImageView       deliveredIndicator;
-  private ImageView       sentIndicator;
-  private View            pendingIndicator;
-  private ImageView       pendingApprovalIndicator;
+  private View               bodyBubble;
+  private TextView           bodyText;
+  private TextView           dateText;
+  private TextView           indicatorText;
+  private TextView           groupStatusText;
+  private ImageView          secureImage;
+  private AvatarImageView    contactPhoto;
+  private DeliveryStatusView deliveryStatusIndicator;
+  private AlertView          alertView;
 
   private @NonNull  Set<MessageRecord>  batchSelected = new HashSet<>();
   private @Nullable Recipients          conversationRecipients;
-  private @NonNull  StatusManager       statusManager;
   private @NonNull  ThumbnailView       mediaThumbnail;
   private @NonNull  AudioView           audioView;
   private @NonNull  Button              mmsDownloadButton;
@@ -136,31 +132,20 @@ public class ConversationItem extends LinearLayout
     super.onFinishInflate();
 
     initializeAttributes();
-    ViewGroup pendingIndicatorStub = (ViewGroup) findViewById(R.id.pending_indicator_stub);
 
-    if (pendingIndicatorStub != null) {
-      LayoutInflater inflater = LayoutInflater.from(context);
-      if (Build.VERSION.SDK_INT >= 11) inflater.inflate(R.layout.conversation_item_pending_v11, pendingIndicatorStub, true);
-      else                             inflater.inflate(R.layout.conversation_item_pending, pendingIndicatorStub, true);
-    }
-
-    this.bodyText                 = (TextView)        findViewById(R.id.conversation_item_body);
-    this.dateText                 = (TextView)        findViewById(R.id.conversation_item_date);
-    this.indicatorText            = (TextView)        findViewById(R.id.indicator_text);
-    this.groupStatusText          = (TextView)        findViewById(R.id.group_message_status);
-    this.secureImage              = (ImageView)       findViewById(R.id.secure_indicator);
-    this.failedIndicator          = (ImageView)       findViewById(R.id.sms_failed_indicator);
-    this.mmsDownloadButton        = (Button)          findViewById(R.id.mms_download_button);
-    this.mmsDownloadingLabel      = (TextView)        findViewById(R.id.mms_label_downloading);
-    this.contactPhoto             = (AvatarImageView) findViewById(R.id.contact_photo);
-    this.deliveredIndicator       = (ImageView)       findViewById(R.id.delivered_indicator);
-    this.sentIndicator            = (ImageView)       findViewById(R.id.sent_indicator);
-    this.bodyBubble               =                   findViewById(R.id.body_bubble);
-    this.pendingApprovalIndicator = (ImageView)       findViewById(R.id.pending_approval_indicator);
-    this.pendingIndicator         =                   findViewById(R.id.pending_indicator);
-    this.mediaThumbnail           = (ThumbnailView)   findViewById(R.id.image_view);
-    this.audioView                = (AudioView)       findViewById(R.id.audio_view);
-    this.statusManager            = new StatusManager(pendingIndicator, sentIndicator, deliveredIndicator, failedIndicator, pendingApprovalIndicator);
+    this.bodyText                = (TextView)           findViewById(R.id.conversation_item_body);
+    this.dateText                = (TextView)           findViewById(R.id.conversation_item_date);
+    this.indicatorText           = (TextView)           findViewById(R.id.indicator_text);
+    this.groupStatusText         = (TextView)           findViewById(R.id.group_message_status);
+    this.secureImage             = (ImageView)          findViewById(R.id.secure_indicator);
+    this.deliveryStatusIndicator = (DeliveryStatusView) findViewById(R.id.delivery_status);
+    this.alertView               = (AlertView)          findViewById(R.id.indicators_parent);
+    this.mmsDownloadButton       = (Button)             findViewById(R.id.mms_download_button);
+    this.mmsDownloadingLabel     = (TextView)           findViewById(R.id.mms_label_downloading);
+    this.contactPhoto            = (AvatarImageView)    findViewById(R.id.contact_photo);
+    this.bodyBubble              =                      findViewById(R.id.body_bubble);
+    this.mediaThumbnail          = (ThumbnailView)      findViewById(R.id.image_view);
+    this.audioView               = (AudioView)          findViewById(R.id.audio_view);
 
     setOnClickListener(new ClickListener(null));
     PassthroughClickListener        passthroughClickListener = new PassthroughClickListener();
@@ -334,16 +319,25 @@ public class ConversationItem extends LinearLayout
 
     dateText.setText(DateUtils.getExtendedRelativeTimeSpanString(getContext(), locale, timestamp));
 
-    if      (messageRecord.isFailed())                     setFailedStatusIcons();
-    else if (messageRecord.isPendingInsecureSmsFallback()) setFallbackStatusIcons();
-    else if (messageRecord.isPending())                    statusManager.displayPending();
-    else if (messageRecord.isDelivered())                  statusManager.displayDelivered();
-    else                                                   statusManager.displaySent();
+    if (messageRecord.isFailed()) {
+      setFailedStatusIcons();
+    } else if (messageRecord.isPendingInsecureSmsFallback()) {
+      setFallbackStatusIcons();
+    } else {
+      alertView.setNone();
+
+      if      (!messageRecord.isOutgoing()) deliveryStatusIndicator.setNone();
+      else if (messageRecord.isPending())   deliveryStatusIndicator.setPending();
+      else if (messageRecord.isDelivered()) deliveryStatusIndicator.setDelivered();
+      else                                  deliveryStatusIndicator.setSent();
+    }
   }
 
   private void setFailedStatusIcons() {
-    statusManager.displayFailed();
+    alertView.setFailed();
+    deliveryStatusIndicator.setNone();
     dateText.setText(R.string.ConversationItem_error_not_delivered);
+
     if (messageRecord.isOutgoing()) {
       indicatorText.setText(R.string.ConversationItem_click_for_details);
       indicatorText.setVisibility(View.VISIBLE);
@@ -351,7 +345,8 @@ public class ConversationItem extends LinearLayout
   }
 
   private void setFallbackStatusIcons() {
-    statusManager.displayPendingApproval();
+    alertView.setPendingApproval();
+    deliveryStatusIndicator.setNone();
     indicatorText.setVisibility(View.VISIBLE);
     indicatorText.setText(R.string.ConversationItem_click_to_approve_unencrypted);
   }
@@ -612,72 +607,4 @@ public class ConversationItem extends LinearLayout
     builder.show();
   }
 
-  private static class StatusManager {
-
-    private final View pendingIndicator;
-    private final View sentIndicator;
-    private final View deliveredIndicator;
-
-    private final View failedIndicator;
-    private final View approvalIndicator;
-
-
-    public StatusManager(View pendingIndicator, View sentIndicator,
-                         View deliveredIndicator, View failedIndicator,
-                         View approvalIndicator)
-    {
-      this.pendingIndicator   = pendingIndicator;
-      this.sentIndicator      = sentIndicator;
-      this.deliveredIndicator = deliveredIndicator;
-      this.failedIndicator    = failedIndicator;
-      this.approvalIndicator  = approvalIndicator;
-    }
-
-    public void displayFailed() {
-      pendingIndicator.setVisibility(View.GONE);
-      sentIndicator.setVisibility(View.GONE);
-      deliveredIndicator.setVisibility(View.GONE);
-      approvalIndicator.setVisibility(View.GONE);
-
-      failedIndicator.setVisibility(View.VISIBLE);
-    }
-
-    public void displayPendingApproval() {
-      pendingIndicator.setVisibility(View.GONE);
-      sentIndicator.setVisibility(View.GONE);
-      deliveredIndicator.setVisibility(View.GONE);
-      failedIndicator.setVisibility(View.GONE);
-
-      approvalIndicator.setVisibility(View.VISIBLE);
-    }
-
-    public void displayPending() {
-      sentIndicator.setVisibility(View.GONE);
-      deliveredIndicator.setVisibility(View.GONE);
-      failedIndicator.setVisibility(View.GONE);
-      approvalIndicator.setVisibility(View.GONE);
-
-      pendingIndicator.setVisibility(View.VISIBLE);
-    }
-
-    public void displaySent() {
-      pendingIndicator.setVisibility(View.GONE);
-      deliveredIndicator.setVisibility(View.GONE);
-      failedIndicator.setVisibility(View.GONE);
-      approvalIndicator.setVisibility(View.GONE);
-
-      sentIndicator.setVisibility(View.VISIBLE);
-    }
-
-    public void displayDelivered() {
-      pendingIndicator.setVisibility(View.GONE);
-      failedIndicator.setVisibility(View.GONE);
-      approvalIndicator.setVisibility(View.GONE);
-      sentIndicator.setVisibility(View.GONE);
-
-      deliveredIndicator.setVisibility(View.VISIBLE);
-    }
-
-  }
-
 }

src/org/thoughtcrime/securesms/ConversationListAdapter.java

@@ -107,16 +107,6 @@ public class ConversationListAdapter extends CursorRecyclerViewAdapter<Conversat
     }
   }
 
-  public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, boolean archived) {
-    ConversationListItem listItem = (ConversationListItem)viewHolder.itemView;
-
-    if (!archived) {
-      DatabaseFactory.getThreadDatabase(getContext()).archiveConversation(listItem.getThreadId());
-    } else {
-      DatabaseFactory.getThreadDatabase(getContext()).unarchiveConversation(listItem.getThreadId());
-    }
-  }
-
   @Override
   public ViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
     if (viewType == MESSAGE_TYPE_SWITCH_ARCHIVE) {
@@ -182,7 +172,7 @@ public class ConversationListAdapter extends CursorRecyclerViewAdapter<Conversat
   public void toggleThreadInBatchSet(long threadId) {
     if (batchSet.contains(threadId)) {
       batchSet.remove(threadId);
-    } else {
+    } else if (threadId != -1) {
       batchSet.add(threadId);
     }
   }
@@ -203,7 +193,8 @@ public class ConversationListAdapter extends CursorRecyclerViewAdapter<Conversat
 
   public void selectAllThreads() {
     for (int i = 0; i < getItemCount(); i++) {
-      batchSet.add(getThreadRecord(getCursorAtPositionOrThrow(i)).getThreadId());
+      long threadId = getThreadRecord(getCursorAtPositionOrThrow(i)).getThreadId();
+      if (threadId != -1) batchSet.add(threadId);
     }
     this.notifyDataSetChanged();
   }

src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java

@@ -57,6 +57,7 @@ public class ConversationListArchiveActivity extends PassphraseRequiredActionBar
     Intent intent = new Intent(this, ConversationActivity.class);
     intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, recipients.getIds());
     intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
+    intent.putExtra(ConversationActivity.IS_ARCHIVED_EXTRA, true);
     intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, distributionType);
 
     startActivity(intent);

src/org/thoughtcrime/securesms/ConversationListFragment.java

@@ -20,7 +20,6 @@ import android.app.ProgressDialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
-import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.database.Cursor;
 import android.graphics.Bitmap;
@@ -44,7 +43,6 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.helper.ItemTouchHelper;
 import android.text.TextUtils;
-import android.util.DisplayMetrics;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -53,7 +51,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 
-
 import org.thoughtcrime.securesms.ConversationListAdapter.ItemClickListener;
 import org.thoughtcrime.securesms.components.reminder.DefaultSmsReminder;
 import org.thoughtcrime.securesms.components.reminder.ExpiredBuildReminder;
@@ -264,7 +261,7 @@ public class ConversationListFragment extends Fragment
             protected void onPreExecute() {
               dialog = ProgressDialog.show(getActivity(),
                                            getActivity().getString(R.string.ConversationListFragment_deleting),
-                                           getActivity().getString(R.string.ConversationListFragment_deleting_selected_threads),
+                                           getActivity().getString(R.string.ConversationListFragment_deleting_selected_conversations),
                                            true, false);
             }
 
@@ -433,14 +430,15 @@ public class ConversationListFragment extends Fragment
 
     @Override
     public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
-      final long threadId = ((ConversationListItem)viewHolder.itemView).getThreadId();
+      final long    threadId = ((ConversationListItem)viewHolder.itemView).getThreadId();
+      final boolean read     = ((ConversationListItem)viewHolder.itemView).getRead();
 
       if (archive) {
         new SnackbarAsyncTask<Long>(getView(),
                                     getString(R.string.ConversationListFragment_moved_conversation_to_inbox),
                                     getString(R.string.ConversationListFragment_undo),
                                     getResources().getColor(R.color.amber_500),
-                                    Snackbar.LENGTH_SHORT, false)
+                                    Snackbar.LENGTH_LONG, false)
         {
           @Override
           protected void executeAction(@Nullable Long parameter) {
@@ -457,16 +455,26 @@ public class ConversationListFragment extends Fragment
                                     getString(R.string.ConversationListFragment_archived_conversation),
                                     getString(R.string.ConversationListFragment_undo),
                                     getResources().getColor(R.color.amber_500),
-                                    Snackbar.LENGTH_SHORT, false)
+                                    Snackbar.LENGTH_LONG, false)
         {
           @Override
           protected void executeAction(@Nullable Long parameter) {
             DatabaseFactory.getThreadDatabase(getActivity()).archiveConversation(threadId);
+
+            if (!read) {
+              DatabaseFactory.getThreadDatabase(getActivity()).setRead(threadId);
+              MessageNotifier.updateNotification(getActivity(), masterSecret);
+            }
           }
 
           @Override
           protected void reverseAction(@Nullable Long parameter) {
             DatabaseFactory.getThreadDatabase(getActivity()).unarchiveConversation(threadId);
+
+            if (!read) {
+              DatabaseFactory.getThreadDatabase(getActivity()).setUnread(threadId);
+              MessageNotifier.updateNotification(getActivity(), masterSecret);
+            }
           }
         }.execute(threadId);
       }

src/org/thoughtcrime/securesms/ConversationListItem.java

@@ -32,6 +32,8 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import org.thoughtcrime.securesms.components.AvatarImageView;
+import org.thoughtcrime.securesms.components.DeliveryStatusView;
+import org.thoughtcrime.securesms.components.AlertView;
 import org.thoughtcrime.securesms.components.FromTextView;
 import org.thoughtcrime.securesms.components.ThumbnailView;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
@@ -62,13 +64,16 @@ public class ConversationListItem extends RelativeLayout
   private final static Typeface BOLD_TYPEFACE  = Typeface.create("sans-serif", Typeface.BOLD);
   private final static Typeface LIGHT_TYPEFACE = Typeface.create("sans-serif-light", Typeface.NORMAL);
 
-  private Set<Long>       selectedThreads;
-  private Recipients      recipients;
-  private long            threadId;
-  private TextView        subjectView;
-  private FromTextView    fromView;
-  private TextView        dateView;
-  private TextView        archivedView;
+  private Set<Long>          selectedThreads;
+  private Recipients         recipients;
+  private long               threadId;
+  private TextView           subjectView;
+  private FromTextView       fromView;
+  private TextView           dateView;
+  private TextView           archivedView;
+  private DeliveryStatusView deliveryStatusIndicator;
+  private AlertView          alertView;
+
   private boolean         read;
   private AvatarImageView contactPhotoImage;
   private ThumbnailView   thumbnailView;
@@ -92,12 +97,14 @@ public class ConversationListItem extends RelativeLayout
   @Override
   protected void onFinishInflate() {
     super.onFinishInflate();
-    this.subjectView       = (TextView)        findViewById(R.id.subject);
-    this.fromView          = (FromTextView)    findViewById(R.id.from);
-    this.dateView          = (TextView)        findViewById(R.id.date);
-    this.contactPhotoImage = (AvatarImageView) findViewById(R.id.contact_photo_image);
-    this.thumbnailView     = (ThumbnailView)   findViewById(R.id.thumbnail);
-    this.archivedView      = ViewUtil.findById(this, R.id.archived);
+    this.subjectView             = (TextView)           findViewById(R.id.subject);
+    this.fromView                = (FromTextView)       findViewById(R.id.from);
+    this.dateView                = (TextView)           findViewById(R.id.date);
+    this.deliveryStatusIndicator = (DeliveryStatusView) findViewById(R.id.delivery_status);
+    this.alertView               = (AlertView)          findViewById(R.id.indicators_parent);
+    this.contactPhotoImage       = (AvatarImageView)    findViewById(R.id.contact_photo_image);
+    this.thumbnailView           = (ThumbnailView)      findViewById(R.id.thumbnail);
+    this.archivedView            = ViewUtil.findById(this, R.id.archived);
     thumbnailView.setClickable(false);
   }
 
@@ -128,6 +135,7 @@ public class ConversationListItem extends RelativeLayout
       this.archivedView.setVisibility(View.GONE);
     }
 
+    setStatusIcons(thread);
     setThumbnailSnippet(masterSecret, thread);
     setBatchState(batchMode);
     setBackground(thread);
@@ -152,6 +160,10 @@ public class ConversationListItem extends RelativeLayout
     return threadId;
   }
 
+  public boolean getRead() {
+    return read;
+  }
+
   public int getDistributionType() {
     return distributionType;
   }
@@ -164,15 +176,35 @@ public class ConversationListItem extends RelativeLayout
       LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectView.getLayoutParams();
       subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.thumbnail);
       this.subjectView.setLayoutParams(subjectParams);
+      this.post(new ThumbnailPositioner(thumbnailView, archivedView, deliveryStatusIndicator, dateView));
     } else {
       this.thumbnailView.setVisibility(View.GONE);
 
       LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectView.getLayoutParams();
-      subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.archived);
+      subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.delivery_status);
       this.subjectView.setLayoutParams(subjectParams);
     }
   }
 
+  private void setStatusIcons(ThreadRecord thread) {
+    if (!thread.isOutgoing()) {
+      deliveryStatusIndicator.setNone();
+      alertView.setNone();
+    } else if (thread.isFailed()) {
+      deliveryStatusIndicator.setNone();
+      alertView.setFailed();
+    } else if (thread.isPendingInsecureSmsFallback()) {
+      deliveryStatusIndicator.setNone();
+      alertView.setPendingApproval();
+    } else {
+      alertView.setNone();
+
+      if      (thread.isPending())   deliveryStatusIndicator.setPending();
+      else if (thread.isDelivered()) deliveryStatusIndicator.setDelivered();
+      else                           deliveryStatusIndicator.setSent();
+    }
+  }
+
   private void setBackground(ThreadRecord thread) {
     if (thread.isRead()) setBackgroundResource(readBackground);
     else                 setBackgroundResource(unreadBackround);
@@ -198,4 +230,34 @@ public class ConversationListItem extends RelativeLayout
     });
   }
 
+  private static class ThumbnailPositioner implements Runnable {
+
+    private final View thumbnailView;
+    private final View archivedView;
+    private final View deliveryStatusView;
+    private final View dateView;
+
+    public ThumbnailPositioner(View thumbnailView, View archivedView, View deliveryStatusView, View dateView) {
+      this.thumbnailView      = thumbnailView;
+      this.archivedView       = archivedView;
+      this.deliveryStatusView = deliveryStatusView;
+      this.dateView           = dateView;
+    }
+
+    @Override
+    public void run() {
+      LayoutParams thumbnailParams = (RelativeLayout.LayoutParams)thumbnailView.getLayoutParams();
+
+      if (archivedView.getVisibility() == View.VISIBLE &&
+          (archivedView.getWidth() + deliveryStatusView.getWidth()) > dateView.getWidth())
+      {
+        thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.delivery_status);
+      } else {
+        thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.date);
+      }
+
+      thumbnailView.setLayoutParams(thumbnailParams);
+    }
+  }
+
 }

src/org/thoughtcrime/securesms/DeviceActivity.java

@@ -55,6 +55,7 @@ public class DeviceActivity extends PassphraseRequiredActionBarActivity
   @Override
   public void onCreate(Bundle bundle, @NonNull MasterSecret masterSecret) {
     getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+    getSupportActionBar().setTitle(R.string.AndroidManifest_manage_linked_devices);
     this.deviceAddFragment  = new DeviceAddFragment();
     this.deviceListFragment = new DeviceListFragment();
     this.deviceLinkFragment = new DeviceLinkFragment();
@@ -62,7 +63,11 @@ public class DeviceActivity extends PassphraseRequiredActionBarActivity
     this.deviceListFragment.setAddDeviceButtonListener(this);
     this.deviceAddFragment.setScanListener(this);
 
-    initFragment(android.R.id.content, deviceListFragment, masterSecret);
+    if (getIntent().getBooleanExtra("add", false)) {
+      initFragment(android.R.id.content, deviceAddFragment, masterSecret, dynamicLanguage.getCurrentLocale());
+    } else {
+      initFragment(android.R.id.content, deviceListFragment, masterSecret, dynamicLanguage.getCurrentLocale());
+    }
   }
 
   @Override

src/org/thoughtcrime/securesms/DeviceListFragment.java

@@ -30,6 +30,7 @@ import org.whispersystems.textsecure.api.messages.multidevice.DeviceInfo;
 
 import java.io.IOException;
 import java.util.List;
+import java.util.Locale;
 
 import javax.inject.Inject;
 
@@ -43,11 +44,18 @@ public class DeviceListFragment extends ListFragment
   @Inject
   TextSecureAccountManager accountManager;
 
-  private View empty;
+  private Locale                 locale;
+  private View                   empty;
   private View                   progressContainer;
-  private FloatingActionButton addDeviceButton;
+  private FloatingActionButton   addDeviceButton;
   private Button.OnClickListener addDeviceButtonListener;
 
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    this.locale = (Locale) getArguments().getSerializable(PassphraseRequiredActionBarActivity.LOCALE_EXTRA);
+  }
+
   @Override
   public void onAttach(Activity activity) {
     super.onAttach(activity);
@@ -94,7 +102,7 @@ public class DeviceListFragment extends ListFragment
       return;
     }
 
-    setListAdapter(new DeviceListAdapter(getActivity(), R.layout.device_list_item_view, data));
+    setListAdapter(new DeviceListAdapter(getActivity(), R.layout.device_list_item_view, data, locale));
 
     if (data.isEmpty()) {
       empty.setVisibility(View.VISIBLE);
@@ -171,11 +179,13 @@ public class DeviceListFragment extends ListFragment
 
   private static class DeviceListAdapter extends ArrayAdapter<DeviceInfo> {
 
-    private final int resource;
+    private final int    resource;
+    private final Locale locale;
 
-    public DeviceListAdapter(Context context, int resource, List<DeviceInfo> objects) {
+    public DeviceListAdapter(Context context, int resource, List<DeviceInfo> objects, Locale locale) {
       super(context, resource, objects);
       this.resource = resource;
+      this.locale = locale;
     }
 
     @Override
@@ -184,7 +194,7 @@ public class DeviceListFragment extends ListFragment
         convertView = ((Activity)getContext()).getLayoutInflater().inflate(resource, parent, false);
       }
 
-      ((DeviceListItem)convertView).set(getItem(position));
+      ((DeviceListItem)convertView).set(getItem(position), locale);
 
       return convertView;
     }

src/org/thoughtcrime/securesms/DeviceListItem.java

@@ -34,18 +34,18 @@ public class DeviceListItem extends LinearLayout {
     this.lastActive = (TextView) findViewById(R.id.active);
   }
 
-  public void set(DeviceInfo deviceInfo) {
+  public void set(DeviceInfo deviceInfo, Locale locale) {
     if (TextUtils.isEmpty(deviceInfo.getName())) this.name.setText(R.string.DeviceListItem_unnamed_device);
     else                                         this.name.setText(deviceInfo.getName());
 
     this.created.setText(getContext().getString(R.string.DeviceListItem_linked_s,
                                                 DateUtils.getDayPrecisionTimeSpanString(getContext(),
-                                                                                        Locale.getDefault(),
+                                                                                        locale,
                                                                                         deviceInfo.getCreated())));
 
     this.lastActive.setText(getContext().getString(R.string.DeviceListItem_last_active_s,
                                                    DateUtils.getDayPrecisionTimeSpanString(getContext(),
-                                                                                           Locale.getDefault(),
+                                                                                           locale,
                                                                                            deviceInfo.getLastSeen())));
 
     this.deviceId = deviceInfo.getId();

src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java

@@ -1,42 +1,18 @@
 package org.thoughtcrime.securesms;
 
-import android.content.Context;
 import android.content.DialogInterface;
-import android.net.Uri;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
-import android.text.SpannableStringBuilder;
-import android.util.Log;
-import android.view.View;
 import android.view.Window;
-import android.widget.Toast;
 
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
-import org.thoughtcrime.securesms.util.Base64;
-import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
-import org.whispersystems.libaxolotl.IdentityKeyPair;
-import org.whispersystems.libaxolotl.InvalidKeyException;
-import org.whispersystems.libaxolotl.ecc.Curve;
-import org.whispersystems.libaxolotl.ecc.ECPublicKey;
-import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.api.push.exceptions.NotFoundException;
-import org.whispersystems.textsecure.internal.push.DeviceLimitExceededException;
-
-import java.io.IOException;
-
-import static org.thoughtcrime.securesms.util.SpanUtil.small;
 
 public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActivity {
 
   private static final String TAG = DeviceProvisioningActivity.class.getSimpleName();
 
-  private Uri          uri;
-  private MasterSecret masterSecret;
-
   @Override
   protected void onPreCreate() {
     supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
@@ -44,119 +20,36 @@ public class DeviceProvisioningActivity extends PassphraseRequiredActionBarActiv
 
   @Override
   protected void onCreate(Bundle bundle, @NonNull MasterSecret masterSecret) {
-    this.masterSecret = masterSecret;
     getSupportActionBar().hide();
-    initializeResources();
 
-    SpannableStringBuilder content = new SpannableStringBuilder();
-    content.append(getString(R.string.DeviceProvisioningActivity_content_intro))
-           .append("\n")
-           .append(small(getString(R.string.DeviceProvisioningActivity_content_bullets)));
+    AlertDialog dialog = new AlertDialog.Builder(this)
+        .setTitle(getString(R.string.DeviceProvisioningActivity_link_a_signal_device))
+        .setMessage(getString(R.string.DeviceProvisioningActivity_it_looks_like_youre_trying_to_link_a_signal_device_using_a_3rd_party_scanner))
+        .setPositiveButton(R.string.DeviceProvisioningActivity_continue, new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            Intent intent = new Intent(DeviceProvisioningActivity.this, DeviceActivity.class);
+            intent.putExtra("add", true);
+            startActivity(intent);
+            finish();
+          }
+        })
+        .setNegativeButton(R.string.DeviceProvisioningActivity_cancel, new DialogInterface.OnClickListener() {
+          @Override
+          public void onClick(DialogInterface dialog, int which) {
+            dialog.dismiss();
+            finish();
+          }
+        })
+        .setOnDismissListener(new DialogInterface.OnDismissListener() {
+          @Override
+          public void onDismiss(DialogInterface dialog) {
+            finish();
+          }
+        })
+        .create();
 
-    final AlertDialog dialog = new AlertDialog.Builder(this)
-            .setTitle(R.string.DeviceProvisioningActivity_link_this_device)
-            .setIconAttribute(R.drawable.icon_dialog)
-            .setMessage(content)
-            .setPositiveButton(R.string.DeviceProvisioningActivity_continue, new DialogInterface.OnClickListener() {
-              @Override
-              public void onClick(DialogInterface dialog, int which) {
-
-              }
-            })
-            .setNegativeButton(R.string.DeviceProvisioningActivity_cancel, new DialogInterface.OnClickListener() {
-              @Override
-              public void onClick(DialogInterface dialog, int which) {
-                dialog.dismiss();
-                finish();
-              }
-            })
-            .setOnDismissListener(new DialogInterface.OnDismissListener() {
-              @Override
-              public void onDismiss(DialogInterface dialog) {
-                finish();
-              }
-            })
-            .create();
+    dialog.setIcon(getResources().getDrawable(R.drawable.icon_dialog));
     dialog.show();
-    dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
-      @Override
-      public void onClick(View v) {
-        handleProvisioning(dialog);
-      }
-    });
-  }
-
-  private void initializeResources() {
-    this.uri = getIntent().getData();
-  }
-
-  private void handleProvisioning(final AlertDialog dialog) {
-    new ProgressDialogAsyncTask<Void, Void, Integer>(this,
-                                                     R.string.DeviceProvisioningActivity_content_progress_title,
-                                                     R.string.DeviceProvisioningActivity_content_progress_content)
-    {
-      private static final int SUCCESS        = 0;
-      private static final int NO_DEVICE      = 1;
-      private static final int NETWORK_ERROR  = 2;
-      private static final int KEY_ERROR      = 3;
-      private static final int LIMIT_EXCEEDED = 4;
-
-      @Override
-      protected Integer doInBackground(Void... params) {
-        try {
-          Context                  context          = DeviceProvisioningActivity.this;
-          TextSecureAccountManager accountManager   = TextSecureCommunicationFactory.createManager(context);
-          String                   verificationCode = accountManager.getNewDeviceVerificationCode();
-          String                   ephemeralId      = uri.getQueryParameter("uuid");
-          String                   publicKeyEncoded = uri.getQueryParameter("pub_key");
-          ECPublicKey              publicKey        = Curve.decodePoint(Base64.decode(publicKeyEncoded), 0);
-          IdentityKeyPair          identityKeyPair  = IdentityKeyUtil.getIdentityKeyPair(context);
-
-          accountManager.addDevice(ephemeralId, publicKey, identityKeyPair, verificationCode);
-          TextSecurePreferences.setMultiDevice(context, true);
-          return SUCCESS;
-
-
-        } catch (NotFoundException e) {
-          Log.w(TAG, e);
-          return NO_DEVICE;
-        } catch (DeviceLimitExceededException e) {
-          Log.w(TAG, e);
-          return LIMIT_EXCEEDED;
-        } catch (IOException e) {
-          Log.w(TAG, e);
-          return NETWORK_ERROR;
-        } catch (InvalidKeyException e) {
-          Log.w(TAG, e);
-          return KEY_ERROR;
-        }
-      }
-
-      @Override
-      protected void onPostExecute(Integer result) {
-        super.onPostExecute(result);
-
-        Context context = DeviceProvisioningActivity.this;
-
-        switch (result) {
-          case SUCCESS:
-            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_success, Toast.LENGTH_SHORT).show();
-            break;
-          case NO_DEVICE:
-            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_no_device, Toast.LENGTH_LONG).show();
-            break;
-          case NETWORK_ERROR:
-            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_network_error, Toast.LENGTH_LONG).show();
-            break;
-          case KEY_ERROR:
-            Toast.makeText(context, R.string.DeviceProvisioningActivity_content_progress_key_error, Toast.LENGTH_LONG).show();
-            break;
-          case LIMIT_EXCEEDED:
-            Toast.makeText(context, R.string.DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already, Toast.LENGTH_LONG).show();
-            break;
-        }
-        dialog.dismiss();
-      }
-    }.execute();
   }
 }

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

@@ -0,0 +1,69 @@
+package org.thoughtcrime.securesms.components;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Build.VERSION_CODES;
+import android.support.v4.content.ContextCompat;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import org.thoughtcrime.securesms.R;
+
+public class AlertView extends LinearLayout {
+
+  private static final String TAG = AlertView.class.getSimpleName();
+
+  private ImageView approvalIndicator;
+  private ImageView failedIndicator;
+
+  public AlertView(Context context) {
+    this(context, null);
+  }
+
+  public AlertView(Context context, AttributeSet attrs) {
+    super(context, attrs);
+    initialize(attrs);
+  }
+
+  @TargetApi(VERSION_CODES.HONEYCOMB)
+  public AlertView(final Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+    initialize(attrs);
+  }
+
+  private void initialize(AttributeSet attrs) {
+    inflate(getContext(), R.layout.alert_view, this);
+
+    approvalIndicator = (ImageView) findViewById(R.id.pending_approval_indicator);
+    failedIndicator   = (ImageView) findViewById(R.id.sms_failed_indicator);
+
+    if (attrs != null) {
+      TypedArray typedArray = getContext().getTheme().obtainStyledAttributes(attrs, R.styleable.AlertView, 0, 0);
+      boolean useSmallIcon = typedArray.getBoolean(R.styleable.AlertView_useSmallIcon, false);
+      typedArray.recycle();
+
+      if (useSmallIcon) {
+        failedIndicator.setImageDrawable(ContextCompat.getDrawable(getContext(), R.drawable.ic_error_red_18dp));
+      }
+    }
+  }
+
+  public void setNone() {
+    this.setVisibility(View.GONE);
+  }
+
+  public void setPendingApproval() {
+    this.setVisibility(View.VISIBLE);
+    approvalIndicator.setVisibility(View.VISIBLE);
+    failedIndicator.setVisibility(View.GONE);
+  }
+
+  public void setFailed() {
+    this.setVisibility(View.VISIBLE);
+    approvalIndicator.setVisibility(View.GONE);
+    failedIndicator.setVisibility(View.VISIBLE);
+  }
+}

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

@@ -0,0 +1,89 @@
+package org.thoughtcrime.securesms.components;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.R;
+
+import pl.tajchert.sample.DotsTextView;
+
+public class DeliveryStatusView extends FrameLayout {
+
+  private static final String TAG = DeliveryStatusView.class.getSimpleName();
+
+  private final ViewGroup pendingIndicatorStub;
+  private final ImageView sentIndicator;
+  private final ImageView deliveredIndicator;
+
+  public DeliveryStatusView(Context context) {
+    this(context, null);
+  }
+
+  public DeliveryStatusView(Context context, AttributeSet attrs) {
+    this(context, attrs, 0);
+  }
+
+  public DeliveryStatusView(final Context context, AttributeSet attrs, int defStyle) {
+    super(context, attrs, defStyle);
+
+    inflate(context, R.layout.delivery_status_view, this);
+
+    this.deliveredIndicator   = (ImageView) findViewById(R.id.delivered_indicator);
+    this.sentIndicator        = (ImageView) findViewById(R.id.sent_indicator);
+    this.pendingIndicatorStub = (ViewGroup) findViewById(R.id.pending_indicator_stub);
+
+    int iconColor = Color.GRAY;
+
+    if (attrs != null) {
+      TypedArray typedArray = context.getTheme().obtainStyledAttributes(attrs, R.styleable.DeliveryStatusView, 0, 0);
+      iconColor = typedArray.getColor(R.styleable.DeliveryStatusView_iconColor, iconColor);
+      typedArray.recycle();
+    }
+
+    deliveredIndicator.setColorFilter(iconColor, android.graphics.PorterDuff.Mode.MULTIPLY);
+    sentIndicator.setColorFilter(iconColor, android.graphics.PorterDuff.Mode.MULTIPLY);
+
+    if (Build.VERSION.SDK_INT >= 11) {
+      inflate(context, R.layout.conversation_item_pending_v11, pendingIndicatorStub);
+      DotsTextView pendingIndicator = (DotsTextView) findViewById(R.id.pending_indicator);
+      pendingIndicator.setDotsColor(iconColor);
+    } else {
+      inflate(context, R.layout.conversation_item_pending, pendingIndicatorStub);
+      TextView pendingIndicator = (TextView) findViewById(R.id.pending_indicator);
+      pendingIndicator.setTextColor(iconColor);
+    }
+  }
+
+  public void setNone() {
+    this.setVisibility(View.GONE);
+  }
+
+  public void setPending() {
+    this.setVisibility(View.VISIBLE);
+    pendingIndicatorStub.setVisibility(View.VISIBLE);
+    sentIndicator.setVisibility(View.GONE);
+    deliveredIndicator.setVisibility(View.GONE);
+  }
+
+  public void setSent() {
+    this.setVisibility(View.VISIBLE);
+    pendingIndicatorStub.setVisibility(View.GONE);
+    sentIndicator.setVisibility(View.VISIBLE);
+    deliveredIndicator.setVisibility(View.GONE);
+  }
+
+  public void setDelivered() {
+    this.setVisibility(View.VISIBLE);
+    pendingIndicatorStub.setVisibility(View.GONE);
+    sentIndicator.setVisibility(View.GONE);
+    deliveredIndicator.setVisibility(View.VISIBLE);
+  }
+}

src/org/thoughtcrime/securesms/database/AttachmentDatabase.java

@@ -36,6 +36,7 @@ import org.thoughtcrime.securesms.crypto.DecryptingPartInputStream;
 import org.thoughtcrime.securesms.crypto.EncryptingPartOutputStream;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.crypto.MasterSecretUnion;
+import org.thoughtcrime.securesms.mms.MediaStream;
 import org.thoughtcrime.securesms.mms.PartAuthority;
 import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.MediaUtil.ThumbnailData;
@@ -289,7 +290,7 @@ public class AttachmentDatabase extends Database {
 
   public @NonNull Attachment updateAttachmentData(@NonNull MasterSecret masterSecret,
                                                   @NonNull Attachment attachment,
-                                                  @NonNull InputStream inputStream)
+                                                  @NonNull MediaStream mediaStream)
       throws MmsException
   {
     SQLiteDatabase     database           = databaseHelper.getWritableDatabase();
@@ -300,19 +301,21 @@ public class AttachmentDatabase extends Database {
       throw new MmsException("No attachment data found!");
     }
 
-    long dataSize = setAttachmentData(masterSecret, dataFile, inputStream);
+    long dataSize = setAttachmentData(masterSecret, dataFile, mediaStream.getStream());
 
     ContentValues contentValues = new ContentValues();
     contentValues.put(SIZE, dataSize);
+    contentValues.put(CONTENT_TYPE, mediaStream.getMimeType());
 
     database.update(TABLE_NAME, contentValues, PART_ID_WHERE, databaseAttachment.getAttachmentId().toStrings());
 
     return new DatabaseAttachment(databaseAttachment.getAttachmentId(),
                                   databaseAttachment.getMmsId(),
                                   databaseAttachment.hasData(),
-                                  databaseAttachment.getContentType(),
+                                  mediaStream.getMimeType(),
                                   databaseAttachment.getTransferState(),
-                                  dataSize, databaseAttachment.getLocation(),
+                                  dataSize,
+                                  databaseAttachment.getLocation(),
                                   databaseAttachment.getKey(),
                                   databaseAttachment.getRelay());
   }

src/org/thoughtcrime/securesms/database/DatabaseFactory.java

@@ -69,7 +69,9 @@ public class DatabaseFactory {
   private static final int INTRODUCED_INVITE_REMINDERS_VERSION             = 22;
   private static final int INTRODUCED_CONVERSATION_LIST_THUMBNAILS_VERSION = 23;
   private static final int INTRODUCED_ARCHIVE_VERSION                      = 24;
-  private static final int DATABASE_VERSION                                = 24;
+  private static final int INTRODUCED_CONVERSATION_LIST_STATUS_VERSION     = 25;
+  private static final int MIGRATED_CONVERSATION_LIST_STATUS_VERSION       = 26;
+  private static final int DATABASE_VERSION                                = 26;
 
   private static final String DATABASE_NAME    = "messages.db";
   private static final Object lock             = new Object();
@@ -784,6 +786,33 @@ public class DatabaseFactory {
         db.execSQL("CREATE INDEX IF NOT EXISTS archived_index ON thread (archived)");
       }
 
+      if (oldVersion < INTRODUCED_CONVERSATION_LIST_STATUS_VERSION) {
+        db.execSQL("ALTER TABLE thread ADD COLUMN status INTEGER DEFAULT -1");
+        db.execSQL("ALTER TABLE thread ADD COLUMN delivery_receipt_count INTEGER DEFAULT 0");
+      }
+
+      if (oldVersion < MIGRATED_CONVERSATION_LIST_STATUS_VERSION) {
+        Cursor threadCursor = db.query("thread", new String[] {"_id"}, null, null, null, null, null);
+
+        while (threadCursor != null && threadCursor.moveToNext()) {
+          long threadId = threadCursor.getLong(threadCursor.getColumnIndexOrThrow("_id"));
+
+          Cursor cursor = db.rawQuery("SELECT DISTINCT date AS date_received, status, " +
+                                      "delivery_receipt_count FROM sms WHERE (thread_id = ?1) " +
+                                      "UNION ALL SELECT DISTINCT date_received, -1 AS status, " +
+                                      "delivery_receipt_count FROM mms WHERE (thread_id = ?1) " +
+                                      "ORDER BY date_received DESC LIMIT 1", new String[]{threadId + ""});
+
+          if (cursor != null && cursor.moveToNext()) {
+            int status       = cursor.getInt(cursor.getColumnIndexOrThrow("status"));
+            int receiptCount = cursor.getInt(cursor.getColumnIndexOrThrow("delivery_receipt_count"));
+
+            db.execSQL("UPDATE thread SET status = ?, delivery_receipt_count = ? WHERE _id = ?",
+                       new String[]{status + "", receiptCount + "", threadId + ""});
+          }
+        }
+      }
+
       db.setTransactionSuccessful();
       db.endTransaction();
     }

src/org/thoughtcrime/securesms/database/MmsDatabase.java

@@ -214,6 +214,7 @@ public class MmsDatabase extends MessagingDatabase {
                                  RECEIPT_COUNT + " = " + RECEIPT_COUNT + " + 1 WHERE " + ID + " = ?",
                                  new String[] {String.valueOf(id)});
 
+                DatabaseFactory.getThreadDatabase(context).update(threadId, false);
                 notifyConversationListeners(threadId);
               }
             } catch (InvalidNumberException e) {
@@ -332,41 +333,50 @@ public class MmsDatabase extends MessagingDatabase {
     return readerFor(masterSecret, rawQuery(where, null));
   }
 
-  private void updateMailboxBitmask(long id, long maskOff, long maskOn) {
+  private void updateMailboxBitmask(long id, long maskOff, long maskOn, Optional<Long> threadId) {
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     db.execSQL("UPDATE " + TABLE_NAME +
                    " SET " + MESSAGE_BOX + " = (" + MESSAGE_BOX + " & " + (Types.TOTAL_MASK - maskOff) + " | " + maskOn + " )" +
                    " WHERE " + ID + " = ?", new String[] {id + ""});
+
+    if (threadId.isPresent()) {
+      DatabaseFactory.getThreadDatabase(context).update(threadId.get(), false);
+    }
   }
 
   public void markAsOutbox(long messageId) {
-    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_OUTBOX_TYPE);
-    notifyConversationListeners(getThreadIdForMessage(messageId));
+    long threadId = getThreadIdForMessage(messageId);
+    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_OUTBOX_TYPE, Optional.of(threadId));
   }
 
   public void markAsForcedSms(long messageId) {
-    updateMailboxBitmask(messageId, Types.PUSH_MESSAGE_BIT, Types.MESSAGE_FORCE_SMS_BIT);
-    notifyConversationListeners(getThreadIdForMessage(messageId));
+    long threadId = getThreadIdForMessage(messageId);
+    updateMailboxBitmask(messageId, Types.PUSH_MESSAGE_BIT, Types.MESSAGE_FORCE_SMS_BIT, Optional.of(threadId));
+    notifyConversationListeners(threadId);
   }
 
   public void markAsPendingInsecureSmsFallback(long messageId) {
-    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_PENDING_INSECURE_SMS_FALLBACK);
-    notifyConversationListeners(getThreadIdForMessage(messageId));
+    long threadId = getThreadIdForMessage(messageId);
+    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_PENDING_INSECURE_SMS_FALLBACK, Optional.of(threadId));
+    notifyConversationListeners(threadId);
   }
 
   public void markAsSending(long messageId) {
-    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_SENDING_TYPE);
-    notifyConversationListeners(getThreadIdForMessage(messageId));
+    long threadId = getThreadIdForMessage(messageId);
+    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_SENDING_TYPE, Optional.of(threadId));
+    notifyConversationListeners(threadId);
   }
 
   public void markAsSentFailed(long messageId) {
-    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_SENT_FAILED_TYPE);
-    notifyConversationListeners(getThreadIdForMessage(messageId));
+    long threadId = getThreadIdForMessage(messageId);
+    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_SENT_FAILED_TYPE, Optional.of(threadId));
+    notifyConversationListeners(threadId);
   }
 
   public void markAsSent(long messageId) {
-    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_SENT_TYPE);
-    notifyConversationListeners(getThreadIdForMessage(messageId));
+    long threadId = getThreadIdForMessage(messageId);
+    updateMailboxBitmask(messageId, Types.BASE_TYPE_MASK, Types.BASE_SENT_TYPE, Optional.of(threadId));
+    notifyConversationListeners(threadId);
   }
 
   public void markDownloadState(long messageId, long state) {
@@ -379,34 +389,34 @@ public class MmsDatabase extends MessagingDatabase {
   }
 
   public void markAsNoSession(long messageId, long threadId) {
-    updateMailboxBitmask(messageId, Types.ENCRYPTION_MASK, Types.ENCRYPTION_REMOTE_NO_SESSION_BIT);
+    updateMailboxBitmask(messageId, Types.ENCRYPTION_MASK, Types.ENCRYPTION_REMOTE_NO_SESSION_BIT, Optional.of(threadId));
     notifyConversationListeners(threadId);
   }
 
   public void markAsSecure(long messageId) {
-    updateMailboxBitmask(messageId, 0, Types.SECURE_MESSAGE_BIT);
+    updateMailboxBitmask(messageId, 0, Types.SECURE_MESSAGE_BIT, Optional.<Long>absent());
   }
 
   public void markAsInsecure(long messageId) {
-    updateMailboxBitmask(messageId, Types.SECURE_MESSAGE_BIT, 0);
+    updateMailboxBitmask(messageId, Types.SECURE_MESSAGE_BIT, 0, Optional.<Long>absent());
   }
 
   public void markAsPush(long messageId) {
-    updateMailboxBitmask(messageId, 0, Types.PUSH_MESSAGE_BIT);
+    updateMailboxBitmask(messageId, 0, Types.PUSH_MESSAGE_BIT, Optional.<Long>absent());
   }
 
   public void markAsDecryptFailed(long messageId, long threadId) {
-    updateMailboxBitmask(messageId, Types.ENCRYPTION_MASK, Types.ENCRYPTION_REMOTE_FAILED_BIT);
+    updateMailboxBitmask(messageId, Types.ENCRYPTION_MASK, Types.ENCRYPTION_REMOTE_FAILED_BIT, Optional.of(threadId));
     notifyConversationListeners(threadId);
   }
 
   public void markAsDecryptDuplicate(long messageId, long threadId) {
-    updateMailboxBitmask(messageId, Types.ENCRYPTION_MASK, Types.ENCRYPTION_REMOTE_DUPLICATE_BIT);
+    updateMailboxBitmask(messageId, Types.ENCRYPTION_MASK, Types.ENCRYPTION_REMOTE_DUPLICATE_BIT, Optional.of(threadId));
     notifyConversationListeners(threadId);
   }
 
   public void markAsLegacyVersion(long messageId, long threadId) {
-    updateMailboxBitmask(messageId, Types.ENCRYPTION_MASK, Types.ENCRYPTION_REMOTE_LEGACY_BIT);
+    updateMailboxBitmask(messageId, Types.ENCRYPTION_MASK, Types.ENCRYPTION_REMOTE_LEGACY_BIT, Optional.of(threadId));
     notifyConversationListeners(threadId);
   }
 

src/org/thoughtcrime/securesms/database/SmsDatabase.java

@@ -120,7 +120,6 @@ public class SmsDatabase extends MessagingDatabase {
 
     DatabaseFactory.getThreadDatabase(context).update(threadId, false);
     notifyConversationListeners(threadId);
-    notifyConversationListListeners();
   }
 
   public long getThreadIdForMessage(long id) {
@@ -242,7 +241,10 @@ public class SmsDatabase extends MessagingDatabase {
 
     SQLiteDatabase db = databaseHelper.getWritableDatabase();
     db.update(TABLE_NAME, contentValues, ID_WHERE, new String[] {id+""});
-    notifyConversationListeners(getThreadIdForMessage(id));
+
+    long threadId = getThreadIdForMessage(id);
+    DatabaseFactory.getThreadDatabase(context).update(threadId, false);
+    notifyConversationListeners(threadId);
   }
 
   public void markAsSentFailed(long id) {
@@ -265,12 +267,15 @@ public class SmsDatabase extends MessagingDatabase {
             String ourAddress   = canonicalizeNumber(context, cursor.getString(cursor.getColumnIndexOrThrow(ADDRESS)));
 
             if (ourAddress.equals(theirAddress)) {
+              long threadId = cursor.getLong(cursor.getColumnIndexOrThrow(THREAD_ID));
+
               database.execSQL("UPDATE " + TABLE_NAME +
                                " SET " + RECEIPT_COUNT + " = " + RECEIPT_COUNT + " + 1 WHERE " +
                                ID + " = ?",
                                new String[] {String.valueOf(cursor.getLong(cursor.getColumnIndexOrThrow(ID)))});
 
-              notifyConversationListeners(cursor.getLong(cursor.getColumnIndexOrThrow(THREAD_ID)));
+              DatabaseFactory.getThreadDatabase(context).update(threadId, false);
+              notifyConversationListeners(threadId);
             }
           } catch (InvalidNumberException e) {
             Log.w("SmsDatabase", e);

src/org/thoughtcrime/securesms/database/ThreadDatabase.java

@@ -64,12 +64,17 @@ public class ThreadDatabase extends Database {
   public  static final String SNIPPET_TYPE    = "snippet_type";
   public  static final String SNIPPET_URI     = "snippet_uri";
   public  static final String ARCHIVED        = "archived";
+  public  static final String STATUS          = "status";
+  public  static final String RECEIPT_COUNT   = "delivery_receipt_count";
 
-  public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " (" + ID + " INTEGER PRIMARY KEY, "                             +
-    DATE + " INTEGER DEFAULT 0, " + MESSAGE_COUNT + " INTEGER DEFAULT 0, "                         +
-    RECIPIENT_IDS + " TEXT, " + SNIPPET + " TEXT, " + SNIPPET_CHARSET + " INTEGER DEFAULT 0, "     +
-    READ + " INTEGER DEFAULT 1, " + TYPE + " INTEGER DEFAULT 0, " + ERROR + " INTEGER DEFAULT 0, " +
-    SNIPPET_TYPE + " INTEGER DEFAULT 0, " + SNIPPET_URI + " TEXT DEFAULT NULL, " + ARCHIVED + " INTEGER DEFAULT 0);";
+  public static final String CREATE_TABLE = "CREATE TABLE " + TABLE_NAME + " ("                    +
+    ID + " INTEGER PRIMARY KEY, " + DATE + " INTEGER DEFAULT 0, "                                  +
+    MESSAGE_COUNT + " INTEGER DEFAULT 0, " + RECIPIENT_IDS + " TEXT, " + SNIPPET + " TEXT, "       +
+    SNIPPET_CHARSET + " INTEGER DEFAULT 0, " + READ + " INTEGER DEFAULT 1, "                       +
+    TYPE + " INTEGER DEFAULT 0, " + ERROR + " INTEGER DEFAULT 0, "                                 +
+    SNIPPET_TYPE + " INTEGER DEFAULT 0, " + SNIPPET_URI + " TEXT DEFAULT NULL, "                   +
+    ARCHIVED + " INTEGER DEFAULT 0, " + STATUS + " INTEGER DEFAULT 0, "                            +
+    RECEIPT_COUNT + " INTEGER DEFAULT 0);";
 
   public static final String[] CREATE_INDEXS = {
     "CREATE INDEX IF NOT EXISTS thread_recipient_ids_index ON " + TABLE_NAME + " (" + RECIPIENT_IDS + ");",
@@ -126,14 +131,17 @@ public class ThreadDatabase extends Database {
     return db.insert(TABLE_NAME, null, contentValues);
   }
 
-  private void updateThread(long threadId, long count, String body, @Nullable Uri attachment, long date, long type, boolean unarchive)
+  private void updateThread(long threadId, long count, String body, @Nullable Uri attachment,
+                            long date, int status, int receiptCount, long type, boolean unarchive)
   {
-    ContentValues contentValues = new ContentValues(5);
+    ContentValues contentValues = new ContentValues(7);
     contentValues.put(DATE, date - date % 1000);
     contentValues.put(MESSAGE_COUNT, count);
     contentValues.put(SNIPPET, body);
     contentValues.put(SNIPPET_URI, attachment == null ? null : attachment.toString());
     contentValues.put(SNIPPET_TYPE, type);
+    contentValues.put(STATUS, status);
+    contentValues.put(RECEIPT_COUNT, receiptCount);
 
     if (unarchive) {
       contentValues.put(ARCHIVED, 0);
@@ -145,7 +153,7 @@ public class ThreadDatabase extends Database {
   }
 
   public void updateSnippet(long threadId, String snippet, @Nullable Uri attachment, long date, long type, boolean unarchive) {
-    ContentValues contentValues = new ContentValues(3);
+    ContentValues contentValues = new ContentValues(4);
 
     contentValues.put(DATE, date - date % 1000);
     contentValues.put(SNIPPET, snippet);
@@ -479,10 +487,9 @@ public class ThreadDatabase extends Database {
         if (record.isPush()) timestamp = record.getDateSent();
         else                 timestamp = record.getDateReceived();
 
-        updateThread(threadId, count, record.getBody().getBody(),
-                     getAttachmentUriFor(record), timestamp,
+        updateThread(threadId, count, record.getBody().getBody(), getAttachmentUriFor(record),
+                     timestamp, record.getDeliveryStatus(), record.getReceiptCount(),
                      record.getType(), unarchive);
-
         notifyConversationListListeners();
         return false;
       } else {
@@ -549,10 +556,12 @@ public class ThreadDatabase extends Database {
       long type               = cursor.getLong(cursor.getColumnIndexOrThrow(ThreadDatabase.SNIPPET_TYPE));
       int distributionType    = cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.TYPE));
       boolean archived        = cursor.getInt(cursor.getColumnIndex(ThreadDatabase.ARCHIVED)) != 0;
+      int status              = cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.STATUS));
+      int receiptCount        = cursor.getInt(cursor.getColumnIndexOrThrow(ThreadDatabase.RECEIPT_COUNT));
       Uri snippetUri          = getSnippetUri(cursor);
 
-      return new ThreadRecord(context, body, snippetUri, recipients, date, count,
-                              read == 1, threadId, type, distributionType, archived);
+      return new ThreadRecord(context, body, snippetUri, recipients, date, count, read == 1,
+                              threadId, receiptCount, status, type, distributionType, archived);
     }
 
     private DisplayRecord.Body getPlaintextBody(Cursor cursor) {

src/org/thoughtcrime/securesms/database/loaders/ConversationListLoader.java

@@ -43,10 +43,11 @@ public class ConversationListLoader extends AbstractCursorLoader {
           ThreadDatabase.ID, ThreadDatabase.DATE, ThreadDatabase.MESSAGE_COUNT,
           ThreadDatabase.RECIPIENT_IDS, ThreadDatabase.SNIPPET, ThreadDatabase.READ,
           ThreadDatabase.TYPE, ThreadDatabase.SNIPPET_TYPE, ThreadDatabase.SNIPPET_URI,
-          ThreadDatabase.ARCHIVED}, 1);
+          ThreadDatabase.ARCHIVED, ThreadDatabase.STATUS, ThreadDatabase.RECEIPT_COUNT}, 1);
 
       switchToArchiveCursor.addRow(new Object[] {-1L, System.currentTimeMillis(), archivedCount,
-                                                 "-1", null, 1, ThreadDatabase.DistributionTypes.ARCHIVE, 0, null, 0});
+                                                 "-1", null, 1, ThreadDatabase.DistributionTypes.ARCHIVE,
+                                                 0, null, 0, -1, 0});
 
       cursorList.add(switchToArchiveCursor);
     }

src/org/thoughtcrime/securesms/database/model/DisplayRecord.java

@@ -19,6 +19,7 @@ package org.thoughtcrime.securesms.database.model;
 import android.content.Context;
 import android.text.SpannableString;
 
+import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
 import org.thoughtcrime.securesms.recipients.Recipients;
 
@@ -40,9 +41,11 @@ public abstract class DisplayRecord {
   private final long       dateReceived;
   private final long       threadId;
   private final Body       body;
+  private final int        deliveryStatus;
+  private final int        receiptCount;
 
   public DisplayRecord(Context context, Body body, Recipients recipients, long dateSent,
-                       long dateReceived, long threadId, long type)
+                       long dateReceived, long threadId, int deliveryStatus, int receiptCount, long type)
   {
     this.context              = context.getApplicationContext();
     this.threadId             = threadId;
@@ -51,12 +54,29 @@ public abstract class DisplayRecord {
     this.dateReceived         = dateReceived;
     this.type                 = type;
     this.body                 = body;
+    this.receiptCount         = receiptCount;
+    this.deliveryStatus       = deliveryStatus;
   }
 
   public Body getBody() {
     return body;
   }
 
+  public boolean isFailed() {
+    return
+        MmsSmsColumns.Types.isFailedMessageType(type)            ||
+        MmsSmsColumns.Types.isPendingSecureSmsFallbackType(type) ||
+        deliveryStatus >= SmsDatabase.Status.STATUS_FAILED;
+  }
+
+  public boolean isPending() {
+    return MmsSmsColumns.Types.isPendingMessageType(type);
+  }
+
+  public boolean isOutgoing() {
+    return MmsSmsColumns.Types.isOutgoingMessageType(type);
+  }
+
   public abstract SpannableString getDisplayBody();
 
   public Recipients getRecipients() {
@@ -115,6 +135,23 @@ public abstract class DisplayRecord {
     return SmsDatabase.Types.isMissedCall(type);
   }
 
+  public int getDeliveryStatus() {
+    return deliveryStatus;
+  }
+
+  public int getReceiptCount() {
+    return receiptCount;
+  }
+
+  public boolean isDelivered() {
+    return (deliveryStatus >= SmsDatabase.Status.STATUS_COMPLETE &&
+            deliveryStatus < SmsDatabase.Status.STATUS_PENDING) || receiptCount > 0;
+  }
+
+  public boolean isPendingInsecureSmsFallback() {
+    return SmsDatabase.Types.isPendingInsecureSmsFallbackType(type);
+  }
+
   public static class Body {
     private final String body;
     private final boolean plaintext;

src/org/thoughtcrime/securesms/database/model/MediaMmsMessageRecord.java

@@ -21,6 +21,7 @@ import android.support.annotation.NonNull;
 import android.text.SpannableString;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.database.SmsDatabase.Status;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
@@ -47,16 +48,15 @@ public class MediaMmsMessageRecord extends MessageRecord {
 
   public MediaMmsMessageRecord(Context context, long id, Recipients recipients,
                                Recipient individualRecipient, int recipientDeviceId,
-                               long dateSent, long dateReceived, int deliveredCount,
+                               long dateSent, long dateReceived, int receiptCount,
                                long threadId, Body body,
                                @NonNull SlideDeck slideDeck,
                                int partCount, long mailbox,
                                List<IdentityKeyMismatch> mismatches,
                                List<NetworkFailure> failures)
   {
-    super(context, id, body, recipients, individualRecipient, recipientDeviceId,
-          dateSent, dateReceived, threadId, DELIVERY_STATUS_NONE, deliveredCount, mailbox,
-          mismatches, failures);
+    super(context, id, body, recipients, individualRecipient, recipientDeviceId, dateSent,
+          dateReceived, threadId, Status.STATUS_NONE, receiptCount, mailbox, mismatches, failures);
 
     this.context   = context.getApplicationContext();
     this.partCount = partCount;

src/org/thoughtcrime/securesms/database/model/MessageRecord.java

@@ -43,18 +43,11 @@ import java.util.List;
  */
 public abstract class MessageRecord extends DisplayRecord {
 
-  public static final int DELIVERY_STATUS_NONE     = 0;
-  public static final int DELIVERY_STATUS_RECEIVED = 1;
-  public static final int DELIVERY_STATUS_PENDING  = 2;
-  public static final int DELIVERY_STATUS_FAILED   = 3;
-
   private static final int MAX_DISPLAY_LENGTH = 2000;
 
   private final Recipient                 individualRecipient;
   private final int                       recipientDeviceId;
   private final long                      id;
-  private final int                       deliveryStatus;
-  private final int                       receiptCount;
   private final List<IdentityKeyMismatch> mismatches;
   private final List<NetworkFailure>      networkFailures;
 
@@ -65,12 +58,11 @@ public abstract class MessageRecord extends DisplayRecord {
                 List<IdentityKeyMismatch> mismatches,
                 List<NetworkFailure> networkFailures)
   {
-    super(context, body, recipients, dateSent, dateReceived, threadId, type);
+    super(context, body, recipients, dateSent, dateReceived, threadId, deliveryStatus, receiptCount,
+          type);
     this.id                  = id;
     this.individualRecipient = individualRecipient;
     this.recipientDeviceId   = recipientDeviceId;
-    this.deliveryStatus      = deliveryStatus;
-    this.receiptCount        = receiptCount;
     this.mismatches          = mismatches;
     this.networkFailures     = networkFailures;
   }
@@ -78,21 +70,6 @@ public abstract class MessageRecord extends DisplayRecord {
   public abstract boolean isMms();
   public abstract boolean isMmsNotification();
 
-  public boolean isFailed() {
-    return
-        MmsSmsColumns.Types.isFailedMessageType(type)            ||
-        MmsSmsColumns.Types.isPendingSecureSmsFallbackType(type) ||
-        getDeliveryStatus() == DELIVERY_STATUS_FAILED;
-  }
-
-  public boolean isOutgoing() {
-    return MmsSmsColumns.Types.isOutgoingMessageType(type);
-  }
-
-  public boolean isPending() {
-    return MmsSmsColumns.Types.isPendingMessageType(type);
-  }
-
   public boolean isSecure() {
     return MmsSmsColumns.Types.isSecureType(type);
   }
@@ -134,14 +111,6 @@ public abstract class MessageRecord extends DisplayRecord {
     return id;
   }
 
-  public int getDeliveryStatus() {
-    return deliveryStatus;
-  }
-
-  public boolean isDelivered() {
-    return getDeliveryStatus() == DELIVERY_STATUS_RECEIVED || receiptCount > 0;
-  }
-
   public boolean isPush() {
     return SmsDatabase.Types.isPushType(type) && !SmsDatabase.Types.isForcedSms(type);
   }
@@ -158,10 +127,6 @@ public abstract class MessageRecord extends DisplayRecord {
     return SmsDatabase.Types.isProcessedKeyExchange(type);
   }
 
-  public boolean isPendingInsecureSmsFallback() {
-    return SmsDatabase.Types.isPendingInsecureSmsFallbackType(type);
-  }
-
   public boolean isIdentityMismatchFailure() {
     return mismatches != null && !mismatches.isEmpty();
   }

src/org/thoughtcrime/securesms/database/model/NotificationMmsMessageRecord.java

@@ -20,6 +20,7 @@ import android.content.Context;
 import android.text.SpannableString;
 
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.database.SmsDatabase.Status;
 import org.thoughtcrime.securesms.database.MmsDatabase;
 import org.thoughtcrime.securesms.database.documents.NetworkFailure;
 import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
@@ -51,7 +52,7 @@ public class NotificationMmsMessageRecord extends MessageRecord {
                                       long expiry, int status, byte[] transactionId, long mailbox)
   {
     super(context, id, new Body("", true), recipients, individualRecipient, recipientDeviceId,
-          dateSent, dateReceived, threadId, DELIVERY_STATUS_NONE, receiptCount, mailbox,
+          dateSent, dateReceived, threadId, Status.STATUS_NONE, receiptCount, mailbox,
           new LinkedList<IdentityKeyMismatch>(), new LinkedList<NetworkFailure>());
 
     this.contentLocation = contentLocation;

src/org/thoughtcrime/securesms/database/model/SmsMessageRecord.java

@@ -50,7 +50,7 @@ public class SmsMessageRecord extends MessageRecord {
                           int status, List<IdentityKeyMismatch> mismatches)
   {
     super(context, id, body, recipients, individualRecipient, recipientDeviceId,
-          dateSent, dateReceived, threadId, getGenericDeliveryStatus(status), receiptCount, type,
+          dateSent, dateReceived, threadId, status, receiptCount, type,
           mismatches, new LinkedList<NetworkFailure>());
   }
 
@@ -104,16 +104,4 @@ public class SmsMessageRecord extends MessageRecord {
   public boolean isMmsNotification() {
     return false;
   }
-
-  private static int getGenericDeliveryStatus(int status) {
-    if (status == SmsDatabase.Status.STATUS_NONE) {
-      return MessageRecord.DELIVERY_STATUS_NONE;
-    } else if (status >= SmsDatabase.Status.STATUS_FAILED) {
-      return MessageRecord.DELIVERY_STATUS_FAILED;
-    } else if (status >= SmsDatabase.Status.STATUS_PENDING) {
-      return MessageRecord.DELIVERY_STATUS_PENDING;
-    } else {
-      return MessageRecord.DELIVERY_STATUS_RECEIVED;
-    }
-  }
 }

src/org/thoughtcrime/securesms/database/model/ThreadRecord.java

@@ -28,6 +28,7 @@ import android.text.style.StyleSpan;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.database.MmsSmsColumns;
 import org.thoughtcrime.securesms.database.SmsDatabase;
+import org.thoughtcrime.securesms.database.ThreadDatabase;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.util.GroupUtil;
 
@@ -48,9 +49,10 @@ public class ThreadRecord extends DisplayRecord {
 
   public ThreadRecord(@NonNull Context context, @NonNull Body body, @Nullable Uri snippetUri,
                       @NonNull Recipients recipients, long date, long count, boolean read,
-                      long threadId, long snippetType, int distributionType, boolean archived)
+                      long threadId, int receiptCount, int status, long snippetType,
+                      int distributionType, boolean archived)
   {
-    super(context, body, recipients, date, date, threadId, snippetType);
+    super(context, body, recipients, date, date, threadId, status, receiptCount, snippetType);
     this.context          = context.getApplicationContext();
     this.snippetUri       = snippetUri;
     this.count            = count;

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

@@ -10,7 +10,9 @@ import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.mms.MediaConstraints;
+import org.thoughtcrime.securesms.mms.MediaStream;
 import org.thoughtcrime.securesms.transport.UndeliverableMessageException;
+import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.jobqueue.JobParameters;
 
@@ -19,6 +21,7 @@ import java.io.InputStream;
 import java.util.LinkedList;
 import java.util.List;
 
+import ws.com.google.android.mms.ContentType;
 import ws.com.google.android.mms.MmsException;
 
 public abstract class SendJob extends MasterSecretJob {
@@ -63,7 +66,7 @@ public abstract class SendJob extends MasterSecretJob {
         if (constraints.isSatisfied(context, masterSecret, attachment)) {
           results.add(attachment);
         } else if (constraints.canResize(attachment)) {
-          InputStream resized = constraints.getResizedMedia(context, masterSecret, attachment);
+          MediaStream resized = constraints.getResizedMedia(context, masterSecret, attachment);
           results.add(attachmentDatabase.updateAttachmentData(masterSecret, attachment, resized));
         } else {
           throw new UndeliverableMessageException("Size constraints could not be met!");

src/org/thoughtcrime/securesms/mms/AttachmentManager.java

@@ -45,6 +45,9 @@ import org.thoughtcrime.securesms.util.concurrent.ListenableFuture.Listener;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 
 import java.io.IOException;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import ws.com.google.android.mms.ContentType;
@@ -60,7 +63,8 @@ public class AttachmentManager {
   private final @NonNull AudioView          audioView;
   private final @NonNull AttachmentListener attachmentListener;
 
-  private @NonNull  Optional<Slide> slide = Optional.absent();
+  private @NonNull  List<Uri>       garbage = new LinkedList<>();
+  private @NonNull  Optional<Slide> slide   = Optional.absent();
   private @Nullable Uri             captureUri;
 
   public AttachmentManager(@NonNull Activity activity, @NonNull AttachmentListener listener) {
@@ -86,6 +90,8 @@ public class AttachmentManager {
       @Override
       public void onFailure(ExecutionException e) {}
     });
+
+    markGarbage(getSlideUri());
     slide = Optional.absent();
     audioView.cleanup();
   }
@@ -96,6 +102,13 @@ public class AttachmentManager {
 
     captureUri = null;
     slide      = Optional.absent();
+
+    Iterator<Uri> iterator = garbage.listIterator();
+
+    while (iterator.hasNext()) {
+      cleanup(iterator.next());
+      iterator.remove();
+    }
   }
 
   private void cleanup(final @Nullable Uri uri) {
@@ -105,6 +118,13 @@ public class AttachmentManager {
     }
   }
 
+  private void markGarbage(@Nullable Uri uri) {
+    if (uri != null && PersistentBlobProvider.isAuthority(context, uri)) {
+      Log.w(TAG, "Marking garbage that needs cleaning: " + uri);
+      garbage.add(uri);
+    }
+  }
+
   private void setSlide(@NonNull Slide slide) {
     if (getSlideUri() != null)                              cleanup(getSlideUri());
     if (captureUri != null && slide.getUri() != captureUri) cleanup(captureUri);

src/org/thoughtcrime/securesms/mms/MediaConstraints.java

@@ -18,6 +18,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.ExecutionException;
 
+import ws.com.google.android.mms.ContentType;
+
 public abstract class MediaConstraints {
   private static final String TAG = MediaConstraints.class.getSimpleName();
 
@@ -58,7 +60,7 @@ public abstract class MediaConstraints {
     return attachment != null && MediaUtil.isImage(attachment) && !MediaUtil.isGif(attachment);
   }
 
-  public InputStream getResizedMedia(@NonNull Context context,
+  public MediaStream getResizedMedia(@NonNull Context context,
                                      @NonNull MasterSecret masterSecret,
                                      @NonNull Attachment attachment)
       throws IOException
@@ -69,7 +71,8 @@ public abstract class MediaConstraints {
 
     try {
       // XXX - This is loading everything into memory! We want the send path to be stream-like.
-      return new ByteArrayInputStream(BitmapUtil.createScaledBytes(context, new DecryptableUri(masterSecret, attachment.getDataUri()), this));
+      return new MediaStream(new ByteArrayInputStream(BitmapUtil.createScaledBytes(context, new DecryptableUri(masterSecret, attachment.getDataUri()), this)),
+                             ContentType.IMAGE_JPEG);
     } catch (ExecutionException ee) {
       throw new IOException(ee);
     }

src/org/thoughtcrime/securesms/mms/MediaStream.java

@@ -1,7 +1,6 @@
 /**
- * Copyright (C) 2011 Whisper Systems
- * Copyright (C) 2014 Open Whisper Systems
- * 
+ * Copyright (C) 2015 Open 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
@@ -11,15 +10,28 @@
  * 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.sms;
+package org.thoughtcrime.securesms.mms;
 
-public class SmsTransportDetails {
+import java.io.InputStream;
 
-  public static final int SMS_SIZE           = 160;
-  public static final int MULTIPART_SMS_SIZE = 153;
+public class MediaStream {
+  private final InputStream stream;
+  private final String      mimeType;
 
+  public MediaStream(InputStream stream, String mimeType) {
+    this.stream   = stream;
+    this.mimeType = mimeType;
+  }
+
+  public InputStream getStream() {
+    return stream;
+  }
+
+  public String getMimeType() {
+    return mimeType;
+  }
 }

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

@@ -77,7 +77,7 @@ public class ChatsPreferenceFragment extends PreferenceFragment {
       final int threadLengthLimit = TextSecurePreferences.getThreadTrimLength(getActivity());
       AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
       builder.setTitle(R.string.ApplicationPreferencesActivity_delete_all_old_messages_now);
-      builder.setMessage(getString(R.string.ApplicationPreferencesActivity_are_you_sure_you_would_like_to_immediately_trim_all_conversation_threads_to_the_s_most_recent_messages,
+      builder.setMessage(getString(R.string.ApplicationPreferencesActivity_this_will_immediately_trim_all_conversations_to_the_s_most_recent_messages,
                                    threadLengthLimit));
       builder.setPositiveButton(R.string.ApplicationPreferencesActivity_delete,
         new DialogInterface.OnClickListener() {

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

@@ -87,7 +87,7 @@ public class DateUtils extends android.text.format.DateUtils {
     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMdd");
 
     if (simpleDateFormat.format(System.currentTimeMillis()).equals(simpleDateFormat.format(timestamp))) {
-      return "Today";
+      return context.getString(R.string.DeviceListItem_today);
     } else {
       String format;
 

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

@@ -16,18 +16,19 @@
  */
 package org.thoughtcrime.securesms.util;
 
-import org.thoughtcrime.securesms.sms.SmsTransportDetails;
-
 public class SmsCharacterCalculator extends CharacterCalculator {
 
+  public static final int SMS_SIZE           = 160;
+  public static final int MULTIPART_SMS_SIZE = 153;
+
   @Override
   public CharacterState calculateCharacters(int charactersSpent) {
     int maxMessageSize;
 
-    if (charactersSpent <= SmsTransportDetails.SMS_SIZE) {
-      maxMessageSize = SmsTransportDetails.SMS_SIZE;
+    if (charactersSpent <= SMS_SIZE) {
+      maxMessageSize = SMS_SIZE;
     } else {
-      maxMessageSize = SmsTransportDetails.MULTIPART_SMS_SIZE;
+      maxMessageSize = MULTIPART_SMS_SIZE;
     }
 
     int messagesSpent = charactersSpent / maxMessageSize;