Bump version to 3.6.1

// 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="172"
-      android:versionName="3.5.2">
+      android:versionCode="174"
+      android:versionName="3.6.1">
 
     <uses-sdk tools:overrideLibrary="com.amulyakhare.textdrawable,com.astuetz.pagerslidingtabstrip,pl.tajchert.waitingdots,com.h6ah4i.android.multiselectlistpreferencecompat"/>
 
@@ -173,6 +173,16 @@
 
     </activity-alias>
 
+    <activity android:name=".ConversationListArchiveActivity"
+              android:label="@string/AndroidManifeset_conversations_archive"
+              android:launchMode="singleTask"
+              android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout|screenSize"
+              android:parentActivityName=".ConversationListActivity">
+        <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.thoughtcrime.securesms.ConversationListActivity" />
+    </activity>
+
     <activity android:name=".ConversationActivity"
               android:windowSoftInputMode="stateUnchanged"
               android:launchMode="singleTask"

res/drawable-v21/conversation_list_item_read_background.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/textsecure_primary">
+    <item android:id="@android:id/mask" android:drawable="@android:color/black" />
+    <item>
+        <selector>
+            <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+            <item android:drawable="@color/conversation_list_item_background_read_light" />
+        </selector>
+    </item>
+</ripple>

res/drawable-v21/conversation_list_item_read_background_dark.xml

@@ -5,6 +5,7 @@
     <item>
         <selector>
             <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+            <item android:drawable="@color/conversation_list_item_background_read_dark" />
         </selector>
     </item>
 </ripple>

res/drawable/conversation_list_item_read_background.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
+    <item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
+    <item android:drawable="@color/conversation_list_item_background_read_light" />
+</selector>

res/drawable/conversation_list_item_read_background_dark.xml

@@ -2,4 +2,5 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
     <item android:drawable="@color/textsecure_primary_alpha33" android:state_pressed="true" />
+    <item android:drawable="@color/conversation_list_item_background_read_dark" />
 </selector>

res/drawable/rounded_rectangle.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="@color/transparent"/>
+    <stroke android:width="1dp" android:color="#ffbbbbbb"/>
+    <corners android:radius="5dp"/>
+    <padding android:bottom="5dp" android:left="5dp" android:right="5dp" android:top="5dp"/>
+</shape>

res/layout/contact_selection_list_item.xml

@@ -8,7 +8,6 @@
         android:layout_height="?android:attr/listPreferredItemHeight"
         android:orientation="horizontal"
         android:gravity="center_vertical"
-        android:background="@drawable/conversation_list_item_background"
         android:paddingLeft="48dp"
         android:paddingRight="20dp">
 
@@ -18,7 +17,7 @@
             android:layout_height="40dp"
             android:foreground="@drawable/contact_photo_background"
             android:cropToPadding="true"
-            tools:src="@color/md_material_blue_600"
+            tools:src="@color/blue_600"
             android:layout_marginRight="10dp"
             android:contentDescription="@string/SingleContactSelectionActivity_contact_photo" />
 

res/layout/conversation_list_fragment.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout
+              xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:tools="http://schemas.android.com/tools"
               xmlns:fab="http://schemas.android.com/apk/res-auto"
               android:layout_width="fill_parent"
@@ -27,7 +28,7 @@
 
     </LinearLayout>
 
-    <com.melnykov.fab.FloatingActionButton
+    <android.support.design.widget.FloatingActionButton
             android:id="@+id/fab"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -35,9 +36,6 @@
             android:layout_margin="16dp"
             android:src="@drawable/ic_create_white_24dp"
             android:focusable="true"
-            android:contentDescription="@string/conversation_list_fragment__fab_content_description"
-            fab:fab_colorNormal="?fab_color"
-            fab:fab_colorPressed="@color/textsecure_primary_dark"
-            fab:fab_colorRipple="@color/textsecure_primary_dark" />
+            android:contentDescription="@string/conversation_list_fragment__fab_content_description"/>
 
-</FrameLayout>
+</android.support.design.widget.CoordinatorLayout>

res/layout/conversation_list_item_action.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.thoughtcrime.securesms.ConversationListItemAction
+              xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="70dp">
+
+    <TextView android:id="@+id/description"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:gravity="center"
+              android:textSize="14sp"
+              android:textStyle="bold"
+              tools:text="Archived conversations (2)"/>
+
+</org.thoughtcrime.securesms.ConversationListItemAction>

res/layout/conversation_list_item_view.xml

@@ -4,7 +4,6 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:background="@drawable/conversation_list_item_background"
         android:layout_height="70dp">
 
     <org.thoughtcrime.securesms.components.AvatarImageView
@@ -62,6 +61,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@id/from"
                 android:layout_toRightOf="@id/error"
+                android:layout_toLeftOf="@+id/archived"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textColor="?attr/conversation_list_item_subject_color"
                 android:fontFamily="sans-serif-light"
@@ -98,5 +98,19 @@
                   tools:text="30 mins"
                   android:singleLine="true"/>
 
+        <TextView android:id="@+id/archived"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_below="@id/date"
+                  android:layout_alignParentRight="true"
+                  android:layout_alignBaseline="@id/subject"
+                  android:layout_marginLeft="5dp"
+                  android:text="@string/conversation_list_item_view__archived"
+                  android:textColor="#ffbbbbbb"
+                  android:background="@drawable/rounded_rectangle"
+                  android:textSize="12sp"
+                />
+
+
     </RelativeLayout>
 </org.thoughtcrime.securesms.ConversationListItem>

res/layout/group_create_activity.xml

@@ -26,10 +26,10 @@
                 android:layout_height="70dp"
                 position="bottom_right"
                 android:layout_marginRight="10dp"
-                android:src="@drawable/ic_group_photo"
                 android:contentDescription="@string/GroupCreateActivity_avatar_content_description" />
 
-            <EditText android:id="@+id/group_name"
+            <org.thoughtcrime.securesms.components.emoji.EmojiEditText
+                android:id="@+id/group_name"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
@@ -56,7 +56,8 @@
                 style="@android:style/Widget.ProgressBar"
                 android:indeterminate="true" />
 
-            <TextView android:id="@+id/creating_group_text"
+            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                android:id="@+id/creating_group_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"

res/layout/message_details_header.xml

@@ -34,7 +34,8 @@
 
         <TableLayout android:id="@+id/metadata_container"
                      android:layout_width="match_parent"
-                     android:layout_height="match_parent">
+                     android:layout_height="match_parent"
+                     android:shrinkColumns="1">
 
             <TableRow android:id="@+id/sent_container"
                       android:layout_width="match_parent"
@@ -51,7 +52,7 @@
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                          tools:text="Jan 18, 9:29AM" />
+                          tools:text="Jan 18, 2015, 12:29:37 AM GMT-08:00" />
 
             </TableRow>
 
@@ -70,7 +71,7 @@
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:layout_marginLeft="@dimen/message_details_table_row_pad"
-                          tools:text="Jan 18, 9:31AM" />
+                          tools:text="Jan 18, 2015, 12:31:15 AM GMT-08:00" />
 
             </TableRow>
 

res/layout/quick_camera_controls.xml

@@ -14,6 +14,7 @@
                  android:layout_centerHorizontal="true"
                  android:background="@drawable/quick_camera_shutter_ring"
                  android:src="@drawable/quick_shutter_button"
+                 android:enabled="false"
                  android:padding="20dp"/>
 
     <ImageButton android:id="@+id/fullscreen_button"
@@ -21,7 +22,7 @@
                  android:layout_height="wrap_content"
                  android:layout_alignParentBottom="true"
                  android:layout_alignParentRight="true"
-                 android:background="#00000000"
+                 android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_fullscreen"
                  android:padding="20dp" />
 
@@ -30,8 +31,9 @@
                  android:layout_height="wrap_content"
                  android:layout_alignParentBottom="true"
                  android:layout_alignParentLeft="true"
-                 android:background="#00000000"
+                 android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_rear"
+                 android:enabled="false"
                  android:padding="20dp"
                  android:visibility="invisible"
                  tools:visibility="visible" />

res/layout/quick_camera_controls_land.xml

@@ -14,6 +14,7 @@
                  android:layout_centerVertical="true"
                  android:background="@drawable/quick_camera_shutter_ring"
                  android:src="@drawable/quick_shutter_button"
+                 android:enabled="false"
                  android:padding="20dp"/>
 
     <ImageButton android:id="@+id/fullscreen_button"
@@ -21,7 +22,7 @@
                  android:layout_height="wrap_content"
                  android:layout_alignParentBottom="true"
                  android:layout_alignParentRight="true"
-                 android:background="#00000000"
+                 android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_fullscreen"
                  android:padding="20dp"/>
 
@@ -30,8 +31,9 @@
                  android:layout_height="wrap_content"
                  android:layout_alignParentTop="true"
                  android:layout_alignParentRight="true"
-                 android:background="#00000000"
+                 android:background="@drawable/circle_touch_highlight_background"
                  android:src="@drawable/quick_camera_rear"
+                 android:enabled="false"
                  android:padding="20dp"
                  android:visibility="invisible"
                  tools:visibility="visible"/>

res/layout/registration_progress_activity.xml

@@ -188,7 +188,7 @@
                         android:layout_below="@+id/connectivity_alert"
                         android:paddingLeft="4dip"
                         android:paddingRight="4dip"
-                        android:text="@string/registration_progress_activity__signal_was_unable_to_connect_to_the_push_service" />
+                        android:text="@string/registration_progress_activity__signal_was_unable_to_connect_to_the_server" />
             </RelativeLayout>
 
             <Button

res/menu/conversation.xml

@@ -7,9 +7,6 @@
     <item android:title="@string/conversation__menu_view_media"
           android:id="@+id/menu_view_media" />
 
-    <item android:title="@string/conversation__menu_delete_thread"
-          android:id="@+id/menu_delete_thread" />
-
     <item android:title="@string/conversation__menu_conversation_settings"
           android:id="@+id/menu_conversation_settings"/>
 

res/menu/conversation_list_batch.xml

@@ -5,10 +5,11 @@
     <item android:title="@string/conversation_list_batch__menu_delete_selected"
           android:id="@+id/menu_delete_selected"
           android:icon="?menu_trash_icon"
-          app:showAsAction="ifRoom" />
+          app:showAsAction="always" />
 
     <item android:title="@string/conversation_list_batch__menu_select_all"
           android:id="@+id/menu_select_all"
-          android:icon="?menu_selectall_icon" />
+          android:icon="?menu_selectall_icon"
+          app:showAsAction="always"/>
 
 </menu>

res/menu/conversation_list_batch_archive.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+          android:id="@+id/menu_archive_selected"
+          android:icon="@drawable/ic_archive_white_24dp"
+          app:showAsAction="always"/>
+
+</menu>

res/menu/conversation_list_batch_unarchive.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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"
+          android:id="@+id/menu_archive_selected"
+          android:icon="@drawable/ic_unarchive_white_24dp"
+          app:showAsAction="always"/>
+
+</menu>

res/menu/text_secure_normal.xml

@@ -19,4 +19,7 @@
     <item android:title="@string/text_secure_normal__menu_settings"
           android:id="@+id/menu_settings" />
 
+    <item android:title="@string/text_secure_normal__help"
+          android:id="@+id/menu_help"/>
+
 </menu>

res/values-ar/strings.xml

@@ -168,8 +168,15 @@
   </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>
@@ -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,7 @@
   <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>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">أدخل العبارة السرية</string>
   <string name="PassphrasePromptActivity_watermark_content_description">أيقونة سيجنال</string>
@@ -509,8 +517,8 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">الردود السريعة غير متاحة عند قفل سيجنال!</string>
   <string name="QuickResponseService_problem_sending_message">مشكلة في الإرسال!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">رسالة سيجنال جديدة.</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">المحتويات مخفية</string>
+  <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>
@@ -569,8 +577,13 @@
   <!--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-->
@@ -670,12 +683,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__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>
@@ -721,6 +733,7 @@
   <string name="AndroidManifest__message_details">تفاصيل الرسالة</string>
   <string name="AndroidManifest_manage_linked_devices">إدارة الأجهزة المقترنة</string>
   <string name="AndroidManifest__invite_friends">دعوة الأصدقاء</string>
+  <string name="AndroidManifeset_conversations_archive">أرشيف المحادثات</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">استيراد / تصدير</string>
   <string name="arrays__your_identity_key">متفاح الهوية الخاص بك</string>
@@ -888,11 +901,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_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-->
@@ -930,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>
@@ -970,8 +986,5 @@
   <string name="trimmer__old_messages_successfully_deleted">تم حذف الرسائل القديمة بنجاح</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">أيقونة النقل.</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">مسح رمز الاستجابة السريع المبين على الجهاز لربطه.</string>
-  <string name="device_link_fragment__link_device">ربط الجهاز</string>
-  <string name="device_list_fragment__link_new_device">ربط جهاز جديد</string>
   <!--EOF-->
 </resources>

res/values-be/strings.xml

@@ -99,6 +99,7 @@
   <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>
@@ -338,6 +339,8 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Загрузка краінаў...</string>
   <string name="country_selection_fragment__search">Пошук</string>
+  <!--device_add_fragment-->
+  <!--device_link_fragment-->
   <!--device_list_fragment-->
   <!--experience_upgrade_activity-->
   <!--log_submit_activity-->

res/values-bg/strings.xml

@@ -153,8 +153,15 @@
   </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>
@@ -194,14 +201,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>
@@ -498,8 +505,8 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Бърз отговор не е възможен, когато Signal е заключен!</string>
   <string name="QuickResponseService_problem_sending_message">Проблем при изпрашане на съобщение!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Ново Signal съобщение</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Съдържанието е скрито</string>
+  <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>
@@ -558,8 +565,13 @@ SMS-те от системния архив в Signal. Ако вече сте в
   <!--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">Сканирай 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-->
@@ -660,16 +672,15 @@ 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>
   <string name="registration_progress_activity__no_network_connectivity">Няма интернет
 връзка.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Вашето
-устройство се нуждае от връзка с интернет, за да ползвате Signal функциите.
-Провере, за да се уверите, че сте свързани към 3G или Wi-Fi.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Устройствот Ви
+се нуждае от връзка с интернет, за да може да използва тази Signal услуга.
+Проверете и се убедете, че сте свързани с мобилната мрежа или Wi-Fi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Firewall-a e твърде рестриктивен.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Ако сте свързане през Wi-Fi, възможно е да имате firewall, който блокирва достъпа до Signal сървъра. Оптайте друг вид достъп до интернет.</string>
@@ -716,9 +727,10 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <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__message_details">Информация за съобщението</string>
   <string name="AndroidManifest_manage_linked_devices">Управление на свързани устройства</string>
   <string name="AndroidManifest__invite_friends">Поканете приятели</string>
+  <string name="AndroidManifeset_conversations_archive">Разговорите са архивирани</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Внасяне / изнасяне</string>
   <string name="arrays__your_identity_key">Вашият ключ за самоличност</string>
@@ -882,11 +894,13 @@ 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_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-->
@@ -924,6 +938,7 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <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>
@@ -964,8 +979,5 @@ Signal чака твърде дълго за SMS потвърждение.</stri
   <string name="trimmer__old_messages_successfully_deleted">Старите съобщения бяха успешно изтрити</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Икона за транспорт</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Сканирай QR кодът, показан на устройството, за да се свържете</string>
-  <string name="device_link_fragment__link_device">Свържи устройство</string>
-  <string name="device_list_fragment__link_new_device">Свържи ново устройство</string>
   <!--EOF-->
 </resources>

res/values-cs/strings.xml

@@ -158,8 +158,15 @@ kontakt</string>
   </plurals>
   <string name="ConversationListFragment_deleting">Mažu</string>
   <string name="ConversationListFragment_deleting_selected_threads">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>
@@ -199,14 +206,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>
@@ -495,8 +502,8 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Rychlá dopověď není dostupná pokud je Signal uzamčen!</string>
   <string name="QuickResponseService_problem_sending_message">Problém při odesílání zprávy!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Nová Signal zpráva</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Obsah skrytý</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</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>
@@ -555,8 +562,13 @@ Obdržena zpráva s neznámým identifikačním klíčem. Klepněte pro její zp
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Načítám země...</string>
   <string name="country_selection_fragment__search">Hledat</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scanovat QR kód zobrazný na zařízení pro provázní</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Provázat zařízení</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Žádná zařízení nejsou provázána...</string>
+  <string name="device_list_fragment__link_new_device">Provázat nové zařízení</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">pokračovat</string>
   <!--log_submit_activity-->
@@ -657,15 +669,13 @@ 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.
     </string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Vaše
-zařízení potřebuje síťové připojení aby moh používat tuto funkci aplikace Signal. Zkontrolujte,
-zda je připojeno k 3G nebo Wifi</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Abyste mohli použít tuto funkci Signal, musíte být připojeni k internetu.
+Zkontrolujte, zda jste připojeni přes obilním data nebo Wifi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Firewall</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Jste-li připojeni přes Wifi, je možné, že existuje firewall který blokuje přístup k Signal serverům. Zkuste jinou síť, nebo mobilní data.</string>
@@ -717,6 +727,7 @@ Signal se nedočkal přijetí ověřovací SMS. </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="AndroidManifeset_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>
@@ -752,7 +763,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>
@@ -881,11 +892,13 @@ 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_selected">Vybrán archiv</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-->
@@ -923,6 +936,7 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="text_secure_normal__menu_clear_passphrase">Uzamknout</string>
   <string name="text_secure_normal__mark_all_as_read">Označit vše jako přečtené</string>
   <string name="text_secure_normal__invite_friends">Pozvat přátele</string>
+  <string name="text_secure_normal__help">Nápověda</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Platnost vaší verze aplikace Signal skončila!</string>
   <string name="reminder_header_expired_build_details">Zprávy již nemohou být odesílány, prosím aktualizujte na nejnovější verzi.</string>
@@ -963,8 +977,5 @@ Signal se nedočkal přijetí ověřovací SMS. </string>
   <string name="trimmer__old_messages_successfully_deleted">Staré zprávy byly úspěšně smazány.</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona přenosu</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scanovat QR kód zobrazný na zařízení pro provázní</string>
-  <string name="device_link_fragment__link_device">Provázat zařízení</string>
-  <string name="device_list_fragment__link_new_device">Provázat nové zařízení</string>
   <!--EOF-->
 </resources>

res/values-da/strings.xml

@@ -159,6 +159,7 @@ denne kontakt.</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 +199,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,8 +505,6 @@ 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_signal_message">Ny Signalbesked.</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Indhold skjult</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Billede</string>
   <string name="attachment_type_selector__audio">Lyd</string>
@@ -566,8 +563,13 @@ Modtog en besked med en ukendt identitetsnøgle. Klik for at se og behandle den.
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Indlæser lande...</string>
   <string name="country_selection_fragment__search">Søg</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Skan QR-koden der vises på enheden for at tilkoble.</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Tilkobel enhed</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Ingen enheder tilkoblet</string>
+  <string name="device_list_fragment__link_new_device">Tilkobel ny enhed</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">fortsæt</string>
   <!--log_submit_activity-->
@@ -664,11 +666,8 @@ 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__your_device_needs_network_connectivity">Din enhed kræver en netværksforbindelse for at benytte denne Signal-funktion. Tjek om enheden har forbindelse til Edge, 3G, LTE eller et trådløst netværk.</string>
   <string name="registration_progress_activity__restrictive_firewall">Restriktiv firewall.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Hvis du er tilsluttet Internet via et trådløst netværk, er det muligt, at en firewall blokerer adgangen til Signals server. Prøv et andet trådløst netværk eller brug mobildata.</string>
@@ -712,7 +711,6 @@ mislykkedes.</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__message_details">Beskeddetaljer</string>
   <string name="AndroidManifest_manage_linked_devices">Håndtér tilkoblede enheder</string>
   <string name="AndroidManifest__invite_friends">Invitér venner</string>
   <!--arrays.xml-->
@@ -960,8 +958,5 @@ mislykkedes.</string>
   <string name="trimmer__old_messages_successfully_deleted">Gennemført sletning af gamle beskeder</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Transportikon</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Skan QR-koden der vises på enheden for at tilkoble.</string>
-  <string name="device_link_fragment__link_device">Tilkobel enhed</string>
-  <string name="device_list_fragment__link_new_device">Tilkobel ny enhed</string>
   <!--EOF-->
 </resources>

res/values-de/strings.xml

@@ -17,9 +17,9 @@
 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 -Telefonie 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>
@@ -152,8 +152,15 @@ Signal und Benachrichtigungen dauerhaft entsperren.</string>
   </plurals>
   <string name="ConversationListFragment_deleting">Löschen</string>
   <string name="ConversationListFragment_deleting_selected_threads">Ausgewählte Unterhaltungen werden gelöscht …</string>
+  <string name="ConversationListFragment_archived_conversations">Archivierte Unterhaltungen</string>
+  <string name="ConversationListFragment_undo">RÜCKGÄNGIG</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Unterhaltung zum Posteingang verschoben</string>
+  <string name="ConversationListFragment_archived_conversation">Archivierte Unterhaltung</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Unterhaltungen zum Posteingang 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>
@@ -193,14 +200,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>
@@ -347,7 +354,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>
@@ -481,8 +488,8 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Schnellantwort nicht verfügbar, solange Signal gesperrt ist!</string>
   <string name="QuickResponseService_problem_sending_message">Problem beim Senden der Nachricht!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Neue Signal-Nachricht</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Inhalt verborgen</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</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 +516,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>
@@ -541,8 +548,13 @@ Nachricht mit unbekanntem Schlüssel empfangen. Zum Anzeigen antippen.</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Länder werden geladen …</string>
   <string name="country_selection_fragment__search">Suchen</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Zum Verknüpfen den auf dem Gerät angezeigten QR-Code einscannen</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Gerät verknüpfen</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Keine Geräte verknüpft …</string>
+  <string name="device_list_fragment__link_new_device">Neues Gerät verknüpfen</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">Fortsetzen</string>
   <!--log_submit_activity-->
@@ -639,11 +651,10 @@ 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">Signal konnte sich nicht mit dem Server verbinden.</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 3G- oder WLAN-Verbindung besteht.</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>
   <string name="registration_progress_activity__restrictive_firewall">Restriktive Firewall.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Bei Verbindung über WLAN blockiert möglicherweise eine Firewall den Zugang zum Signal-Server. Versuchen Sie ein anderes Netzwerk oder die mobile Datenverbindung.</string>
@@ -689,6 +700,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</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="AndroidManifeset_conversations_archive">Unterhaltungsarchiv</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Datensicherung</string>
   <string name="arrays__your_identity_key">Ihr Schlüssel</string>
@@ -800,13 +812,13 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="preferences__devices">Geräte</string>
   <string name="preferences__light_theme">Hell</string>
   <string name="preferences__dark_theme">Dunkel</string>
-  <string name="preferences__appearance">Aussehen</string>
+  <string name="preferences__appearance">Darstellung</string>
   <string name="preferences__theme">Design</string>
   <string name="preferences__theme_summary">Design %s</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>
@@ -852,11 +864,13 @@ 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_selected">Archiv ausgewählt</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-->
@@ -894,6 +908,7 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="text_secure_normal__menu_clear_passphrase">Signal sperren</string>
   <string name="text_secure_normal__mark_all_as_read">Alle als gelesen markieren</string>
   <string name="text_secure_normal__invite_friends">Freunde einladen</string>
+  <string name="text_secure_normal__help">Hilfe</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Ihre Version von Signal ist veraltet!</string>
   <string name="reminder_header_expired_build_details">Das Versenden von Nachrichten ist nicht mehr möglich. Bitte Signal auf die neueste Version aktualisieren.</string>
@@ -904,7 +919,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>
@@ -934,8 +949,5 @@ Die Überprüfung der SMS-Bestätigung hat zu lange gedauert.</string>
   <string name="trimmer__old_messages_successfully_deleted">Alte Nachrichten wurden erfolgreich gelöscht</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Übertragungssymbol</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Zum Verknüpfen den auf dem Gerät angezeigten QR-Code einscannen</string>
-  <string name="device_link_fragment__link_device">Gerät verknüpfen</string>
-  <string name="device_list_fragment__link_new_device">Neues Gerät verknüpfen</string>
   <!--EOF-->
 </resources>

res/values-el/strings.xml

@@ -163,6 +163,7 @@
   <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>
@@ -202,14 +203,12 @@
   <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>
   <!--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_contacts_mms_exception">Προέκυψε ένα απρόσμενο σφάλμα και η δημιουργία ομάδας απέτυχε.</string>
   <string name="GroupCreateActivity_contacts_no_members">Χρειάζεται τουλάχιστον ένα άτομο στην ομάδα σου
 !</string>
@@ -506,8 +505,6 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Η γρήγορη απάντηση δεν είναι διαθέσιμη όταν το Signal είναι κλειδωμένο!</string>
   <string name="QuickResponseService_problem_sending_message">Πρόβλημα με την αποστολή μηνύματος!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Νέο μήνυμα Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Κρυμμένα περιεχόμενα</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Εικόνα</string>
   <string name="attachment_type_selector__audio">Ήχος</string>
@@ -566,8 +563,13 @@
   <!--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">Σκάναρε το QR code που εμφανίζεται στην συσκευή για να γίνει η σύνδεση</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-->
@@ -672,17 +674,12 @@
   <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__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.
-Επιβεβαίωσε πως είσαι συνδεδεμένος σε 3G ή WiFi.</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, πιθανώς να υπάρχει ένα τείχος προστασίας που εμποδίζει
@@ -731,7 +728,6 @@
   <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>
   <!--arrays.xml-->
@@ -979,8 +975,5 @@
   <string name="trimmer__old_messages_successfully_deleted">Τα παλιά μηνύματα διαγράφτηκαν επιτυχώς</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Μεταφορά εικονίδιου</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Σκάναρε το QR code που εμφανίζεται στην συσκευή για να γίνει η σύνδεση</string>
-  <string name="device_link_fragment__link_device">Σύνδεση συσκευής</string>
-  <string name="device_list_fragment__link_new_device">Σύνδεση νέας συσκευής</string>
   <!--EOF-->
 </resources>

res/values-es/strings.xml

@@ -163,6 +163,7 @@ Recibido:%4$s</string>
   <string name="ConversationListFragment_deleting_selected_threads">Eliminando conversaciones seleccionadas...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Mensaje de intercambio de claves...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Usando personalizado: %s</string>
   <string name="CustomDefaultPreference_using_default">Usando predeterminado: %s</string>
@@ -202,14 +203,12 @@ 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>
   <!--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_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>
@@ -271,7 +270,7 @@ importarla de nuevo dará como resultado mensajes duplicados.</string>
   </plurals>
   <string name="InviteActivity_lets_switch_to_signal">Pasémonos a Signal: %1$s</string>
   <string name="InviteActivity_no_app_to_share_to">Parece que no tiene ninguna aplicación con qué compartir.</string>
-  <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Los amigos no dejan que sus amigos hablen sin encriptar.</string>
+  <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Los verdaderos amigos no dejan que sus amigos hablen sin cifrar</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">¡No se encontró una clave escaneada!</string>
   <string name="KeyScanningActivity_install_barcode_Scanner">¿Instalar Barcode Scanner?</string>
@@ -324,6 +323,7 @@ importarla de nuevo dará como resultado mensajes duplicados.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Error de red.</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>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Introduzca clave de acceso</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Icono de Signal</string>
@@ -514,8 +514,6 @@ 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_new_signal_message">Nuevo mensaje de Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Contenidos ocultos</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Imagen</string>
   <string name="attachment_type_selector__audio">Audio</string>
@@ -574,8 +572,13 @@ Se recibió un mensaje con una clave de identidad desconocida. Haga clic para pr
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Cargando países...</string>
   <string name="country_selection_fragment__search">Buscar</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Escanear el código QR mostrado en el dispositivo para vincular</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Vincular dispositivo</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">No hay dispositivos vinculados...</string>
+  <string name="device_list_fragment__link_new_device">Vincular nuevo dispositivo</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">continuar</string>
   <!--log_submit_activity-->
@@ -679,8 +682,6 @@ 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__some_possible_problems_include">Algunos posibles
 problemas son:
 
@@ -688,9 +689,6 @@ 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">Sus
-dispositivos necesitan conectividad de red para usar esta característica de Signal. Compruébela para asegurarse
-de que está conectado mediante 3G o 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">
@@ -742,7 +740,6 @@ por SMS.
   <string name="AndroidManifest__media_preview">Previsualización del contenido</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>
   <!--arrays.xml-->
@@ -990,8 +987,5 @@ por SMS.
   <string name="trimmer__old_messages_successfully_deleted">Mensajes antiguos borrados con éxito</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icono de transporte</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Escanear el código QR mostrado en el dispositivo para vincular</string>
-  <string name="device_link_fragment__link_device">Vincular dispositivo</string>
-  <string name="device_list_fragment__link_new_device">Vincular nuevo dispositivo</string>
   <!--EOF-->
 </resources>

res/values-fa/strings.xml

@@ -68,6 +68,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 +104,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>
@@ -127,8 +131,14 @@
   </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 +205,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 +222,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,8 +412,8 @@
   <!--QuickResponseService-->
   <string name="QuickResponseService_problem_sending_message">بروز خطا در ارسال پیام!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">پیام جدید سیگنال</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">محتوای مخفی</string>
+  <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>
@@ -405,6 +421,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,12 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">کشورهای در حال بارگذاری ...</string>
   <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 +494,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 +544,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>
@@ -559,9 +585,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__message_details">جزییات پیام</string>
   <string name="AndroidManifest_manage_linked_devices">مدیریت دستگاه های مرتبط</string>
   <string name="AndroidManifest__invite_friends">دعوت دوستان</string>
+  <string name="AndroidManifeset_conversations_archive">آرشیو گفتگو</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">وارد کردن / خروجی گرفتن</string>
   <string name="arrays__your_identity_key">کلید هویت شما</string>
@@ -577,6 +604,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>
@@ -622,6 +650,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__silent">بی صدا</string>
   <string name="preferences__inthread_notifications">در موضوع اطلاعیه</string>
   <string name="preferences__repeat_alerts">تکرار هشدار</string>
   <string name="preferences__never">هرگز</string>
@@ -663,6 +692,7 @@
   <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>
@@ -697,6 +727,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>
@@ -712,11 +743,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_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-->
@@ -731,6 +764,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-->
@@ -753,6 +787,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>
@@ -778,6 +813,7 @@
   <!--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

@@ -160,8 +160,15 @@ Vastaanotettu: %4$s</string>
   </plurals>
   <string name="ConversationListFragment_deleting">Poistetaan</string>
   <string name="ConversationListFragment_deleting_selected_threads">Valittuja keskusteluja poistetaan...</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>
@@ -201,14 +208,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>
@@ -503,8 +510,8 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Pikavastaus ei toimi, kun Signal on lukittu!</string>
   <string name="QuickResponseService_problem_sending_message">Ongelma viestin lähettämisessä!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Uusi Signal-viesti</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Sisältö piilotettu</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</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>
@@ -563,8 +570,13 @@ Vastaanotettiin viesti tuntemattomalla identiteettiavaimella. Aloita käsittely
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Ladataan maita...</string>
   <string name="country_selection_fragment__search">Hae</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Skannaa yhdistettävän laitteen ruudulla näkyvä QR-koodi</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Yhdistä laite</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Ei yhdistettyjä laitteita...</string>
+  <string name="device_list_fragment__link_new_device">Yhdistä uusi laite</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">jatka</string>
   <!--log_submit_activity-->
@@ -661,13 +673,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 Signalin ominaisuuden käyttämiseen. Tarkista, että
+tarvitsee verkkoyhteyttä tämän TextSecuren 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">
@@ -714,6 +725,7 @@ Signal ei saanut vahvistustekstiviestiä odotusajan sisällä.</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="AndroidManifeset_conversations_archive">Keskusteluarkisto</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Varmuuskopiot</string>
   <string name="arrays__your_identity_key">Identiteettiavaimesi</string>
@@ -877,11 +889,13 @@ 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_selected">Arkistoi valitut</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-->
@@ -919,6 +933,7 @@ Signal ei saanut vahvistustekstiviestiä odotusajan sisällä.</string>
   <string name="text_secure_normal__menu_clear_passphrase">Lukitse</string>
   <string name="text_secure_normal__mark_all_as_read">Merkitse kaikki luetuiksi</string>
   <string name="text_secure_normal__invite_friends">Kutsu ystäviä</string>
+  <string name="text_secure_normal__help">Tuki </string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Käyttämäsi Signalin versio on vanhentunut!</string>
   <string name="reminder_header_expired_build_details">Viestien lähetys ei enää onnistu. Päivitä sovellus viimeisimpään versioon.</string>
@@ -959,8 +974,5 @@ Signal ei saanut vahvistustekstiviestiä odotusajan sisällä.</string>
   <string name="trimmer__old_messages_successfully_deleted">Vanhojen viestien poisto onnistui</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Tyypin kuvake</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Skannaa yhdistettävän laitteen ruudulla näkyvä QR-koodi</string>
-  <string name="device_link_fragment__link_device">Yhdistä laite</string>
-  <string name="device_list_fragment__link_new_device">Yhdistä uusi laite</string>
   <!--EOF-->
 </resources>

res/values-fr/strings.xml

@@ -115,7 +115,7 @@ vérifier ce contact.</string>
   <string name="ConversationActivity_attachment_exceeds_size_limits">Le fichier dépasse la limite de taille pour le type de message que vous avez sélectionné.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Appareil photo non disponible</string>
   <string name="ConversationActivity_unable_to_record_audio">Impossible d\'enregistrer l\'audio !</string>
-  <string name="ConversationActivity_error_sending_voice_message">Erreur lors de l\'envoi d\'un message vocal...</string>
+  <string name="ConversationActivity_error_sending_voice_message">Erreur lors de l\'envoi du message vocal...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Détails du message</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nEnvoyé/Reçu: %2$s</string>
@@ -154,8 +154,15 @@ vérifier ce contact.</string>
   </plurals>
   <string name="ConversationListFragment_deleting">Suppression</string>
   <string name="ConversationListFragment_deleting_selected_threads">Suppression des fils sélectionnés…</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>
@@ -195,14 +202,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 +247,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 +258,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 +286,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 +308,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>
@@ -495,8 +501,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_new_signal_message">Nouveau message Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Contenus cachés</string>
+  <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>
@@ -555,8 +561,13 @@ Un message avec une clé de chiffrement inconnue a été reçu. Cliquer pour l\'
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Chargement des pays...</string>
   <string name="country_selection_fragment__search">Chercher</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scannez le QR code affiché sur l\'appareil pour les lier</string>
+  <!--device_link_fragment-->
+  <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 un nouvel appareil</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">continuer</string>
   <!--log_submit_activity-->
@@ -574,13 +585,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-->
@@ -658,15 +669,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__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
@@ -716,6 +724,7 @@ par SMS.</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="AndroidManifeset_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>
@@ -725,7 +734,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>
@@ -879,11 +888,13 @@ 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_selected">Archive sélectionnée</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-->
@@ -921,6 +932,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>
@@ -961,8 +973,5 @@ par SMS.</string>
   <string name="trimmer__old_messages_successfully_deleted">Anciens messages supprimés avec succès</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icône de transport</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scannez le QR code affiché sur l\'appareil pour les lier</string>
-  <string name="device_link_fragment__link_device">Lier l\'appareil</string>
-  <string name="device_list_fragment__link_new_device">Lier le nouvel appareil</string>
   <!--EOF-->
 </resources>

res/values-hr/strings.xml

@@ -17,6 +17,9 @@
 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,14 @@ 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>
   <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>
@@ -126,6 +141,7 @@ ovaj kontakt.</string>
   <string name="ConversationListFragment_deleting_selected_threads">Brisanje odabranih tema...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Poruka za razmjenu ključa...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Koristeći prilagođeno: %s</string>
   <string name="CustomDefaultPreference_using_default">Koristeći zadano: %s</string>
@@ -160,14 +176,12 @@ ovaj kontakt.</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>
   <!--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_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>
@@ -426,8 +440,6 @@ 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_signal_message">Nova Signal poruka</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Sadržaj je skriven</string>
   <!--attachment_type_selector-->
   <!--change_passphrase_activity-->
   <!--contact_selection_activity-->
@@ -477,6 +489,8 @@ Primljena poruka sa nepoznatim ključem identiteta. Pritisnite za obradu i prika
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Učitavanje zemalja...</string>
   <string name="country_selection_fragment__search">Traži</string>
+  <!--device_add_fragment-->
+  <!--device_link_fragment-->
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Nema povezanih uređaja...</string>
   <!--experience_upgrade_activity-->
@@ -569,14 +583,9 @@ 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>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Vaš
-uređaj treba mrežu povezivost kako biste mogli koristiti Signal mogućnosti. Provjerite da li
-je uređaj povezan na 3G ili Wi-Fi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Ograničenja vatrozida.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Ukoliko ste povezani preko Wi-Fi, moguće je da postoji vatrozid koji blokira pristup na
@@ -623,7 +632,6 @@ neuspješno.</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__message_details">Detalji poruke</string>
   <string name="AndroidManifest_manage_linked_devices">Upravljanje povezanim uređajima</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Uvoz / izvoz</string>

res/values-hu/strings.xml

@@ -7,12 +7,12 @@
   <string name="please_wait">Kérlek várj...</string>
   <!--ApplicationPreferencesActivity-->
   <string name="ApplicationPreferencesActivity_currently_s">Jelenleg: %s</string>
-  <string name="ApplicationPreferenceActivity_you_havent_set_a_passphrase_yet">Még nem állítottál be jelszót!</string>
+  <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">Jelszó tiltása?</string>
+  <string name="ApplicationPreferencesActivity_disable_passphrase">Jelmondat tiltása?</string>
   <string name="ApplicationPreferencesActivity_disable_lock_screen">
 Képernyő zárolásának tiltása az üzeneteknél?</string>
   <string name="ApplicationPreferencesActivity_disable">Tiltás</string>
@@ -45,6 +45,7 @@ Képernyő zárolásának tiltása az üzeneteknél?</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Hang</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Névjegy infó</string>
   <!--AudioSlidePlayer-->
+  <string name="AudioSlidePlayer_error_playing_audio">Hiba a hang lejátszásakor!</string>
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Tiltott névjegyek</string>
   <!--CallScreen-->
@@ -71,21 +72,26 @@ ezt a névjegyet.
   <string name="ConversationItem_error_received_stale_key_exchange_message">Hiba, elévült kulcs-csere üzenet érkezett.</string>
   <string name="ConversationItem_received_key_exchange_message_click_to_process">Kulcs-csere üzenet érkezett, kattints a feldolgozás végrehajtásához!</string>
   <string name="ConversationItem_group_action_left">%1$s elhagyta a csoportot.</string>
-  <string name="ConversationItem_click_for_details">Koppints a részletekért</string>
-  <string name="ConversationItem_click_to_approve_unencrypted">Koppints a nem biztonságos tartalék mód aktiválásához</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Legyen tartalék mód a nem biztonságos SMS?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Legyen tartalék mód a nem biztonságos MMS?</string>
-  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ez az üzenet <b>nem</b> lesz titkosítva, mert a fogadó már nem Signal felhasználó.\n\nTitkosítatlan üzenet küldése?</string>
+  <string name="ConversationItem_click_for_details">Érints a részletekért</string>
+  <string name="ConversationItem_click_to_approve_unencrypted">Érints a védtelen visszaálláshoz</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_sms_dialog_title">Visszaállás védtelen SMS-re?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Visszaállás védtelen MMS-re?</string>
+  <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Ez az üzenet <b>nem</b> lesz titkosítva, mert a címzett már nem Signal felhasználó.\n\nVédtelen üzenet küldése?</string>
   <string name="ConversationItem_unable_to_open_media">Nem található alkalmazás ezen médiafájl megnyitásához.</string>
   <!--ConversationActivity-->
+  <string name="ConversationActivity_reset_secure_session_question">Biztonságos munkamenet alaphelyzetbe állítása?</string>
+  <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Ez segíthet, ha titkosítási problémáid vannak ebben a beszélgetésben. Az üzeneteid meg lesznek tartva.</string>
+  <string name="ConversationActivity_reset">Alaphelyzetbe állítás</string>
+  <string name="ConversationActivity_delete_thread_question">Beszélgetés törlése?</string>
+  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Ez azonnal törölni fogja az összes üzenetet ebben a beszégetésben</string>
   <string name="ConversationActivity_add_attachment">Melléklet hozzáadása</string>
   <string name="ConversationActivity_select_contact_info">Válassz névjegy infót!</string>
   <string name="ConversationActivity_compose_message">Üzenetírás</string>
   <string name="ConversationActivity_sorry_there_was_an_error_setting_your_attachment">Sajnáljuk, egy hiba történt a mellékleted beállításában.</string>
   <string name="ConversationActivity_the_gif_you_selected_was_too_big">Az általad választott gif túl nagy volt!</string>
-  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Sajnos a kiválasztott mozgókép mérete meghaladja a maximális üzenetméret határt (%1$skB).</string>
-  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Sajnos a kiválasztott hangállomány mérete meghaladja a maximális üzenetméret határt (%1$skB).</string>
-  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">A fogadó nem egy érvényes SMS vagy email cím!</string>
+  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Sajnáljuk, a kiválasztott mozgókép mérete meghaladja a maximális üzenetméret határt (%1$skB).</string>
+  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Sajnáljuk, a kiválasztott hangállomány mérete meghaladja a maximális üzenetméret határt (%1$skB).</string>
+  <string name="ConversationActivity_recipient_is_not_a_valid_sms_or_email_address_exclamation">A címzett nem egy érvényes SMS vagy email cím!</string>
   <string name="ConversationActivity_message_is_empty_exclamation">Üres az üzenet!</string>
   <string name="ConversationActivity_group_members">Csoport tagok</string>
   <string name="ConversationActivity_group_conversation">Csoportos beszélgetés</string>
@@ -95,7 +101,7 @@ ezt a névjegyet.
   <string name="ConversationActivity_saved_draft">Mentett piszkozat</string>
   <string name="ConversationActivity_invalid_recipient">Érvénytelen címzett!</string>
   <string name="ConversationActivity_calls_not_supported">A hívások nem támogatottak!</string>
-  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Úgy tűnik ez az eszköz nem támogatja a tárcsázási műveleteket.</string>
+  <string name="ConversationActivity_this_device_does_not_appear_to_support_dial_actions">Úgy tűnik, ez a készülék nem támogatja a tárcsázási műveleteket.</string>
   <string name="ConversationActivity_leave_group">Elhagyod a csoportot?</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_leave_this_group">Biztosan el akarod hagyni ezt a csoportot?</string>
   <string name="ConversationActivity_transport_insecure_sms">Nem biztonságos SMS</string>
@@ -112,6 +118,8 @@ ezt a névjegyet.
   <string name="ConversationActivity_unblock">Tiltás feloldása</string>
   <string name="ConversationActivity_attachment_exceeds_size_limits">A melléklet meghaladja a mérethatárt ahhoz a típusú üzenethez, amit küldesz.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Kamera nem elérhető</string>
+  <string name="ConversationActivity_unable_to_record_audio">Nem lehet hangot rögzíteni!</string>
+  <string name="ConversationActivity_error_sending_voice_message">Hiba a hangüzenet küldése közben...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Üzenet részletek</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Átviteli mód: %1$s\nKüldött/Fogadott: %2$s</string>
@@ -150,8 +158,15 @@ ezt a névjegyet.
   </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>
@@ -161,14 +176,14 @@ ezt a névjegyet.
   <string name="DateUtils_minutes_ago">%d perc</string>
   <!--DeviceListActivity-->
   <string name="DeviceListActivity_unlink_s">Társítás megszüntetése ezzel: \'%s\'?</string>
-  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Ez az eszköz társításának megszüntetésével ez többé nem lesz képes üzeneteket küldeni vagy fogadni.</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Ez a készülék társításának megszüntetésével ez többé nem lesz képes üzeneteket küldeni vagy fogadni.</string>
   <string name="DeviceListActivity_network_connection_failed">Hálózati kapcsolódás sikertelen...</string>
   <string name="DeviceListActivity_try_again">Újrapróbálkozás</string>
-  <string name="DeviceListActivity_unlinking_device">Eszköz társításának megszüntetése...</string>
-  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Eszköz társításának megszüntetése</string>
+  <string name="DeviceListActivity_unlinking_device">Készülék társításának megszüntetése...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Készülék társításának megszüntetése</string>
   <string name="DeviceListActivity_network_failed">Hálózati hiba!</string>
   <!--DeviceListItem-->
-  <string name="DeviceListItem_unnamed_device">Megnevezetlen eszköz</string>
+  <string name="DeviceListItem_unnamed_device">Megnevezetlen készülék</string>
   <string name="DeviceListItem_linked_s">Társítva: %s</string>
   <string name="DeviceListItem_last_active_s">Utoljára aktív %s</string>
   <!--ShareActivity-->
@@ -178,7 +193,7 @@ ezt a névjegyet.
   <string name="ExperienceUpgradeActivity_textsecure_is_now_called_signal">A TextSecure és a RedPhone most egy privát üzenetküldő minden helyzetre: Signal.</string>
   <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Üdvözöl a Signal!</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal">A TextSecure mostantól Signal.</string>
-  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">A TextSecure és a RedPhone most egy alkalmazás: Signal. Koppints a felfedezéshez.</string>
+  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">A TextSecure és a RedPhone most egy alkalmazás: Signal. Érints a felfedezéshez.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Exportálás</string>
   <string name="ExportFragment_export_plaintext_to_storage">Nyílt szöveg exportálása tárolóra?</string>
@@ -191,14 +206,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>
@@ -243,6 +258,7 @@ akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
   <string name="ImportFragment_no_encrypted_backup_found">Nem található titkosított biztonsági mentés!</string>
   <string name="ImportFragment_restore_complete">Visszaállítás befejezve!</string>
   <!--InputPanel-->
+  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Érintsd meg és tartsd a hangüzenet rögzítéséhez, engedd el a küldéshez</string>
   <!--InviteActivity-->
   <string name="InviteActivity_share">Megosztás</string>
   <string name="InviteActivity_send_sms">SMS küldése</string>
@@ -277,6 +293,12 @@ akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
   <string name="NotificationBarManager_signal_call_in_progress">Signal hívás folyamatban</string>
   <string name="NotificationBarManager_missed_call_from_s">Nem fogadott hívás tőle: %s</string>
   <string name="NotificationBarManager_missed_signal_call">Nem fogadott Signal hívás</string>
+  <string name="NotificationBarManager__establishing_signal_call">Signal hívás létesítése</string>
+  <string name="NotificationBarManager__incoming_signal_call">Bejövő Signal hívás</string>
+  <string name="NotificationBarManager__deny_call">Hívás elutasítása</string>
+  <string name="NotificationBarManager__answer_call">Válasz hívásra</string>
+  <string name="NotificationBarManager__end_call">Hívás befejezése</string>
+  <string name="NotificationBarManager__cancel_call">Hívás megszakítása</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Multimédia üzenet</string>
   <!--MessageRecord-->
@@ -288,26 +310,32 @@ akkor az újbóli importálás duplikált üzeneteket eredményez.</string>
   <string name="MessageRecord_missed_call_from">Nem fogadott hívás tőle: %s</string>
   <string name="MessageRecord_s_is_on_signal_say_hey">%s fent van a Signal-on, köszönj be!</string>
   <!--PassphraseChangeActivity-->
-  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">A jelszavak nem egyeznek!</string>
-  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Hibás korábbi jelszó!</string>
-  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Adj meg egy új jelszót!</string>
+  <string name="PassphraseChangeActivity_passphrases_dont_match_exclamation">A jelmondatok nem egyeznek!</string>
+  <string name="PassphraseChangeActivity_incorrect_old_passphrase_exclamation">Hibás régi jelmondat!</string>
+  <string name="PassphraseChangeActivity_enter_new_passphrase_exclamation">Adj meg új jelmondatot!</string>
   <!--DeviceProvisioningActivity-->
-  <string name="DeviceProvisioningActivity_link_this_device">Társítod ezt az eszközt?</string>
+  <string name="DeviceProvisioningActivity_link_this_device">Társítod ezt a Készüléket?</string>
   <string name="DeviceProvisioningActivity_cancel">MÉGSE</string>
   <string name="DeviceProvisioningActivity_continue">FOLYTATÁS</string>
-  <string name="DeviceProvisioningActivity_title">Társítod ezt az eszközt?</string>
+  <string name="DeviceProvisioningActivity_title">Társítod ezt a készüléket?</string>
   <string name="DeviceProvisioningActivity_content_intro">Képes lesz</string>
-  <string name="DeviceProvisioningActivity_content_progress_title">Eszköz társítása</string>
-  <string name="DeviceProvisioningActivity_content_progress_content">Új eszköz társítása</string>
-  <string name="DeviceProvisioningActivity_content_progress_no_device">Nem található eszköz</string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+        • Az összes üzeneted olvasására
+        \n• Üzeneteket küldeni a nevedben
+    </string>
+  <string name="DeviceProvisioningActivity_content_progress_title">Készülék társítása</string>
+  <string name="DeviceProvisioningActivity_content_progress_content">Új készülék társítása...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Készülék jóváhagyva!</string>
+  <string name="DeviceProvisioningActivity_content_progress_no_device">Nem található készülék.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Hálózati hiba</string>
   <string name="DeviceProvisioningActivity_content_progress_key_error">Érvénytelen QR kód</string>
-  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sajnos túl sok eszközöd van társítva jelenleg, próbálj meg néhányat eltávolítani...</string>
+  <string name="DeviceProvisioningActivity_sorry_you_have_too_many_devices_linked_already">Sajnáljuk, túl sok készüléked van társítva jelenleg, próbálj meg néhányat eltávolítani...</string>
+  <string name="DeviceActivity_sorry_this_is_not_a_valid_device_link_qr_code">Sajnáljuk, ez nem egy érvényes készülék társítási QR kód.</string>
   <!--PassphrasePromptActivity-->
-  <string name="PassphrasePromptActivity_enter_passphrase">Jelszó megadása</string>
+  <string name="PassphrasePromptActivity_enter_passphrase">Jelmondat megadása</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signal ikon</string>
-  <string name="PassphrasePromptActivity_ok_button_content_description">Jelszó küldése</string>
-  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Érvénytelen jelszó!</string>
+  <string name="PassphrasePromptActivity_ok_button_content_description">Jelmondat küldése</string>
+  <string name="PassphrasePromptActivity_invalid_passphrase_exclamation">Érvénytelen jelmondat!</string>
   <!--PlayServicesProblemFragment-->
   <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">Az általad használt Google Play Szolgáltatások nem működnek megfelelően.
 Kérlek telepíts újra a Google Play Szolgáltatásokat és próbálkozz újra!</string>
@@ -337,7 +365,7 @@ Kérlek telepíts újra a Google Play Szolgáltatásokat és próbálkozz újra!
   <string name="RedPhone_connected">Kapcsolódva</string>
   <string name="RedPhone_connecting">Kapcsolódás</string>
   <string name="RedPhone_handshake_failed">Kézfogás sikertelen!</string>
-  <string name="RedPhone_recipient_unavailable">A fogadó nem elérhető</string>
+  <string name="RedPhone_recipient_unavailable">A címzett nem elérhető</string>
   <string name="RedPhone_performing_handshake">Kézfogás végrhajtása</string>
   <string name="RedPhone_network_failed">Hálózati hiba!</string>
   <string name="RedPhone_client_failed">Kliens hiba</string>
@@ -348,7 +376,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!
@@ -361,9 +389,9 @@ telefonszámot!
 szám (%s) érvénytelen.
  </string>
   <string name="RegistrationActivity_unsupported">Nem támogatott</string>
-  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Sajnos a jelen
-eszköz nem támogatja az adat alapú üzenetküldést. Az Android 4.0-nál régebbi verziót használó eszközök esetén
-rendelkezniük kell Google fiókkal. Az Android 4.0-t vagy frissebb verziót használó eszközök
+  <string name="RegistrationActivity_sorry_this_device_is_not_supported_for_data_messaging">Sajnáljuk, ez a
+készülék nem támogatja az adat alapú üzenetküldést. Az Android 4.0-nál régebbi verziót használó készülékek esetén
+rendelkezniük kell Google fiókkal. Az Android 4.0-t vagy frissebb verziót használó készülékek
 nem igénylik a Google fiók meglétét, de a Play Áruház alkalmazásnak telepítve kell lennie.
  </string>
   <string name="RegistrationActivity_we_will_now_verify_that_the_following_number_is_associated_with_your_device_s">
@@ -412,7 +440,7 @@ Ellenőrizd újra, hogy ez a te számod! Hamarosan egy SMS-ben fogjuk ellenőriz
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
 Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz és megjelenítéshez.
  </string>
-  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Frissített, de ismeretlen azonosító adatok érkeztek. Koppints az azonosító érvényesítéséhez!</string>
+  <string name="SmsMessageRecord_received_updated_but_unknown_identity_information">Frissített, de ismeretlen azonosító adatok érkeztek. Érints az azonosító érvényesítéséhez!</string>
   <string name="SmsMessageRecord_secure_session_reset">Biztonságos munkamenet alaphelyzetbe állítása.</string>
   <string name="SmsMessageRecord_duplicate_message">Üzenet duplikálása.</string>
   <!--ThreadRecord-->
@@ -460,7 +488,7 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="MmsDatabase_downloading_mms">MMS letöltése...</string>
   <string name="MmsDatabase_mms_download_failed">MMS letöltés sikertelen!</string>
   <string name="MmsDatabase_downloading">Letöltés...</string>
-  <string name="MmsDatabase_mms_pending_download">Koppints és add meg az MMS beállításokat a letöltés folyatásához.</string>
+  <string name="MmsDatabase_mms_pending_download">Érints és add meg az MMS beállításokat a letöltés folyatásához.</string>
   <string name="MmsDatabase_error_decrypting_message">Hiba az üzenet dekódolása közben.</string>
   <!--MmsMessageRecord-->
   <string name="MmsMessageRecord_decrypting_mms_please_wait">MMS dekódolása, kérlek várj...</string>
@@ -475,7 +503,7 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="KeyCachingService_signal_passphrase_cached">Érintsd meg a megnyitáshoz.</string>
   <string name="KeyCachingService_signal_passphrase_cached_with_lock">Érintsd meg a megnyitáshoz, vagy érintsd meg a zárat a bezáráshoz.</string>
   <string name="KeyCachingService_passphrase_cached">A Signal feloldva</string>
-  <string name="KeyCachingService_lock">Lezárás jelszóval</string>
+  <string name="KeyCachingService_lock">Lezárás jelmondattal</string>
   <!--MessageNotifier-->
   <string name="MessageNotifier_d_new_messages_in_d_conversations">%1$d új üzenet %2$d beszélgetésben</string>
   <string name="MessageNotifier_most_recent_from_s">Legutóbbi tőle: %1$s</string>
@@ -493,8 +521,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_new_signal_message">Új Signal üzenet</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Tartalmak rejtve</string>
+  <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>
@@ -502,6 +530,9 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="attachment_type_selector__contact">Névjegy</string>
   <string name="attachment_type_selector__camera">Kamera</string>
   <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">Régi jelmondat</string>
+  <string name="change_passphrase_activity__new_passphrase">Új jelmondat</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">Új jelmondat megismétlése</string>
   <!--contact_selection_activity-->
   <string name="contact_selection_activity__enter_name_or_number">Írj be egy nevet vagy egy számot</string>
   <!--contact_selection_group_activity-->
@@ -519,8 +550,8 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="conversation_title_view__conversation_muted">Beszélgetés némítva</string>
   <!--conversation_activity-->
   <string name="conversation_activity__type_message_push">Signal üzenet küldése</string>
-  <string name="conversation_activity__type_message_sms_insecure">Nem biztonságos SMS küldése</string>
-  <string name="conversation_activity__type_message_mms_insecure">Nem biztonságos MMS küldése</string>
+  <string name="conversation_activity__type_message_sms_insecure">Védtelen SMS küldése</string>
+  <string name="conversation_activity__type_message_mms_insecure">Védtelen MMS küldése</string>
   <string name="conversation_activity__send">Küldés</string>
   <string name="conversation_activity__remove">Törlés</string>
   <string name="conversation_activity__window_description">Beszélgetés vele: %1$s</string>
@@ -529,6 +560,7 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="conversation_activity__attachment_thumbnail">Melléklet előnézet</string>
   <string name="conversation_activity__quick_attachment_drawer_toggle_description">Közvetlen mellékletfelvétel</string>
   <!--conversation_input_panel-->
+  <string name="conversation_input_panel__slide_to_cancel">CSÚSZTASSA EL A MEGSZAKÍTÁSHOZ</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Média üzenet letöltése</string>
   <string name="conversation_item__mms_image_description">Média üzenet</string>
@@ -549,12 +581,17 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Országok betöltése...</string>
   <string name="country_selection_fragment__search">Keresés</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Szkenneld be a készüléken megjelenített QR kódot a társításhoz</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Készülék társítása</string>
   <!--device_list_fragment-->
-  <string name="device_list_fragment__no_devices_linked">Nincsenek társított eszközök...</string>
+  <string name="device_list_fragment__no_devices_linked">Nincsenek társított készülékek...</string>
+  <string name="device_list_fragment__link_new_device">Új készülék társítása</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">folytatás</string>
   <!--log_submit_activity-->
-  <string name="log_submit_activity__log_fetch_failed">Nem sikerült a naplóbejegyzések elérése az eszközön. Helyettük az ADB használható a hibakeresési naplóbejegyzésekhez.</string>
+  <string name="log_submit_activity__log_fetch_failed">Nem sikerült a naplóbejegyzések elérése a készüléken. Helyettük az ADB használható a hibakeresési naplóbejegyzésekhez.</string>
   <string name="log_submit_activity__thanks">Köszönjük a segítségedet!</string>
   <string name="log_submit_activity__submitting">Küldés</string>
   <string name="log_submit_activity__posting_logs">Napló küldése gist-hez...</string>
@@ -590,11 +627,16 @@ Ismeretlen azonosító kulcsú üzenet érkezett. Kattints rá a feldolgozáshoz
   <string name="MmsPreferencesFragment__invalid_uri">A megadott szöveg nem érvényes -URI- azonosító</string>
   <string name="MmsPreferencesFragment__invalid_host">A megadott szöveg nem érvényes kiszolgáló</string>
   <!--GroupUtil-->
+  <plurals name="GroupUtil_joined_the_group">
+    <item quantity="one">%1$s csatlakozott a csoporthoz.</item>
+    <item quantity="other">%1$s csatlakozott a csoporthoz.</item>
+  </plurals>
   <string name="GroupUtil_group_updated">A csoport frissítése megtörtént.</string>
+  <string name="GroupUtil_group_name_is_now">A csoport neve most \'%1$s\'.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Feloldás</string>
   <!--prompt_mms_activity-->
-  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">A Signal-nak szüksége van az MMS beállításokra, hogy kézbesítse a média és csoport üzeneteket a vezeték nélküli szolgáltatódon keresztül. Az eszközöd nem teszi ezt az információt elérhetővé, ami néha igaz a zárolt eszközökre és egyéb korlátozó konfigurációkra.</string>
+  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">A Signal-nak szüksége van az MMS beállításokra, hogy kézbesítse a média és csoport üzeneteket a vezeték nélküli szolgáltatódon keresztül. A készüléked nem teszi ezt az információt elérhetővé, ami néha igaz a zárolt eszközökre és egyéb korlátozó konfigurációkra.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">A média és csoportos üzeneteke küldéséhez kattints az \"OK\" feliratra és add meg a kívánt beállításokat! A szolgáltatód MMS beállításai általában megtalálhatók a \"saját szolgáltató APN\" keresésével. Csupán egyszer van szüksége ezt megtenni.</string>
   <!--recipient_preferences_activity-->
   <string name="recipient_preference_activity__blocked">LETILTVA</string>
@@ -648,25 +690,23 @@ az alakja!
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Hang alapú azonosítás</string>
   <string name="registration_progress_activity__signal_can_also_call_you_to_verify_your_number">
-        A Signal fel is tud hívni, hogy ellenőrizze a számod. Koppints a \'Hívj Fel\'-re és írd be a
+        A Signal fel is tud hívni, hogy ellenőrizze a számod. Érintsd meg a \'Hívj Fel\'-t és írd be a
         hatjegyű kódot, amit ott hallasz.
     </string>
   <string name="registration_progress_activity__verify">Ellenőrzés</string>
   <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">Az eszközödnek
-        szüksége van hálózati kapcsolatra, hogy használja ezt Signal funkciót. Győződj meg
-        arról, hogy kapcsolódva van 3G -hez vagy Wi-Fi -hez.
+  <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>
@@ -710,20 +750,21 @@ sikertelen.
   <string name="message_details_header__from">Feladó:</string>
   <string name="message_details_header__with">Továbbá:</string>
   <!--AndroidManifest.xml-->
-  <string name="AndroidManifest__create_passphrase">Jelszó létrehozása</string>
-  <string name="AndroidManifest__enter_passphrase">Jelszó megadása</string>
+  <string name="AndroidManifest__create_passphrase">Jelmondat létrehozása</string>
+  <string name="AndroidManifest__enter_passphrase">Jelmondat megadása</string>
   <string name="AndroidManifest__select_contacts">Névjegyek kiválasztása</string>
   <string name="AndroidManifest__signal_detected">Signal észlelve</string>
   <string name="AndroidManifest__public_identity_key">Nyilvános azonosító kulcs</string>
-  <string name="AndroidManifest__change_passphrase">Jelszó megváltoztatása</string>
+  <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észletei</string>
-  <string name="AndroidManifest_manage_linked_devices">Társított eszközök kezelése</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="AndroidManifeset_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>
@@ -739,6 +780,7 @@ sikertelen.
   <string name="arrays__disabled">Letiltott</string>
   <string name="arrays__name_and_message">Név és üzenet</string>
   <string name="arrays__name_only">Csak név</string>
+  <string name="arrays__no_name_or_message">Nincs név vagy üzenet</string>
   <string name="arrays__images">Képek</string>
   <string name="arrays__audio">Hang</string>
   <string name="arrays__video">Videó</string>
@@ -762,19 +804,19 @@ sikertelen.
   <string name="preferences__display_settings">Kijelző beállítások</string>
   <string name="preferences__choose_identity">Azonosító választása</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Bejegyzés választása a névjegyzékből.</string>
-  <string name="preferences__change_passphrase">Jelszó megváltoztatása</string>
+  <string name="preferences__change_passphrase">Jelmondat megváltoztatása</string>
   <string name="preferences__change_your_passphrase">Változtasd meg a jelmondatod</string>
-  <string name="preferences__enable_passphrase">Jelszó engedélyezése</string>
-  <string name="preferences__passphrase_summary">Jelszó %s</string>
+  <string name="preferences__enable_passphrase">Jelmondat engedélyezése</string>
+  <string name="preferences__passphrase_summary">Jelmondat %s</string>
   <string name="preferences__enable_lock_screen_for_messages">Zárolt képernyő engedélyezése az üzeneteknek</string>
   <string name="preferences__screen_security">Képernyő biztonság</string>
   <string name="preferences__screen_security_summary">Képernyő biztonság %s</string>
   <string name="preferences__disable_screen_security_to_allow_screen_shots">A képernyőkép mentés tiltása a korábbi listákban és az alkalmazáson belül</string>
-  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Jelszó memóriából való törlése egy bizonyos idő elteltével</string>
-  <string name="preferences__timeout_passphrase">Jelszó érvényességi ideje lezáráshoz</string>
-  <string name="preferences__pref_timeout_interval_dialogtitle">Jelszó érvényességi idejének kiválasztása</string>
-  <string name="preferences__pref_timeout_interval_title">Érvényességi idő tartama</string>
-  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">A jelszó memóriából való törlése előtti várakozási idő tartama</string>
+  <string name="preferences__forget_passphrase_from_memory_after_some_interval">Jelmondat memóriából való törlése egy bizonyos idő elteltével</string>
+  <string name="preferences__timeout_passphrase">Jelmondat időtúllépés</string>
+  <string name="preferences__pref_timeout_interval_dialogtitle">Jelmondat időtúllépés kiválasztása</string>
+  <string name="preferences__pref_timeout_interval_title">Időtúllépés intervalluma</string>
+  <string name="preferences__the_amount_of_time_to_wait_before_forgetting_passphrase">A jelmondat memóriából való törlése előtti várakozási idő tartama</string>
   <string name="preferences__notifications">Értesítések</string>
   <string name="preferences__enable_message_notifications">Üzenet értesítések engedélyezése</string>
   <string name="preferences__led_color">LED színe</string>
@@ -786,6 +828,7 @@ sikertelen.
   <string name="preferences__pref_led_blink_custom_pattern_set">LED villogási mintázat beállításra került!</string>
   <string name="preferences__sound">Hang</string>
   <string name="preferences__change_notification_sound">Értesítési hang megváltoztatása</string>
+  <string name="preferences__silent">Csendes</string>
   <string name="preferences__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>
@@ -830,6 +873,7 @@ sikertelen.
   <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>
   <string name="preferences__appearance">Megjelenés</string>
@@ -842,7 +886,7 @@ sikertelen.
   <string name="preferences__free_private_messages_and_calls">Ingyenes privát üzenetek és hívások Signal felhasználóknak</string>
   <string name="preferences__submit_debug_log">Hibakeresési napló küldése</string>
   <string name="preferences__support_wifi_calling">\'WiFi hívás\' kompatibilitási mód</string>
-  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Engedélyezd, ha az eszközöd az SMS/MMS-t WiFi-n keresztül kézbesíti (csak akkor engedélyezd, ha a \'WiFi hívás\' engedélyezve van az eszközödön)</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Engedélyezd, ha a készüléked az SMS/MMS-t WiFi-n keresztül kézbesíti (csak akkor engedélyezd, ha a \'WiFi hívás\' engedélyezve van az eszközödön)</string>
   <string name="preferences_app_protection__blocked_contacts">Letiltott névjegyek</string>
   <string name="preferences_notifications__display_in_notifications">Megjelenítés értesítésekben</string>
   <string name="preferences_chats__when_using_mobile_data">Mobil adat használatakor</string>
@@ -868,6 +912,7 @@ sikertelen.
   <!--conversation_callable_insecure-->
   <string name="conversation_callable_insecure__menu_call">Hívás</string>
   <!--conversation_callable_secure-->
+  <string name="conversation_callable_secure__menu_call">Signal hívás</string>
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Üzenet részletei</string>
   <string name="conversation_context__menu_copy_text">Szöveg másolása</string>
@@ -883,11 +928,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_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-->
@@ -902,6 +949,7 @@ sikertelen.
   <string name="conversation__menu_add_attachment">Melléklet hozzáadása</string>
   <string name="conversation__menu_update_group">Csoport frissítése</string>
   <string name="conversation__menu_leave_group">Csoport elhagyása</string>
+  <string name="conversation__menu_delete_thread">Beszélgetés törlése</string>
   <string name="conversation__menu_view_media">Összes fénykép</string>
   <string name="conversation__menu_conversation_settings">Beszélgetés beállítások</string>
   <!--conversation_popup-->
@@ -924,15 +972,16 @@ 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>
   <string name="reminder_header_expired_build_button">FRISSÍTÉS</string>
   <string name="reminder_header_sms_default_title">Használat alapértelmezett SMS alkalmazásként</string>
-  <string name="reminder_header_sms_default_text">Koppints a Signal alapértelmezett SMS alkalmazássá tételéhez.</string>
+  <string name="reminder_header_sms_default_text">Érints a Signal alapértelmezett SMS alkalmazássá tételéhez.</string>
   <string name="reminder_header_sms_default_button">BEÁLLÍTÁS</string>
   <string name="reminder_header_sms_import_title">Rendszer SMS importálása</string>
-  <string name="reminder_header_sms_import_text">Koppints a telefon SMS üzeneteinek titkosított adatbázisba másolásához.</string>
+  <string name="reminder_header_sms_import_text">Érints a telefon SMS üzeneteinek titkosított adatbázisba másolásához.</string>
   <string name="reminder_header_sms_import_button">IMPORTÁLÁS</string>
   <string name="reminder_header_push_title">Signal üzenetek és hívások engedélyezése</string>
   <string name="reminder_header_push_text">Javítsd fel az üzenetküldési élményedet.</string>
@@ -953,6 +1002,7 @@ sikertelen.
   <!--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-->
   <string name="redphone_audio_popup_menu__handset">Kézibeszélő</string>
   <string name="redphone_audio_popup_menu__headset">Fejhallgató</string>

res/values-in/strings.xml

@@ -143,6 +143,7 @@ kontak ini.
   <string name="ConversationListFragment_deleting_selected_threads">Menghapus percakapan yang dipilih ...</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Pesan pertukaran kunci...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Gunakan ubahsuai: %s</string>
   <string name="CustomDefaultPreference_using_default">Gunakan bawaan: %s</string>
@@ -179,14 +180,12 @@ kontak ini.
   <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>
   <!--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>
@@ -468,8 +467,6 @@ 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_new_signal_message">Pesan Signal baru</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Konten disembunyikan</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Gambar</string>
   <string name="attachment_type_selector__audio">Audio</string>
@@ -524,6 +521,8 @@ Menerima pesan dengan identitas kunci tidak diketahui. Klik untuk memproses dan
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Memuat daftar negara...</string>
   <string name="country_selection_fragment__search">Cari</string>
+  <!--device_add_fragment-->
+  <!--device_link_fragment-->
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Tidak ada perangkat yang dikaitkan...</string>
   <!--experience_upgrade_activity-->
@@ -625,19 +624,12 @@ termasuk:
   <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__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__your_device_needs_network_connectivity">Perangkat
-        Anda membutuhkan konektivitas jaringan agar bisa menggunkaan fitur Signal. Periksa untuk memastikan
-        perangkat Anda tersambung ke jaringan 3G tau Wi-Fi.
-    </string>
   <string name="registration_progress_activity__restrictive_firewall">Firewall yang ketat.
 </string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
@@ -690,7 +682,6 @@ Telah gagal
   <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">Detail Pesan</string>
   <string name="AndroidManifest_manage_linked_devices">Kelola perangkat terkait</string>
   <string name="AndroidManifest__invite_friends">Undang teman</string>
   <!--arrays.xml-->

res/values-it/strings.xml

@@ -153,8 +153,15 @@ questo contatto.</string>
   </plurals>
   <string name="ConversationListFragment_deleting">Eliminazione</string>
   <string name="ConversationListFragment_deleting_selected_threads">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>
@@ -194,14 +201,12 @@ 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>
   <!--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_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 +245,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>
@@ -274,6 +280,7 @@ una nuova importazione creerà dei messaggi duplicati.</string>
   <string name="NotificationBarManager_signal_call_in_progress">Chiamata con Signal in corso</string>
   <string name="NotificationBarManager_missed_call_from_s">Chiamata persa da %s</string>
   <string name="NotificationBarManager_missed_signal_call">Chiamata Signal persa</string>
+  <string name="NotificationBarManager__establishing_signal_call">Preparazione chiamata Signal</string>
   <string name="NotificationBarManager__incoming_signal_call">Chiamata Signal in arrivo</string>
   <string name="NotificationBarManager__deny_call">Rifiuta chiamata</string>
   <string name="NotificationBarManager__answer_call">Rispondi</string>
@@ -494,8 +501,8 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Risposta veloce non disponibile quando Signal è bloccato!</string>
   <string name="QuickResponseService_problem_sending_message">Problema nell\'invio del messaggio!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Nuovo messaggio Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Contenuto nascosto</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</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>
@@ -553,8 +560,13 @@ Ricevuto un messaggio con una chiave identificativa sconosciuta. Clicca per elab
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Caricamento dei paese...</string>
   <string name="country_selection_fragment__search">Cerca</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scansiona il codice QR visualizzato sul dispositivo da collegare</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Collega dispositivo</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Nessun dispositivo collegato...</string>
+  <string name="device_list_fragment__link_new_device">Collega nuovo dispositivo</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">continua</string>
   <!--log_submit_activity-->
@@ -655,15 +667,13 @@ 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 poter utilizzare questa funzionalità di Signal è richiesta la connettività di rete. Assicurati di essere connesso in 3G o 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">
@@ -716,6 +726,7 @@ non riuscita.
   <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="AndroidManifeset_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>
@@ -879,11 +890,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_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-->
@@ -921,6 +934,7 @@ non riuscita.
   <string name="text_secure_normal__menu_clear_passphrase">Blocca</string>
   <string name="text_secure_normal__mark_all_as_read">Segnala tutto come già letto</string>
   <string name="text_secure_normal__invite_friends">Invita amici</string>
+  <string name="text_secure_normal__help">Aiuto</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">La tua versione di Signal è scaduta!</string>
   <string name="reminder_header_expired_build_details">Non riesci più a mandare messaggi, per piacere aggiorna all\'ultima versione.</string>
@@ -961,8 +975,5 @@ non riuscita.
   <string name="trimmer__old_messages_successfully_deleted">Vecchi messaggi cancellati con successo</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icona trasporto</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scansiona il codice QR visualizzato sul dispositivo da collegare</string>
-  <string name="device_link_fragment__link_device">Collega dispositivo</string>
-  <string name="device_list_fragment__link_new_device">Collega nuovo dispositivo</string>
   <!--EOF-->
 </resources>

res/values-iw/strings.xml

@@ -23,7 +23,7 @@
   <string name="ApplicationPreferencesActivity_error_connecting_to_server">אירעה שגיאה בחיבור לשרת!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS מופעלים</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">נא לגעת כדי לשנות את האפליקציה שלך ל־SMS</string>
-  <string name="ApplicationPreferencesActivity_sms_disabled">SMS כבויים</string>
+  <string name="ApplicationPreferencesActivity_sms_disabled">התמיכה ב־SMS כבויה</string>
   <string name="ApplicationPreferencesActivity_touch_to_make_signal_your_default_sms_app">נא לגעת כדי להפוך את סיגנל לאפליקציה שלך ל־SMS</string>
   <string name="ApplicationPreferencesActivity_on">מופעל</string>
   <string name="ApplicationPreferencesActivity_On">מופעל</string>
@@ -157,8 +157,15 @@
   </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>
@@ -198,14 +205,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>
@@ -330,7 +337,7 @@
   <string name="PlayServicesProblemFragment_the_version_of_google_play_services_you_have_installed_is_not_functioning">הגרסה הזאת של שירותי גוגל Play לא עובדת כמו שצריך. נא להתקין את שירותי גוגל 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_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>
@@ -503,8 +510,8 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">תשובה מהירה אינה זמינה כשסיגנל נעול!</string>
   <string name="QuickResponseService_problem_sending_message">בעיה בשליחת מסר!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">מסר חדש בסיגנל</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">התוכן מוסתר</string>
+  <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>
@@ -525,7 +532,7 @@
   <!--ContactSelectionListFragment-->
   <string name="ContactSelectionlistFragment_select_for">לבחור עבור</string>
   <!--blocked_contacts_fragment-->
-  <string name="blocked_contacts_fragment__no_blocked_contacts">אין אנשים קשר חסומים...</string>
+  <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-->
@@ -563,8 +570,13 @@
   <!--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">נא לסרוק את קוד ה־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-->
@@ -640,7 +652,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">בעיות אפשריות
@@ -666,28 +678,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__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
@@ -725,6 +733,7 @@
   <string name="AndroidManifest__message_details">פרטי מסר</string>
   <string name="AndroidManifest_manage_linked_devices">ניהול מכשירים מקושרים</string>
   <string name="AndroidManifest__invite_friends">להזמין חברים</string>
+  <string name="AndroidManifeset_conversations_archive">גנזך שיחות</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">ייבוא / ייצוא</string>
   <string name="arrays__your_identity_key">מפתח הזהות שלך</string>
@@ -751,7 +760,7 @@
   </plurals>
   <!--preferences.xml-->
   <string name="preferences__general">כללי</string>
-  <string name="preferences__sms_mms">SMS ו־MMS</string>
+  <string name="preferences__sms_mms">תמיכה ב־SMS ו־MMS</string>
   <string name="preferences__pref_all_sms_title">לקבל כל SMS</string>
   <string name="preferences__pref_all_mms_title">לקבל כל MMS</string>
   <string name="preferences__use_signal_for_viewing_and_storing_all_incoming_text_messages">להשתמש בסיגנל לכל המסרים הנכנסים</string>
@@ -826,7 +835,7 @@
   <string name="preferences__mmsc_username">שם משתמש של MMSC</string>
   <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__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>
@@ -834,14 +843,14 @@
   <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__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__language_summary">שפה: %s</string>
   <string name="preferences__signal_messages_and_calls">מסרים ושיחות של סיגנל</string>
   <string name="preferences__free_private_messages_and_calls">מסרים ושיחות בחינם ובפרטיות למשתמשי סיגנל</string>
   <string name="preferences__submit_debug_log">שליחת יומן תיקון שגיאות</string>
@@ -888,11 +897,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_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-->
@@ -930,6 +941,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>
@@ -970,8 +982,5 @@
   <string name="trimmer__old_messages_successfully_deleted">מסרים ישנים נמחקו</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">סמל תעבורה</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">נא לסרוק את קוד ה־QR שמוצג במכשיר כדי לקשר</string>
-  <string name="device_link_fragment__link_device">קישור מכשיר</string>
-  <string name="device_list_fragment__link_new_device">קישור מכשיר חדש</string>
   <!--EOF-->
 </resources>

res/values-ja/strings.xml

@@ -116,6 +116,7 @@
   <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,7 +348,6 @@
   <!--QuickResponseService-->
   <string name="QuickResponseService_problem_sending_message">送信メッセージでの問題!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">非表示コンテンツ</string>
   <!--attachment_type_selector-->
   <!--change_passphrase_activity-->
   <!--contact_selection_activity-->
@@ -396,6 +396,8 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">国名を読み込み中...</string>
   <string name="country_selection_fragment__search">検索</string>
+  <!--device_add_fragment-->
+  <!--device_link_fragment-->
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">リンクしたデバイスはありません...</string>
   <!--experience_upgrade_activity-->
@@ -502,7 +504,6 @@
   <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>
   <!--arrays.xml-->
   <string name="arrays__import_export">インポート／エクスポート</string>

res/values-kn-rIN/strings.xml

@@ -108,6 +108,7 @@
   <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>
@@ -365,6 +366,8 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">ರಾಷ್ಟ್ರಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ ...</string>
   <string name="country_selection_fragment__search">ಹುಡುಕಿ</string>
+  <!--device_add_fragment-->
+  <!--device_link_fragment-->
   <!--device_list_fragment-->
   <!--experience_upgrade_activity-->
   <!--log_submit_activity-->
@@ -468,7 +471,6 @@
   <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>
   <!--arrays.xml-->
   <string name="arrays__import_export">ಆಮದು / ರಫ್ತು</string>
   <string name="arrays__enabled">ಸಕ್ರಿಯಗೊಳಿಸು</string>

res/values-ko/strings.xml

@@ -147,8 +147,15 @@
   </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>
@@ -188,14 +195,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>
@@ -471,8 +478,8 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Signal 잠겨 있는 경우 빠른 응답 사용할 수 없음</string>
   <string name="QuickResponseService_problem_sending_message">메시지 보내지 못함</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">새 Signal 메시지</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">콘텐츠 숨겨짐</string>
+  <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>
@@ -531,8 +538,13 @@
   <!--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">기기를 연결하려면 기기에 표시된 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-->
@@ -622,7 +634,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>
@@ -668,6 +680,7 @@
   <string name="AndroidManifest__message_details">메시지 세부정보</string>
   <string name="AndroidManifest_manage_linked_devices">연결된 기기 관리</string>
   <string name="AndroidManifest__invite_friends">친구 초대</string>
+  <string name="AndroidManifeset_conversations_archive">보관된 대화</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">가져오기 / 내보내기</string>
   <string name="arrays__your_identity_key">내 인증 키</string>
@@ -830,11 +843,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_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-->
@@ -872,6 +887,7 @@
   <string name="text_secure_normal__menu_clear_passphrase">Signal 잠금</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>
@@ -912,8 +928,5 @@
   <string name="trimmer__old_messages_successfully_deleted">이전 메시지 삭제됨</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">전송 아이콘</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">기기를 연결하려면 기기에 표시된 QR코드를 스캔하세요.</string>
-  <string name="device_link_fragment__link_device">기기 연결</string>
-  <string name="device_list_fragment__link_new_device">새 기기 연결</string>
   <!--EOF-->
 </resources>

res/values-mk/strings.xml

@@ -108,6 +108,7 @@
   <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>
@@ -377,6 +378,8 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Вчитување на држави...</string>
   <string name="country_selection_fragment__search">Барај</string>
+  <!--device_add_fragment-->
+  <!--device_link_fragment-->
   <!--device_list_fragment-->
   <!--experience_upgrade_activity-->
   <!--log_submit_activity-->
@@ -485,7 +488,6 @@
   <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>
   <!--arrays.xml-->
   <string name="arrays__import_export">Импортирај / експортирај</string>
   <string name="arrays__use_default">Користете стандардно</string>

res/values-nl/strings.xml

@@ -153,8 +153,15 @@
   </plurals>
   <string name="ConversationListFragment_deleting">Aan het verwijderen</string>
   <string name="ConversationListFragment_deleting_selected_threads">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>
@@ -194,14 +201,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>
@@ -487,8 +494,8 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Snel reageren niet beschikbaar als Signal vergrendeld is!</string>
   <string name="QuickResponseService_problem_sending_message">Fout bij het bericht versturen!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Nieuw Signal bericht</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Inhoud verborgen</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</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>
@@ -547,8 +554,13 @@ Bericht ontvangen met een onbekende identiteitssleutel. Klik om te verwerken en
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Landen laden...</string>
   <string name="country_selection_fragment__search">Zoeken</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scan de weergegeven QR code op het te koppelen apparaat</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Apparaat koppelen</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Geen apparaten gekoppeld...</string>
+  <string name="device_list_fragment__link_new_device">Nieuw apparaat koppelen</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">doorgaan</string>
   <!--log_submit_activity-->
@@ -649,12 +661,11 @@ 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>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Je apparaat heeft een netwerkverbinding nodig voor deze Signal functie. Controleer of je verbonden bent met je mobiele internet of WiFi.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Je apparaat heeft een netwerkverbinding nodig voor deze Signal functie. Controleer of je verbonden bent met mobiel internet of WiFi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Beperkende firewall.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Als je bent verbonden via WiFi is het mogelijk dat een firewall de verbinding met de Signal-server blokkeert. Probeer een ander- of het mobiele netwerk.</string>
@@ -698,9 +709,10 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <string name="AndroidManifest__media_preview">Media Voorvertoning</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">Bericht Details</string>
-  <string name="AndroidManifest_manage_linked_devices">Beheer gekoppelde apparaten</string>
+  <string name="AndroidManifest__message_details">Berichtdetails</string>
+  <string name="AndroidManifest_manage_linked_devices">Gekoppelde apparaten beheren</string>
   <string name="AndroidManifest__invite_friends">Vrienden uitnodigen</string>
+  <string name="AndroidManifeset_conversations_archive">Gesprekkenarchief</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importeren / exporteren</string>
   <string name="arrays__your_identity_key">Jouw identiteitssleutel</string>
@@ -864,11 +876,13 @@ 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_selected">Selectie archiveren</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-->
@@ -906,6 +920,7 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <string name="text_secure_normal__menu_clear_passphrase">Vergrendelen</string>
   <string name="text_secure_normal__mark_all_as_read">Alles als gelezen markeren</string>
   <string name="text_secure_normal__invite_friends">Vrienden uitnodigen</string>
+  <string name="text_secure_normal__help">Hulp</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Je versie van Signal is verouderd!</string>
   <string name="reminder_header_expired_build_details">Berichten zullen niet langer verzonden worden, gelieve te updaten naar de recentste versie.</string>
@@ -946,8 +961,5 @@ Signal heeft te lang moeten wachten op het binnenkomen van de verificatie-SMS.</
   <string name="trimmer__old_messages_successfully_deleted">Oude berichten succesvol verwijderd</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Transportkanaal icoon</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scan de weergegeven QR code op het te koppelen apparaat</string>
-  <string name="device_link_fragment__link_device">Apparaat koppelen</string>
-  <string name="device_list_fragment__link_new_device">Nieuw apparaat koppelen</string>
   <!--EOF-->
 </resources>

res/values-no/strings.xml

@@ -154,8 +154,15 @@ denne kontakten.</string>
   </plurals>
   <string name="ConversationListFragment_deleting">Sletter</string>
   <string name="ConversationListFragment_deleting_selected_threads">Sletter utvalgte tråder...</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>
@@ -195,14 +202,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>
@@ -490,8 +497,8 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Rask tilbakemelding ikke tilgjengelig når Signal er låst!</string>
   <string name="QuickResponseService_problem_sending_message">Kunne ikke sende melding!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Ny Signal melding</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Innhold skjult</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</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>
@@ -550,8 +557,13 @@ Mottatt melding med ukjent ID nøkkel. Klikk for å prosessere og vise.</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Laster land...</string>
   <string name="country_selection_fragment__search">Søk</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Skann QR koden vist på enheten for å koble</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Koble enhet</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Ingen enheter tilkoblet...</string>
+  <string name="device_list_fragment__link_new_device">Koble ny enhet</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">fortsett</string>
   <!--log_submit_activity-->
@@ -650,12 +662,11 @@ 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>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Enheten din trenger nettverkskonnektivitet for å kunne benytte denne Signal funksjonen. Sjekk at den er tilknyttet Wi-Fi eller mobil data.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Enheten din trenger en nettverksforbindelse for å kunne bruke denne Signal funksjonen. Sjekk at enheten er tilkoblet mobil data eller Wi-Fi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Restriktiv brannvegg.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">Dersom du er tilkoblet via Wi-Fi kan det være at det er en brannvegg som blokkerer tilgangen til Signal serveren. Prøv et annet nettverk eller mobil data.</string>
   <string name="registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
@@ -703,6 +714,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="AndroidManifeset_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>
@@ -866,11 +878,13 @@ 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_selected">Arkiv valgt</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-->
@@ -908,6 +922,7 @@ feilet.</string>
   <string name="text_secure_normal__menu_clear_passphrase">Lås</string>
   <string name="text_secure_normal__mark_all_as_read">Marker alle som lest</string>
   <string name="text_secure_normal__invite_friends">Inviter venner</string>
+  <string name="text_secure_normal__help">Hjelp</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Din versjon av Signal er foreldet!</string>
   <string name="reminder_header_expired_build_details">Det vil ikke lenger være mulig å sende meldinger. Vær vennlig å oppdatere til siste versjon.</string>
@@ -948,8 +963,5 @@ feilet.</string>
   <string name="trimmer__old_messages_successfully_deleted">Sletting av gamle meldinger vellykket</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Transportikon</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Skann QR koden vist på enheten for å koble</string>
-  <string name="device_link_fragment__link_device">Koble enhet</string>
-  <string name="device_list_fragment__link_new_device">Koble ny enhet</string>
   <!--EOF-->
 </resources>

res/values-pl/strings.xml

@@ -18,38 +18,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 +73,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 +105,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 +132,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 +147,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_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>
@@ -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,8 +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_new_signal_message">Nowa wiadomość Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Zawartość ukryta</string>
+  <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>
@@ -502,8 +566,13 @@ Otrzymano wiadomość z nieznanym kluczem tożsamości. Kliknij aby przetworzyć
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Wczytywanie krajów...</string>
   <string name="country_selection_fragment__search">Szukaj</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Skanuj kod QR wyświetlony na urządzeniu które chcesz dodać</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Dodaj urządzenie</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Brak zarejestrowanych urządzeń...</string>
+  <string name="device_list_fragment__link_new_device">Dodaj nowe urządzenie</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">kontynuuj</string>
   <!--log_submit_activity-->
@@ -585,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>
@@ -599,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>
@@ -646,6 +719,7 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</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="AndroidManifeset_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>
@@ -764,8 +838,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>
@@ -810,11 +884,13 @@ 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_selected">Wybrane 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-->
@@ -852,6 +928,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>
@@ -863,8 +940,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>
@@ -890,8 +969,5 @@ Upłynął czas oczekiwania na wiadomość weryfikacyjną SMS.</string>
   <string name="trimmer__old_messages_successfully_deleted">Stare wiadomości zostały pomyślnie usunięte</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona transportu</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Skanuj kod QR wyświetlony na urządzeniu które chcesz dodać</string>
-  <string name="device_link_fragment__link_device">Dodaj urządzenie</string>
-  <string name="device_list_fragment__link_new_device">Dodaj nowe urządzenie</string>
   <!--EOF-->
 </resources>

res/values-pt-rBR/strings.xml

@@ -46,6 +46,7 @@
   <string name="AttachmentTypeSelectorAdapter_audio">Áudio</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Informações de contato</string>
   <!--AudioSlidePlayer-->
+  <string name="AudioSlidePlayer_error_playing_audio">Erro ao tocar áudio!</string>
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Contatos bloqueados</string>
   <!--CallScreen-->
@@ -62,6 +63,7 @@
   <string name="ConfirmIdentityDialog_accept">Aceitar</string>
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s">Mensagem %s</string>
+  <string name="ContactsDatabase_signal_call_s">Chamada Signal %s</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Tamanho da mensagem: %d KB</string>
   <string name="ConversationItem_expires_s">Expira: %s</string>
@@ -81,6 +83,8 @@ Tem certeza que deseja fazer isto?</string>
   <!--ConversationActivity-->
   <string name="ConversationActivity_reset_secure_session_question">Reiniciar sessão de segurança?</string>
   <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Isto pode ajudar se você está tendo problemas de criptografia nesta conversa. Suas mensagens serão mantidas.</string>
+  <string name="ConversationActivity_reset">Reiniciar</string>
+  <string name="ConversationActivity_delete_thread_question">Apagar conversa?</string>
   <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Isto irá apagar permanentemente todas mensagens nesta conversa.</string>
   <string name="ConversationActivity_add_attachment">Adicionar anexo</string>
   <string name="ConversationActivity_select_contact_info">Selecionar informações de contato</string>
@@ -131,6 +135,7 @@ Tem certeza que deseja fazer isto?</string>
     <item quantity="other">Isto irá excluir permanentemente todas as %1$d mensagens selecionadas.</item>
   </plurals>
   <string name="ConversationFragment_save_to_sd_card">Salvar no cartão SD?</string>
+  <string name="ConversationFragment_saving_this_media_to_storage_warning">Ao salvar este dado na memória no aparelho outros aplicativos terão acesso a ele.\n\nContinuar?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Erro a gravar anexo para o cartão SD!</string>
   <string name="ConversationFragment_success_exclamation">Sucesso!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Não foi possível escrever no cartão SD!</string>
@@ -155,8 +160,15 @@ Tem certeza que deseja fazer isto?</string>
   </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>
@@ -196,14 +208,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>
@@ -258,6 +270,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>
@@ -490,8 +510,6 @@ 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_signal_message">Nova Mensagem via Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Conteúdo escondido</string>
   <!--attachment_type_selector-->
   <string name="attachment_type_selector__image">Imagem</string>
   <string name="attachment_type_selector__audio">Áudio</string>
@@ -550,6 +568,9 @@ Tem certeza que deseja fazer isto?</string>
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Carregando países...</string>
   <string name="country_selection_fragment__search">Procurar</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Escaneie o código QR mostrado no aparelho para conectar</string>
+  <!--device_link_fragment-->
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Nenhum dispositivo vinculado...</string>
   <!--experience_upgrade_activity-->
@@ -675,7 +696,6 @@ falhou.</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__message_details">Detalhes da mensagem</string>
   <string name="AndroidManifest_manage_linked_devices">Gerenciar dispositivos vinculados</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importar / exportar</string>
@@ -899,6 +919,5 @@ falhou.</string>
   <string name="trimmer__old_messages_successfully_deleted">Mensagens antigas excluídas com sucesso</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ícone do transporte</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Escaneie o código QR mostrado no aparelho para conectar</string>
   <!--EOF-->
 </resources>

res/values-pt/strings.xml

@@ -158,8 +158,15 @@ que %2$s reinstalou o Signal e tem agora uma nova chave de identidade.
   </plurals>
   <string name="ConversationListFragment_deleting">A apagar</string>
   <string name="ConversationListFragment_deleting_selected_threads">A apagar 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>
@@ -199,14 +206,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>
@@ -507,8 +514,8 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">A resposta rápida encontra-se indisponível quando o Signal está bloqueado!</string>
   <string name="QuickResponseService_problem_sending_message">Problema no envio da mensagem!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Nova mensagem Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Conteúdos escondidos</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</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>
@@ -567,8 +574,13 @@ Recebida mensagem com chave de identidade desconhecida. Clique para processar e
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">A carregar lista de países...</string>
   <string name="country_selection_fragment__search">Procurar</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Leia o código QR apresentado no dispositivo para o interligar</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Interligar dispositivo</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Nenhum dispositivo interligado...</string>
+  <string name="device_list_fragment__link_new_device">Interligar dispositivo novo</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">continuar</string>
   <!--log_submit_activity-->
@@ -675,9 +687,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>
@@ -685,10 +695,9 @@ possíveis incluem:
 de rede.
 </string>
   <string name="registration_progress_activity__your_device_needs_network_connectivity">O seu
-dispositivo necessita de conectividade para usar esta funcionalidade Signal.
-Pressione para assegurar
-que está ligado a 3G ou Wi-Fi.
-</string>
+dispositivo necessita de conectividade de rede para usar esta função Signal.
+Certifique-se que 
+está ligado a dados móveis ou Wi-Fi.</string>
   <string name="registration_progress_activity__restrictive_firewall">Firewall restritiva.
 </string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
@@ -741,6 +750,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="AndroidManifeset_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>
@@ -904,11 +914,13 @@ 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_selected">Arquivo 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-->
@@ -946,6 +958,7 @@ falhou.
   <string name="text_secure_normal__menu_clear_passphrase">Desbloquear</string>
   <string name="text_secure_normal__mark_all_as_read">Marcar todas como lidas</string>
   <string name="text_secure_normal__invite_friends">Convidar amigos</string>
+  <string name="text_secure_normal__help">Ajuda</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">A sua versão de Signal expirou!</string>
   <string name="reminder_header_expired_build_details">As mensagens já não poderão ser enviadas correctamente, por favor actualize para a versão mais recente.</string>
@@ -986,8 +999,5 @@ falhou.
   <string name="trimmer__old_messages_successfully_deleted">Mensagens antigas apagadas com sucesso</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Icon de transporte</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Leia o código QR apresentado no dispositivo para o interligar</string>
-  <string name="device_link_fragment__link_device">Interligar dispositivo</string>
-  <string name="device_list_fragment__link_new_device">Interligar dispositivo novo</string>
   <!--EOF-->
 </resources>

res/values-ro/strings.xml

@@ -18,7 +18,9 @@
     </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>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS Activat</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Atingeţi pentru a schimba aplicaţia SMS implicită</string>
@@ -44,6 +46,7 @@
   <string name="AttachmentTypeSelectorAdapter_audio">Audio</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Informații contact</string>
   <!--AudioSlidePlayer-->
+  <string name="AudioSlidePlayer_error_playing_audio">Eroare la redarea audio!</string>
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Contacte blocate</string>
   <!--CallScreen-->
@@ -70,6 +73,10 @@
   <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>
   <string name="ConversationActivity_add_attachment">Adauga atasament</string>
   <string name="ConversationActivity_select_contact_info">Selectează informații de contact</string>
   <string name="ConversationActivity_compose_message">Compune mesaj</string>
@@ -93,7 +100,7 @@
   <string name="ConversationActivity_transport_insecure_sms">SMS nesecurizat</string>
   <string name="ConversationActivity_transport_insecure_mms">MMS nesecurizat</string>
   <string name="ConversationActivity_transport_signal">Signal</string>
-  <string name="ConversationActivity_lets_switch_to_signal">Hai să trecem pe Signal %1$s</string>
+  <string name="ConversationActivity_lets_switch_to_signal">Hai să folosim Signal %1$s</string>
   <string name="ConversationActivity_lets_use_this_to_chat">Hai să utilizăm aplicația asta ca să vorbim: %1$s</string>
   <string name="ConversationActivity_error_leaving_group">Eroare la parăsirea grupului...</string>
   <string name="ConversationActivity_mms_not_supported_title">MMS-ul nu este suportat</string>
@@ -104,6 +111,8 @@
   <string name="ConversationActivity_unblock">Deblochează</string>
   <string name="ConversationActivity_attachment_exceeds_size_limits">Atașamentul depășește limita de mărime pentru tipul de mesaj pe care vrei să-l trimiți.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Cameră indisponibilă</string>
+  <string name="ConversationActivity_unable_to_record_audio">Nu se poate înregistra audio!</string>
+  <string name="ConversationActivity_error_sending_voice_message">Eroare la trimiterea mesajului vocal...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Detalii mesaj</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nTrimis/Primit: %2$s</string>
@@ -113,6 +122,11 @@
     <item quantity="few">Șterg mesajele selectate?</item>
     <item quantity="other">Șterg mesajele selectate?</item>
   </plurals>
+  <plurals name="ConversationFragment_this_will_permanently_delete_all_n_selected_messages">
+    <item quantity="one">Această acțiune va șterge permanent mesajul selectat.</item>
+    <item quantity="few">Această acțiune va șterge permanent toate cele %1$d mesaje selectate.</item>
+    <item quantity="other">Această acțiune va șterge permanent toate cele %1$d mesaje selectate.</item>
+  </plurals>
   <string name="ConversationFragment_save_to_sd_card">Salvez pe spațiul de stocare?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">A apărut o eroare în timpul salvării pe spațiul de stocare!</string>
   <string name="ConversationFragment_success_exclamation">Succes!</string>
@@ -133,10 +147,21 @@
     <item quantity="few">Șterg conversațiile selectate?</item>
     <item quantity="other">Șterg conversațiile selectate?</item>
   </plurals>
+  <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
+    <item quantity="one">Această acțiune va șterge permanent conversația selectată.</item>
+    <item quantity="few">Această acțiune va șterge permanent toate cele %1$d conversații selectate.</item>
+    <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_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>
@@ -161,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-->
@@ -170,13 +200,15 @@
   <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>
   <string name="GroupCreateActivity_creating_group">Se creează %1$s…</string>
   <string name="GroupCreateActivity_updating_group">Se actualizează %1$s...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">%1$s nu a putut fi adăugat deoarece nu este un utlizator Signal.</string>
   <string name="GroupCreateActivity_loading_group_details">Se încarcă detaliile grupului...</string>
   <string name="GroupCreateActivity_youre_already_in_the_group">Ești deja în grup.</string>
   <!--GroupMembersDialog-->
@@ -185,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>
@@ -202,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>
@@ -220,7 +259,7 @@
     <item quantity="few">Trimit %d invitații prin SMS?</item>
     <item quantity="other">Trimit %d invitații prin SMS?</item>
   </plurals>
-  <string name="InviteActivity_lets_switch_to_signal">Hai să trecem pe Signal: %1$s</string>
+  <string name="InviteActivity_lets_switch_to_signal">Hai să folosim Signal: %1$s</string>
   <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Prietenii nu-și lasă prietenii să comunice necriptat.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Nu a fost găsită nici o cheie scanată!</string>
@@ -237,6 +276,12 @@
   <string name="NotificationBarManager_signal_call_in_progress">Apel Signal în curs</string>
   <string name="NotificationBarManager_missed_call_from_s">Apel ratat de la %s</string>
   <string name="NotificationBarManager_missed_signal_call">Apel Signal ratat</string>
+  <string name="NotificationBarManager__establishing_signal_call">Se realizează un apel Signal</string>
+  <string name="NotificationBarManager__incoming_signal_call">Apel de intrare Signal</string>
+  <string name="NotificationBarManager__deny_call">Respinge apel</string>
+  <string name="NotificationBarManager__answer_call">Răspunde apelului</string>
+  <string name="NotificationBarManager__end_call">Închide apelul</string>
+  <string name="NotificationBarManager__cancel_call">Anulează apel</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Mesaj multimedia</string>
   <!--MessageRecord-->
@@ -251,18 +296,25 @@
   <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>
   <!--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>
@@ -271,6 +323,7 @@
   <string name="RatingManager_later">Mai târziu</string>
   <!--RecipientPreferencesActivity-->
   <string name="RecipientPreferenceActivity_block_this_contact_question">Blochez acest contact?</string>
+  <string name="RecipientPreferenceActivity_you_will_no_longer_receive_messages_or_calls_from_this_user">Nu o să mai primești mesaje sau apeluri de la acest utilizator.</string>
   <string name="RecipientPreferenceActivity_block">Blochează</string>
   <string name="RecipientPreferenceActivity_unblock_this_contact_question">Deblochez acest contact?</string>
   <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Sunteți sigur că doriți deblocarea acestui contact?</string>
@@ -309,6 +362,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>
@@ -368,6 +425,7 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Destinatarul nu are o cheie de identitate.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Destinatarul nu are o cheie de identitate!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Scanează cheia partenerului pentru comparație</string>
+  <string name="VerifyIdentityActivity_get_your_key_scanned">Lasă-ți cheia ta să fie scanată</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">ATENȚIE, cheia scanată NU SE POTRIVEȘTE! Verifică semnătura digitală cu atenție.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">NU E VERIFICAT!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Cheia partenerului este corectă. Este necesar de asemenea ca și partenerul tău să verifice cheia ta.</string>
@@ -426,10 +484,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_new_signal_message">Mesaj nou Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Conţinut ascuns</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</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>
@@ -437,6 +496,9 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="attachment_type_selector__contact">Contact</string>
   <string name="attachment_type_selector__camera">Camera</string>
   <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">Parola veche</string>
+  <string name="change_passphrase_activity__new_passphrase">Parola nouă</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">Repetă parola nouă</string>
   <!--contact_selection_activity-->
   <string name="contact_selection_activity__enter_name_or_number">Introduceţi un nume sau un număr</string>
   <!--contact_selection_group_activity-->
@@ -482,7 +544,13 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <!--country_selection_fragment-->
   <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-->
@@ -499,8 +567,13 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Se actualizează baza de date...</string>
   <string name="export_fragment__export_plaintext_backup">Exportă backup necriptat</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exportă un fișier de backup text compatibil cu \'SMS Backup &amp; Restore.\'</string>
   <string name="import_fragment__import_system_sms_database">Import baza de date cu SMS-uri?</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importă baza de date din aplicația implicită de mesagerie din sistem</string>
+  <string name="import_fragment__restore_encrypted_backup">Restaurează backup criptat?</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">Restaurează un backup criptat exportat anterior cu Signal </string>
   <string name="import_fragment__import_plaintext_backup">Importă backup text</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">Importă un fișier de backup text. Compatibil cu \'SMS Backup &amp;  Restore.\'</string>
   <!--load_more_header-->
   <string name="load_more_header__see_full_conversation">Vezi conversația completă.</string>
   <!--media_overview_activity-->
@@ -516,20 +589,28 @@ Primit mesaj trimis cu o cheie de identitate necunoscută. Faceți click pentru
   <string name="MmsPreferencesFragment__invalid_uri">Textul introdus nu este un URI valid</string>
   <string name="MmsPreferencesFragment__invalid_host">Textul introdus nu este o gazdă validă</string>
   <!--GroupUtil-->
+  <plurals name="GroupUtil_joined_the_group">
+    <item quantity="one">%1$s s-a alăturat grupului.</item>
+    <item quantity="few">%1$s s-au alăturat grupului.</item>
+    <item quantity="other">%1$s s-au alăturat grupului.</item>
+  </plurals>
   <string name="GroupUtil_group_updated">Grupul a fost actualizat.</string>
+  <string name="GroupUtil_group_name_is_now">Numele grupului este acum \'%1$s\'.</string>
   <!--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>
   <string name="recipient_preferences__color">Culoare</string>
   <string name="recipient_preferences__color_for_this_contact">Culoare pentru acest contact</string>
-  <string name="recipient_preferences__verify_identity">Verifică identitate</string>
+  <string name="recipient_preferences__verify_identity">Verifică identitatea</string>
   <!--- redphone_call_controls-->
   <string name="redphone_call_card__signal_call">Apel Signal</string>
   <string name="redphone_call_controls__end_call">închide apelul</string>
@@ -561,12 +642,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>
@@ -613,7 +697,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="AndroidManifeset_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>
@@ -629,6 +715,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <string name="arrays__disabled">Dezactivat</string>
   <string name="arrays__name_and_message">Nume şi mesaj</string>
   <string name="arrays__name_only">Numai numele</string>
+  <string name="arrays__no_name_or_message">Niciun nume sau mesaj</string>
   <string name="arrays__images">Imagini</string>
   <string name="arrays__audio">Audio</string>
   <string name="arrays__video">Video</string>
@@ -677,6 +764,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <string name="preferences__pref_led_blink_custom_pattern_set">Şablonul personalizat de clipire a LED-ului a fost setat!</string>
   <string name="preferences__sound">Sunet</string>
   <string name="preferences__change_notification_sound">Schimbă sunetul de notificare</string>
+  <string name="preferences__silent">Silențios</string>
   <string name="preferences__inthread_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>
@@ -721,6 +809,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <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__devices">Dispozitive</string>
   <string name="preferences__light_theme">Deschisă</string>
   <string name="preferences__dark_theme">Închisă</string>
   <string name="preferences__appearance">Aspect</string>
@@ -741,7 +830,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>
   <!--****************************************-->
@@ -760,6 +849,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <!--conversation_callable_insecure-->
   <string name="conversation_callable_insecure__menu_call">Sună</string>
   <!--conversation_callable_secure-->
+  <string name="conversation_callable_secure__menu_call">Apel Signal</string>
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Detalii mesaj</string>
   <string name="conversation_context__menu_copy_text">Copiază textul</string>
@@ -775,10 +865,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_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-->
@@ -791,6 +883,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <string name="conversation__menu_add_attachment">Adaugă atașament</string>
   <string name="conversation__menu_update_group">Actualizează grup</string>
   <string name="conversation__menu_leave_group">Părăseşte grupul</string>
+  <string name="conversation__menu_delete_thread">Șterge conversația</string>
   <string name="conversation__menu_view_media">Toate imaginile</string>
   <string name="conversation__menu_conversation_settings">Setări conversaţie</string>
   <!--conversation_popup-->
@@ -802,7 +895,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <string name="conversation_group_options__conversation">Conversatii</string>
   <string name="conversation_group_options__broadcast">Difuzare</string>
   <!--key_scanning-->
-  <string name="key_scanning__menu_compare">Compara</string>
+  <string name="key_scanning__menu_compare">Compară</string>
   <string name="key_scanning__menu_get_scanned_to_compare">Permite scanarea pentru comparație</string>
   <string name="key_scanning__menu_scan_to_compare">Scanează pentru comparație</string>
   <!--text_secure_normal-->
@@ -812,6 +905,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <string name="text_secure_normal__menu_clear_passphrase">Blocare</string>
   <string name="text_secure_normal__mark_all_as_read">Marchează tot ca citit</string>
   <string name="text_secure_normal__invite_friends">Invită prieteni</string>
+  <string name="text_secure_normal__help">Asistență</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Versiunea ta de Signal a expirat!</string>
   <string name="reminder_header_expired_build_details">Mesajele nu vor mai putea fi trimise cu succes, vă rog actualizați aplicația la versiunea cea mai recentă.</string>
@@ -819,11 +913,14 @@ 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>
+  <string name="reminder_header_push_text">Actualizează-ți experiența ta de comunicare.</string>
   <string name="reminder_header_push_button">ACTIVEAZĂ</string>
   <string name="reminder_header_invite_title">Invită la Signal</string>
+  <string name="reminder_header_invite_text">Treci la următorul nivel al conversației cu %1$s.</string>
   <string name="reminder_header_invite_button">INVITĂ</string>
   <string name="reminder_header_share_title">Invită-ți prietenii!</string>
   <string name="reminder_header_share_text">Cu cât mai mulți prieteni utilizează Signal, cu atât devine mai bun.</string>
@@ -838,6 +935,7 @@ Vă rugăm să aveți răbdare, vă vom notifica când verificarea este complet
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Previzualizare imagine</string>
   <!--new_conversation_activity-->
+  <string name="new_conversation_activity__refresh">Reîmprospătează</string>
   <!--redphone_audio_popup_menu-->
   <string name="redphone_audio_popup_menu__handset">Mobil</string>
   <string name="redphone_audio_popup_menu__headset">Căști</string>

res/values-ru/strings.xml

@@ -17,6 +17,8 @@
 Отключить пароль на просмотр сообщений?</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_error_connecting_to_server">Ошибка при соединении с сервером!</string>
   <string name="ApplicationPreferencesActivity_sms_enabled">SMS включены</string>
   <string name="ApplicationPreferencesActivity_touch_to_change_your_default_sms_app">Нажмите для выбора SMS-приложения по умолчанию</string>
@@ -42,6 +44,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-->
@@ -53,6 +56,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>
@@ -69,6 +73,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>
@@ -92,6 +101,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>
@@ -101,11 +112,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>
@@ -120,10 +140,18 @@
   <!--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>
   <string name="ConversationListFragment_deleting">Удаление</string>
   <string name="ConversationListFragment_deleting_selected_threads">Удаляем выбранные разговоры...</string>
+  <string name="ConversationListFragment_undo">ОТМЕНИТЬ</string>
   <!--ConversationListItem-->
   <string name="ConversationListItem_key_exchange_message">Сообщениe обмена ключами...</string>
+  <!--ConversationListItemAction-->
   <!--CustomDefaultPreference-->
   <string name="CustomDefaultPreference_using_custom">Пользовательское: %s</string>
   <string name="CustomDefaultPreference_using_default">По умолчанию: %s</string>
@@ -158,14 +186,12 @@
   <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>
   <!--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_contacts_mms_exception">Непредвиденная ошибка не позволила создать группу.</string>
   <string name="GroupCreateActivity_contacts_no_members">Нужен как минимум один участник в группе!</string>
   <string name="GroupCreateActivity_contacts_invalid_number">Один из участников имеет неправильный номер. Пожалуйста, исправьте или удалите этот контакт и попробуйте снова.</string>
@@ -201,6 +227,11 @@
   <string name="ImportFragment_restore_complete">Восстановление завершено.</string>
   <!--InputPanel-->
   <!--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_invite_to_signal">Пригласить в Signal</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">При сканировании ключ не обнаружен!</string>
   <string name="KeyScanningActivity_install_barcode_Scanner">Установить сканер штрих-кодов?</string>
@@ -216,6 +247,7 @@
   <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__answer_call">Ответить на звонок</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">MMS-сообщение</string>
   <!--MessageRecord-->
@@ -415,9 +447,14 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Быстрые ответы недоступны, когда SIgnal заблокирован!</string>
   <string name="QuickResponseService_problem_sending_message">Проблема при отправке сообщения!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Новое сообщение в Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Содержимое скрыто</string>
+  <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-->
   <!--contact_selection_activity-->
   <string name="contact_selection_activity__enter_name_or_number">Введите имя или номер</string>
@@ -446,6 +483,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,6 +504,8 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Загружаем страны...</string>
   <string name="country_selection_fragment__search">Поиск</string>
+  <!--device_add_fragment-->
+  <!--device_link_fragment-->
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Нет привязанных устройств...</string>
   <!--experience_upgrade_activity-->
@@ -513,6 +553,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>
@@ -555,15 +596,12 @@ 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__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">
@@ -612,21 +650,26 @@ SMS-подтверждения...
   <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__message_details">Детали сообщений</string>
   <string name="AndroidManifest_manage_linked_devices">Управление привязанными устройствами</string>
+  <string name="AndroidManifest__invite_friends">Пригласить друзей в Signal</string>
+  <string name="AndroidManifeset_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>
@@ -675,6 +718,7 @@ 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__silent">Тихий</string>
   <string name="preferences__inthread_notifications">Уведомления при разговоре</string>
   <string name="preferences__play_inthread_notifications">Проигрывать звук уведомления, даже когда открыт текущий разговор</string>
   <string name="preferences__repeat_alerts">Повторять сигналы</string>
@@ -719,6 +763,7 @@ SMS-подтверждения...
   <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>
@@ -789,6 +834,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-->
@@ -810,9 +856,12 @@ 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>
@@ -823,6 +872,8 @@ SMS-подтверждения...
   <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_button">ПОДЕЛИТЬСЯ</string>
   <string name="reminder_header_close_button">ЗАКРЫТЬ</string>
   <!--MediaPreviewActivity-->
   <string name="MediaPreviewActivity_you">Вы</string>
@@ -833,6 +884,7 @@ SMS-подтверждения...
   <!--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-sk/strings.xml

@@ -116,6 +116,7 @@ identitu tohto kontaktu.
   <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>
@@ -380,6 +381,8 @@ Bola prijatá správa s neznámou identou. Kliknite pre spracovanie a zobrazenie
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Načítavanie krajín...</string>
   <string name="country_selection_fragment__search">Hľadaj</string>
+  <!--device_add_fragment-->
+  <!--device_link_fragment-->
   <!--device_list_fragment-->
   <!--experience_upgrade_activity-->
   <!--log_submit_activity-->
@@ -490,7 +493,6 @@ zlyhalo.
   <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>
-  <string name="AndroidManifest__message_details">Detaily správy</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Import / export</string>
   <string name="arrays__use_default">Použiť predvolené</string>

res/values-sl/strings.xml

@@ -161,8 +161,15 @@ preveriti ta stik.</string>
   </plurals>
   <string name="ConversationListFragment_deleting">Brisanje</string>
   <string name="ConversationListFragment_deleting_selected_threads">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>
@@ -202,14 +209,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>
@@ -498,8 +505,8 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Hiter odziv ni mogoč kadar je aplikacija Signal zaklenjena!</string>
   <string name="QuickResponseService_problem_sending_message">Težava pri pošiljanju sporočila</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Novo sporočilo Signal</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Vsebina prikrita</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</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>
@@ -558,8 +565,13 @@ Prejeto sporočilo z neznanim identifikacijskim ključem. Kliknite za obdelavo i
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Pripravljam države...</string>
   <string name="country_selection_fragment__search">Poišči</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Za povezavo skeniraj kodo QR na napravi</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Poveži z napravo</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Ni povezanih naprav...</string>
+  <string name="device_list_fragment__link_new_device">Poveži z novo napravo</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">nadaljuj</string>
   <!--log_submit_activity-->
@@ -660,13 +672,12 @@ 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
 z omrežjem.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Za uporabo storitev Signal potrebuje vaša naprava podatkovno povezavo. Preverite, če ste povezani s 3G, LTE ali Wi-Fi.</string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Za delovanje storitve Signal potrebuje vaša naprava omrežno povezanost. Preverite, če ste priključeni na Wi-Fi ali mobilno omrežje.</string>
   <string name="registration_progress_activity__restrictive_firewall">Omejujoč požarni zid.</string>
   <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
 Če ste povezani z Wi-Fi, je možno, da je vašo povazavo blokira požarni zid. Poskusite z drugim Wi-Fi ali mobilnim omrežjem.</string>
@@ -714,6 +725,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="AndroidManifeset_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>
@@ -879,11 +891,13 @@ 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_selected">Izbrani arhiv</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-->
@@ -921,6 +935,7 @@ bila uspešna.</string>
   <string name="text_secure_normal__menu_clear_passphrase">Zakleni</string>
   <string name="text_secure_normal__mark_all_as_read">Označi vse kot prebrano</string>
   <string name="text_secure_normal__invite_friends">Povabi prijatelje</string>
+  <string name="text_secure_normal__help">Ponoč</string>
   <!--reminder_header-->
   <string name="reminder_header_expired_build">Vaša različica aplikacije Signal je potekla!</string>
   <string name="reminder_header_expired_build_details">Pošiljanje sporočil ni več mogoče. Prosimo, posodobite aplikacijo na zadnjo različico.</string>
@@ -961,8 +976,5 @@ bila uspešna.</string>
   <string name="trimmer__old_messages_successfully_deleted">Stara sporočila so bila uspešno izbrisana</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Ikona transporta</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Za povezavo skeniraj kodo QR na napravi</string>
-  <string name="device_link_fragment__link_device">Poveži z napravo</string>
-  <string name="device_list_fragment__link_new_device">Poveži z novo napravo</string>
   <!--EOF-->
 </resources>

res/values-sr/strings.xml

@@ -60,7 +60,7 @@
 овај контакт.</string>
   <string name="ConfirmIdentityDialog_accept">Прихвати</string>
   <!--ContactsDatabase-->
-  <string name="ContactsDatabase_message_s">Порука %s</string>
+  <string name="ContactsDatabase_message_s">Порука за %s</string>
   <string name="ContactsDatabase_signal_call_s">Позови %s Сигналом</string>
   <!--ConversationItem-->
   <string name="ConversationItem_message_size_d_kb">Величина поруке: %d KB</string>
@@ -161,8 +161,15 @@
   </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 +209,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>
@@ -509,8 +516,8 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">Брзи одговор није доступан ако је Сигнал закључан!</string>
   <string name="QuickResponseService_problem_sending_message">Проблем са слањем поруке!</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Нова порука на Сигналу</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Садржај сакривен</string>
+  <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>
@@ -569,8 +576,13 @@
   <!--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-->
@@ -675,15 +687,12 @@
   <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">Нема везе
 са мрежом.</string>
-  <string name="registration_progress_activity__your_device_needs_network_connectivity">Вашем
-уређају је потребна веза са мрежом да бисте користили ову функцију Сигнала.
-Уверите се да је повезан на 3G или бежичну мрежу.</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">
 Ако сте повезани са бежичном мрежом, могуће је да вам ватробран блокира
@@ -731,6 +740,7 @@
   <string name="AndroidManifest__message_details">Детаљи поруке</string>
   <string name="AndroidManifest_manage_linked_devices">Управљај повезаним уређајима</string>
   <string name="AndroidManifest__invite_friends">Позивница пријатељима</string>
+  <string name="AndroidManifeset_conversations_archive">Архива преписки</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Увоз/извоз</string>
   <string name="arrays__your_identity_key">Ваш кључ идентитета</string>
@@ -895,11 +905,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_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-->
@@ -937,6 +949,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>
@@ -977,8 +990,5 @@
   <string name="trimmer__old_messages_successfully_deleted">Старе поруке успешно обрисане</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">Икона преноса</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">За повезивање очитајте бар-кôд приказан на уређају.</string>
-  <string name="device_link_fragment__link_device">Повежи уређај</string>
-  <string name="device_list_fragment__link_new_device">Повежи нови уређај</string>
   <!--EOF-->
 </resources>

res/values-sv/strings.xml

@@ -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>
@@ -45,6 +45,7 @@ Stäng av låsskärm för meddelanden?</string>
   <string name="AttachmentTypeSelectorAdapter_audio">Ljud</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Kontaktinformation</string>
   <!--AudioSlidePlayer-->
+  <string name="AudioSlidePlayer_error_playing_audio">Fel vid uppspelning av ljud!</string>
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Blockerade kontakter</string>
   <!--CallScreen-->
@@ -74,6 +75,11 @@ verifiera denna kontakt.</string>
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Denna meddelande kommer <b>inte</b> krypterades eftersom mottagaren inte längre är en Signal-användare. \n\nSkicka osäkert meddelande?</string>
   <string name="ConversationItem_unable_to_open_media">Kan ej hitta app som kan öppna denna media.</string>
   <!--ConversationActivity-->
+  <string name="ConversationActivity_reset_secure_session_question">Starta om säker session?</string>
+  <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Detta kan hjälpa om du har krypteringsproblem i den här konversationen. Dina meddelanden kommer behållas.</string>
+  <string name="ConversationActivity_reset">Starta om</string>
+  <string name="ConversationActivity_delete_thread_question">Radera konversation?</string>
+  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Detta kommer permanent radera alla meddelanden i den här konversationen.</string>
   <string name="ConversationActivity_add_attachment">Bifoga fil</string>
   <string name="ConversationActivity_select_contact_info">Välj kontaktinformation</string>
   <string name="ConversationActivity_compose_message">Skriv meddelande</string>
@@ -108,6 +114,8 @@ verifiera denna kontakt.</string>
   <string name="ConversationActivity_unblock">Avblockera</string>
   <string name="ConversationActivity_attachment_exceeds_size_limits">Den bifogade filen är för stor för den typ av meddelande du försöker skicka.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Kamera otillgänglig</string>
+  <string name="ConversationActivity_unable_to_record_audio">Kunde inte spela in ljud!</string>
+  <string name="ConversationActivity_error_sending_voice_message">Fel när röstmeddelande skulle skickas...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Meddelandedetaljer</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Transport: %1$s\nSkickat/Mottagits: %2$s</string>
@@ -121,6 +129,7 @@ verifiera denna kontakt.</string>
     <item quantity="other">Detta kommer permanent radera %1$d valda meddelanden.</item>
   </plurals>
   <string name="ConversationFragment_save_to_sd_card">Spara till lagring?</string>
+  <string name="ConversationFragment_saving_this_media_to_storage_warning">Att spara denna media till lagring kommer göra att andra appar på din enhet att får tillgång till den.\n\nFortsätta?</string>
   <string name="ConversationFragment_error_while_saving_attachment_to_sd_card">Det blev ett fel när bifogad fil skulle sparas till lagring!</string>
   <string name="ConversationFragment_success_exclamation">Klart!</string>
   <string name="ConversationFragment_unable_to_write_to_sd_card_exclamation">Kan inte skriva till lagring!</string>
@@ -145,8 +154,15 @@ verifiera denna kontakt.</string>
   </plurals>
   <string name="ConversationListFragment_deleting">Raderar</string>
   <string name="ConversationListFragment_deleting_selected_threads">Raderar markerade trådar...</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>
@@ -176,21 +192,24 @@ verifiera denna kontakt.</string>
   <string name="ExperienceUpgradeActivity_textsecure_is_now_signal_long">TextSecure och RedPhone är nu en app: Signal. Tryck för att utforska.</string>
   <!--ExportFragment-->
   <string name="ExportFragment_export">Exportera</string>
+  <string name="ExportFragment_export_plaintext_to_storage">Exportera okrypterat till lagring?</string>
+  <string name="ExportFragment_warning_this_will_export_the_plaintext_contents">Varning, detta kommer exportera innehållet i dina Signal-meddelanden okrypterat till lagringen.</string>
   <string name="ExportFragment_cancel">Avbryt</string>
   <string name="ExportFragment_exporting">Sparar</string>
+  <string name="ExportFragment_exporting_plaintext_to_storage">Exporterar okrypterat till lagring...</string>
   <string name="ExportFragment_error_unable_to_write_to_storage">Fel, kunde inte skriva till lagringsutrymmet.</string>
   <string name="ExportFragment_error_while_writing_to_storage">Fel vid skrivande till lagringsutrymmet.</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>
@@ -231,6 +250,7 @@ som inte finns i säkerhetskopian.</string>
   <string name="ImportFragment_no_encrypted_backup_found">Ingen krypterad säkerhetskopia kunde hittas!</string>
   <string name="ImportFragment_restore_complete">Återställningen lyckades!</string>
   <!--InputPanel-->
+  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Tryck och håll in för att spela in ett röstmeddelande, släpp för att skicka</string>
   <!--InviteActivity-->
   <string name="InviteActivity_share">Dela</string>
   <string name="InviteActivity_send_sms">Skicka SMS</string>
@@ -239,6 +259,14 @@ som inte finns i säkerhetskopian.</string>
   <string name="InviteActivity_heart_content_description">Hjärta</string>
   <string name="InviteActivity_invitations_sent">Inbjudningar skickade!</string>
   <string name="InviteActivity_invite_to_signal">Bjud in till Signal</string>
+  <plurals name="InviteActivity_send_to_friends">
+    <item quantity="one">SKICKA TILL 1 VÄN</item>
+    <item quantity="other">SKICKA TILL %d VÄNNER</item>
+  </plurals>
+  <plurals name="InviteActivity_send_sms_invites">
+    <item quantity="one">Skicka 1 SMS-inbjudan?</item>
+    <item quantity="other">Skicka %d SMS-inbjudningar?</item>
+  </plurals>
   <string name="InviteActivity_lets_switch_to_signal">Byt till Signal: %1$s</string>
   <string name="InviteActivity_no_app_to_share_to">Verkar som att du inte har några appar att dela till.</string>
   <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Vänner låter inte varandra chatta okrypterat.</string>
@@ -257,6 +285,12 @@ som inte finns i säkerhetskopian.</string>
   <string name="NotificationBarManager_signal_call_in_progress">Signalsamtal pågår</string>
   <string name="NotificationBarManager_missed_call_from_s">Missat samtal från %s</string>
   <string name="NotificationBarManager_missed_signal_call">Missat Signalsamtal</string>
+  <string name="NotificationBarManager__establishing_signal_call">Upprättar Signalsamtal</string>
+  <string name="NotificationBarManager__incoming_signal_call">Inkommande Signalsamtal</string>
+  <string name="NotificationBarManager__deny_call">Neka samtal</string>
+  <string name="NotificationBarManager__answer_call">Svara på samtal</string>
+  <string name="NotificationBarManager__end_call">Avsluta samtal</string>
+  <string name="NotificationBarManager__cancel_call">Avbryt samtal</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Multimediameddelande</string>
   <!--MessageRecord-->
@@ -277,12 +311,17 @@ som inte finns i säkerhetskopian.</string>
   <string name="DeviceProvisioningActivity_continue">FORTSÄTT</string>
   <string name="DeviceProvisioningActivity_title">Länka den här enheten?</string>
   <string name="DeviceProvisioningActivity_content_intro">Den kommer att kunna</string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+        • Läsa alla dina meddelanden
+        \n• Skicka meddelanden i ditt namn</string>
   <string name="DeviceProvisioningActivity_content_progress_title">Länkar enhet</string>
   <string name="DeviceProvisioningActivity_content_progress_content">Länkar ny enhet...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Enhet tillåten!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Ingen enhet hittades.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Nätverksfel.</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>
   <!--PassphrasePromptActivity-->
   <string name="PassphrasePromptActivity_enter_passphrase">Ange lösenord</string>
   <string name="PassphrasePromptActivity_watermark_content_description">Signalikon</string>
@@ -395,6 +434,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Mottagaren har ingen identitetsnyckel.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Mottagaren har ingen identitetsnyckel!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Skanna deras nyckel för att jämföra</string>
+  <string name="VerifyIdentityActivity_get_your_key_scanned">Få din nyckel skannad</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">VARNING, den skannade nyckeln överensstämmer INTE! Var vänlig kontrollera texten för fingeravtrycket noggrant.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">INTE verifierad!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Deras nyckel är korrekt. Det är också nödvändigt att verifiera din nyckel med dem.</string>
@@ -408,6 +448,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="ViewIdentityActivity_not_verified_exclamation">INTE verifierad!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Den skannade nyckeln överensstämmer!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Verifierad!</string>
+  <string name="ViewIdentityActivity_your_identity_fingerprint">Ditt identitets-fingeravtryck</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Påbörja ny nyckelutbytesförfrågan trots redan existerande?</string>
   <string name="KeyExchangeInitiator_send">Skicka</string>
@@ -457,8 +498,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_new_signal_message">Nytt Signal-meddelande</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Innehållet dolt</string>
+  <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>
@@ -466,6 +507,9 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="attachment_type_selector__contact">Kontakt</string>
   <string name="attachment_type_selector__camera">Kamera</string>
   <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">Gammal lösenfras</string>
+  <string name="change_passphrase_activity__new_passphrase">Ny lösenfras</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">Upprepa ny lösenfras</string>
   <!--contact_selection_activity-->
   <string name="contact_selection_activity__enter_name_or_number">Skriv in namn eller nummer</string>
   <!--contact_selection_group_activity-->
@@ -493,6 +537,7 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="conversation_activity__attachment_thumbnail">Bifogad miniatyrbild</string>
   <string name="conversation_activity__quick_attachment_drawer_toggle_description">Dölj/visa bilagor</string>
   <!--conversation_input_panel-->
+  <string name="conversation_input_panel__slide_to_cancel">SVEP FÖR ATT AVBRYTA</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Laddar ner mediameddelande</string>
   <string name="conversation_item__mms_image_description">Mediameddelande</string>
@@ -513,8 +558,13 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Läser in länder...</string>
   <string name="country_selection_fragment__search">Sök</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Skanna QR-koden som visas på enheten för att länka</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Länka enhet</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Inga länkade enheter...</string>
+  <string name="device_list_fragment__link_new_device">Länka ny enhet</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">fortsätt</string>
   <!--log_submit_activity-->
@@ -532,7 +582,11 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Uppgraderar databasen...</string>
   <string name="export_fragment__export_plaintext_backup">Exportera okrypterad backup</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Exportera en okrypterad säkerhetskopia kompatibel med \'SMS Backup &amp; Restore\' till lagringen</string>
   <string name="import_fragment__import_system_sms_database">Importera systemets SMS-databas</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Importera databasen från standardappen för meddelanden</string>
+  <string name="import_fragment__restore_encrypted_backup">Återställ krypterad säkerhetskopia</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">Återställ en tidigare exporterad krypterad säkerhetskopia av Signal</string>
   <string name="import_fragment__import_plaintext_backup">Importera okrypterad backup</string>
   <string name="import_fragment__import_a_plaintext_backup_file">Importera en okrypterad säkerhetskopia. Kompatibel med \'SMSBackup &amp; Restore.\'</string>
   <!--load_more_header-->
@@ -550,7 +604,12 @@ Tog emot meddelande med okänd identitetsnyckel. Tryck för att bearbeta och vis
   <string name="MmsPreferencesFragment__invalid_uri">Texten var inte en giltig URI</string>
   <string name="MmsPreferencesFragment__invalid_host">Texten var inte ett giltigt värdnamn</string>
   <!--GroupUtil-->
+  <plurals name="GroupUtil_joined_the_group">
+    <item quantity="one">%1$s gick med i gruppen.</item>
+    <item quantity="other">%1$s gick med i gruppen.</item>
+  </plurals>
   <string name="GroupUtil_group_updated">Grupp uppdaterad.</string>
+  <string name="GroupUtil_group_name_is_now">Gruppnamnet är nu \'%1$s\'.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Lås upp</string>
   <!--prompt_mms_activity-->
@@ -605,12 +664,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 vara uppkopplad till ett nätverk för att använda denna Signal-funktion. Kolla att
-du är uppkopplad mot 3G eller Wi-Fi.</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
@@ -657,6 +716,7 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</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="AndroidManifeset_conversations_archive">Konversationsarkiv</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">Importera / exportera</string>
   <string name="arrays__your_identity_key">Din identitetsnyckel</string>
@@ -672,6 +732,7 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="arrays__disabled">Inaktiverad</string>
   <string name="arrays__name_and_message">Namn och meddelande</string>
   <string name="arrays__name_only">Endast namn</string>
+  <string name="arrays__no_name_or_message">Inget namn eller meddelande</string>
   <string name="arrays__images">Bilder</string>
   <string name="arrays__audio">Ljud</string>
   <string name="arrays__video">Video</string>
@@ -699,14 +760,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>
@@ -719,6 +780,7 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="preferences__pref_led_blink_custom_pattern_set">Specialanpassat LED-blinkningsmönster valt!</string>
   <string name="preferences__sound">Ljud</string>
   <string name="preferences__change_notification_sound">Ändra aviseringsljud</string>
+  <string name="preferences__silent">Tyst</string>
   <string name="preferences__inthread_notifications">Aviseringar i tråden</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>
@@ -763,6 +825,7 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</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__devices">Enheter</string>
   <string name="preferences__light_theme">Ljust</string>
   <string name="preferences__dark_theme">Mörkt</string>
   <string name="preferences__appearance">Utseende</string>
@@ -801,6 +864,7 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <!--conversation_callable_insecure-->
   <string name="conversation_callable_insecure__menu_call">Ring</string>
   <!--conversation_callable_secure-->
+  <string name="conversation_callable_secure__menu_call">Signalsamtal</string>
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Meddelandedetaljer</string>
   <string name="conversation_context__menu_copy_text">Kopiera text</string>
@@ -816,11 +880,13 @@ 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_selected">Arkiv valt</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-->
@@ -835,6 +901,7 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <string name="conversation__menu_add_attachment">Bifoga fil</string>
   <string name="conversation__menu_update_group">Uppdatera grupp</string>
   <string name="conversation__menu_leave_group">Lämna grupp</string>
+  <string name="conversation__menu_delete_thread">Radera konversation</string>
   <string name="conversation__menu_view_media">Alla bilder</string>
   <string name="conversation__menu_conversation_settings">Konversationsinställningar</string>
   <!--conversation_popup-->
@@ -857,6 +924,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>
@@ -886,6 +954,7 @@ Signal uppnådde tidsgränsen för SMS-verifiering.</string>
   <!--media_preview_activity-->
   <string name="media_preview_activity__image_content_description">Förhandsvisning av bild</string>
   <!--new_conversation_activity-->
+  <string name="new_conversation_activity__refresh">Uppdatera</string>
   <!--redphone_audio_popup_menu-->
   <string name="redphone_audio_popup_menu__handset">Mobiltelefon</string>
   <string name="redphone_audio_popup_menu__headset">Hörlurar</string>

res/values-ta/strings.xml

@@ -94,6 +94,7 @@
   <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>
@@ -343,6 +344,8 @@
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">நாடுகள் ஏற்றப்படுகிறது...</string>
   <string name="country_selection_fragment__search">தேடல்</string>
+  <!--device_add_fragment-->
+  <!--device_link_fragment-->
   <!--device_list_fragment-->
   <!--experience_upgrade_activity-->
   <!--log_submit_activity-->

res/values-tr/strings.xml

@@ -13,6 +13,8 @@
   <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_delete">Sil</string>
   <string name="ApplicationPreferencesActivity_disable_passphrase">Şifreyi devre dışı bırak?</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>
@@ -22,7 +24,7 @@
   <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>
@@ -41,16 +43,16 @@
   <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!</string>
+  <string name="AudioSlidePlayer_error_playing_audio">Ses çalınırken hata oluştu!</string>
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Engellenmiş kişiler</string>
   <!--CallScreen-->
   <string name="CallScreen_Incoming_call">Gelen arama</string>
   <!--ConfirmIdentityDialog-->
-  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Bu kişiyi doğrulamak 
-isteyebilirsiniz.</string>
+  <string name="ConfirmIdentityDialog_the_signature_on_this_key_exchange_is_different">Tanımlama anahtarı %1$s değişti. Bunun anlamı birisi senin iletişimini kesmeye çalışıyor, veya %2$s Signal tekrardan yüklendi ve şimdi yeni bir tanımlama anahtarı var.</string>
+  <string name="ConfirmIdentityDialog_you_may_wish_to_verify_this_contact">Bu kişiyi doğrulamak isteyebilirsiniz.</string>
   <string name="ConfirmIdentityDialog_accept">Kabul et</string>
   <!--ContactsDatabase-->
   <string name="ContactsDatabase_message_s">Mesaj %s</string>
@@ -64,14 +66,15 @@ isteyebilirsiniz.</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 hafifçe vur</string>
-  <string name="ConversationItem_click_to_approve_unencrypted">Güvensize geri düşmek için hafifçe vur</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 geri düşülmesi?</string>
   <string name="ConversationItem_click_to_approve_unencrypted_mms_dialog_title">Şifrelenmemiş MMS geri düşülmesi?</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 yardımcı olabilir. Mesajlarını saklanacaktır.</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>
@@ -79,9 +82,9 @@ isteyebilirsiniz.</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\'in boyutu çok büyük!</string>
-  <string name="ConversationActivity_sorry_the_selected_video_exceeds_message_size_restrictions">Üzgünüz, seçilen görüntü mesaj boyutu limitini aşıyor (%1$skB).</string>
-  <string name="ConversationActivity_sorry_the_selected_audio_exceeds_message_size_restrictions">Üzgünüz, seçilen ses mesaj boyutu limitini aşıyor (%1$skB).</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_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>
   <string name="ConversationActivity_group_members">Grup üyeleri</string>
@@ -98,7 +101,8 @@ isteyebilirsiniz.</string>
   <string name="ConversationActivity_transport_insecure_sms">Güvensiz SMS</string>
   <string name="ConversationActivity_transport_insecure_mms">Güvensiz MMS</string>
   <string name="ConversationActivity_transport_signal">Signal</string>
-  <string name="ConversationActivity_lets_use_this_to_chat">Konuşmak için bunu kullan: %1$s</string>
+  <string name="ConversationActivity_lets_switch_to_signal">Hadi Signal uygulamasını kullanmaya başlayalım %1$s</string>
+  <string name="ConversationActivity_lets_use_this_to_chat">Hadi sohbet etmek için bunu kullanalım: %1$s</string>
   <string name="ConversationActivity_error_leaving_group">Gruptan ayrılma hatası...</string>
   <string name="ConversationActivity_mms_not_supported_title">MMS desteklenmiyor</string>
   <string name="ConversationActivity_mms_not_supported_message">Taşıyıcınız MMS desteklemediği için bu mesaj gönderilemez.</string>
@@ -107,7 +111,7 @@ isteyebilirsiniz.</string>
   <string name="ConversationActivity_are_you_sure_you_want_to_unblock_this_contact">Bu kişinin engelini kaldırmak istediğinizden emin misiniz?</string>
   <string name="ConversationActivity_unblock">Engeli kaldır</string>
   <string name="ConversationActivity_attachment_exceeds_size_limits">Dosya ekiniz gönderdiğiniz mesaj türü için olan boyut limitini aşıyor.</string>
-  <string name="ConversationActivity_quick_camera_unavailable">Kamera açılamıyor</string>
+  <string name="ConversationActivity_quick_camera_unavailable">Kamera kullanılamıyor</string>
   <string name="ConversationActivity_unable_to_record_audio">Ses kaydedilemedi!</string>
   <string name="ConversationActivity_error_sending_voice_message">Sesli mesaj gönderilirken hata...</string>
   <!--ConversationFragment-->
@@ -118,7 +122,7 @@ isteyebilirsiniz.</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 mesajın hepsini kalıcı olarak silecek.</item>
+    <item quantity="other">Bu işlem seçtiğiniz %1$d mesajların hepsini kalıcı olarak silecek.</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>
@@ -128,7 +132,7 @@ isteyebilirsiniz.</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>
@@ -137,15 +141,22 @@ isteyebilirsiniz.</string>
   <string name="ConversationListActivity_search">Ara...</string>
   <!--ConversationListFragment-->
   <plurals name="ConversationListFragment_delete_selected_conversations">
-    <item quantity="other">Seçilen mesajları sil?</item>
+    <item quantity="other">Seçilen konuşmaları sil?</item>
   </plurals>
   <plurals name="ConversationListFragment_this_will_permanently_delete_all_n_selected_conversations">
-    <item quantity="other">Bu seçilmiş %1$d mesajı kalıcı olarak silecek.</item>
+    <item quantity="other">Bu işlem seçilmiş %1$d konuşmaları kalıcı olarak silecek.</item>
   </plurals>
   <string name="ConversationListFragment_deleting">Siliniyor</string>
   <string name="ConversationListFragment_deleting_selected_threads">Seçilmiş başlıklar siliniyor...</string>
+  <string name="ConversationListFragment_archived_conversations">Arşivlenen konuşmalar</string>
+  <string name="ConversationListFragment_undo">Geri Al</string>
+  <string name="ConversationListFragment_moved_conversation_to_inbox">Konuşma gelen kutusuna taşındı</string>
+  <string name="ConversationListFragment_archived_conversation">Arşivlenen konuşmalar</string>
+  <string name="ConversationListFragment_moved_conversations_to_inbox">Konuşmalar 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 konuşmalar (%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>
@@ -154,44 +165,45 @@ isteyebilirsiniz.</string>
   <string name="DateUtils_now">Şimdi</string>
   <string name="DateUtils_minutes_ago">%d dk.</string>
   <!--DeviceListActivity-->
-  <string name="DeviceListActivity_unlink_s">\'%s\' i ayır?</string>
-  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Bu cihazı ayırdığınızda, artık mesaj alamayacak ya da gönderemeyecek.</string>
+  <string name="DeviceListActivity_unlink_s">\'%s\' bağlantısını kaldır?</string>
+  <string name="DeviceListActivity_by_unlinking_this_device_it_will_no_longer_be_able_to_send_or_receive">Bu cihazın bağlantısını kaldırarak, artık mesaj alamayacak ya da gönderemeyeceksiniz.</string>
   <string name="DeviceListActivity_network_connection_failed">Ağa bağlanılamadı....</string>
   <string name="DeviceListActivity_try_again">Tekrar dene</string>
-  <string name="DeviceListActivity_unlinking_device">Cihaz ayrılıyor...</string>
-  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Cihaz ayrılıyor</string>
+  <string name="DeviceListActivity_unlinking_device">Cihaz bağlantısı kaldırılıyor...</string>
+  <string name="DeviceListActivity_unlinking_device_no_ellipsis">Bağlantı kaldırma</string>
   <string name="DeviceListActivity_network_failed">Ağ hatası!</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>
   <!--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 yazılımı: Signal</string>
-  <string name="ExperienceUpgradeActivity_welcome_to_signal_excited">Signal\'a hoşgeldiniz!</string>
-  <string name="ExperienceUpgradeActivity_textsecure_is_now_signal">TextSecure\'un ismi 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 hafızaya dışa aktar?</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 metindeki içeriği dışa aktaracak.</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 hafızaya çıkartı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 olmadı. Signal mesajları ve aramaları devre dışı bırakıldı, 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_you_dont_support_push">Veri kanalını kullanarak kaydolmadığınız için Signal grupları devre dışı bırakıldı.</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_youre_not_registered_for_signal">Signal mesajları ve aramaları için kayıtlı değilsiniz, bundan dolayı Signal grupları devre dışı bırakıldı. 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>
@@ -199,6 +211,7 @@ Veri kanallarından iletişim etkisizleştirilmiş, Signal ayarlar menüsünden
   <string name="GroupCreateActivity_menu_create_title">Grup yarat</string>
   <string name="GroupCreateActivity_creating_group">%1$s yaratılıyor…</string>
   <string name="GroupCreateActivity_updating_group">Güncelleniyor %1$s...</string>
+  <string name="GroupCreateActivity_cannot_add_non_push_to_existing_group">Signal kullanıcısı olmadıkları için eklenemediler %1$s.</string>
   <string name="GroupCreateActivity_loading_group_details">Grup detayları yükleniyor...</string>
   <string name="GroupCreateActivity_youre_already_in_the_group">Zaten gruptasınız.</string>
   <!--GroupMembersDialog-->
@@ -208,14 +221,17 @@ Veri kanallarından iletişim etkisizleştirilmiş, Signal ayarlar menüsünden
   <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_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ğ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 yedek içeri alını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>
@@ -230,10 +246,18 @@ Veri kanallarından iletişim etkisizleştirilmiş, Signal ayarlar menüsünden
   <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\'a davet et</string>
-  <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Arkadaşlar arkadaşlarının şifresiz konuşmasına izin vermez.</string>
+  <string name="InviteActivity_invite_to_signal">Signal\'e davet et</string>
+  <plurals name="InviteActivity_send_to_friends">
+    <item quantity="other">Arkadaşlara gönder %d</item>
+  </plurals>
+  <plurals name="InviteActivity_send_sms_invites">
+    <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>
+  <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Arkadaşlar, arkadaşlarının şifresiz sohbet etmesine izin vermez.</string>
   <!--KeyScanningActivity-->
   <string name="KeyScanningActivity_no_scanned_key_found_exclamation">Taralı anahtar bulunamadı!</string>
   <string name="KeyScanningActivity_install_barcode_Scanner">Barcode Scanner kurulsun mu?</string>
@@ -246,7 +270,10 @@ Veri kanallarından iletişim etkisizleştirilmiş, Signal ayarlar menüsünden
   <string name="MmsDownloader_error_connecting_to_mms_provider">MMS sağlayıcısına bağlanma hatası...</string>
   <string name="MmsDownloader_error_reading_mms_settings">Kablosuz sağlayıcı MMS ayarlarının okuma hatası...</string>
   <!--- NotificationBarManager-->
+  <string name="NotificationBarManager_signal_call_in_progress">Signal araması sürüyor</string>
   <string name="NotificationBarManager_missed_call_from_s">%s tarafından cevapsız çağrı</string>
+  <string name="NotificationBarManager_missed_signal_call">Cevapsız Signal araması</string>
+  <string name="NotificationBarManager__establishing_signal_call">Signal araması kuruluyor</string>
   <string name="NotificationBarManager__incoming_signal_call">Gelen Signal araması</string>
   <string name="NotificationBarManager__deny_call">Çağrıyı reddet</string>
   <string name="NotificationBarManager__answer_call">Çağrıyı cevapla</string>
@@ -255,11 +282,13 @@ Veri kanallarından iletişim etkisizleştirilmiş, Signal ayarlar menüsünden
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Multimedya mesajı</string>
   <!--MessageRecord-->
+  <string name="MessageRecord_message_encrypted_with_a_legacy_protocol_version_that_is_no_longer_supported">Artık desteklenmeyen eski bir Signal sürümü kullanılarak şifrelenmiş bir mesaj alındı. Gönderen kişiden Signal\'i en son sürüme güncellemesini ve iletiyi yeniden göndermesini isteyin.</string>
   <string name="MessageRecord_left_group">Gruptan ayrıldınız.</string>
   <string name="MessageRecord_updated_group">Grubu güncelle.</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\'de, 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>
@@ -269,28 +298,35 @@ Veri kanallarından iletişim etkisizleştirilmiş, Signal ayarlar menüsünden
   <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>
+  <string name="DeviceProvisioningActivity_content_progress_content">Yeni cihaz bağlanıyor...</string>
   <string name="DeviceProvisioningActivity_content_progress_success">Cihaz onaylandı!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Hiç cihaz bulanamadı.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Ağ hatası.</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>
   <!--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>
+  <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>
   <string name="RecipientPreferenceActivity_block">Engelle</string>
+  <string name="RecipientPreferenceActivity_unblock_this_contact_question">Bu kişinin engellemesini kaldır?</string>
   <string name="RecipientPreferenceActivity_are_you_sure_you_want_to_unblock_this_contact">Bu kişinin engelini kaldırmak istediğinizden emin misiniz?</string>
   <string name="RecipientPreferenceActivity_unblock">Engeli kaldır</string>
   <string name="RecipientPreferenceActivity_enabled">Etkinleştirildi</string>
@@ -305,7 +341,9 @@ Veri kanallarından iletişim etkisizleştirilmiş, Signal ayarlar menüsünden
   <string name="RedPhone_busy">Meşgul</string>
   <string name="RedPhone_connected">Bağlanıldı</string>
   <string name="RedPhone_connecting">Bağlanılıyor</string>
-  <string name="RedPhone_handshake_failed">El-sıkışma başarısız!</string>
+  <string name="RedPhone_handshake_failed">Bağlantı sınama hatası! </string>
+  <string name="RedPhone_recipient_unavailable">Kişi müsait değil</string>
+  <string name="RedPhone_performing_handshake">Bağlantı sınanıyor</string>
   <string name="RedPhone_network_failed">Ağ hatası!</string>
   <string name="RedPhone_client_failed">İstemci hatası</string>
   <string name="RedPhone_fatal_error">Kritik Hata</string>
@@ -313,8 +351,9 @@ Veri kanallarından iletişim etkisizleştirilmiş, Signal ayarlar menüsünden
   <string name="RedPhone_message_from_the_server">Sunucudan mesaj</string>
   <string name="RedPhone_number_not_registered">Numara kayıtlı değil!</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
@@ -329,7 +368,7 @@ Veri kanallarından iletişim etkisizleştirilmiş, Signal ayarlar menüsünden
   <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-->
@@ -354,9 +393,12 @@ Numaranızı ikinci kez kontrol ediniz! Onu bir SMS ile doğrulamak üzereyiz.</
   <string name="RegistrationProgressActivity_too_many_requests">Çok fazla istek!</string>
   <string name="RegistrationProgressActivity_youve_already_requested_a_voice_call">Zaten bir çağrı istediniz. Tekrar isteyebilmek için 20 dakika beklemelisiniz.</string>
   <string name="RegistrationProgressActivity_registration_conflict">Kayıt çakışması</string>
+  <string name="RegistrationProgressActivity_this_number_is_already_registered_on_a_different">Bu numara zaten farklı bir Signal sunucusunda kayıtlı (CyanogenMod?). Burada kayıt olmadan önce oradaki kaydını silmen gerekiyor.</string>
   <!--RegistrationService-->
   <string name="RegistrationService_registration_complete">Kayıt tamamlandı</string>
+  <string name="RegistrationService_signal_registration_has_successfully_completed">Signal kaydı başarıyla tamamlandı.</string>
   <string name="RegistrationService_registration_error">Kayıt hatası</string>
+  <string name="RegistrationService_signal_registration_has_encountered_a_problem">Signal kaydı bir sorunla karşılaştı.</string>
   <!--Slide-->
   <string name="Slide_image">Resim</string>
   <string name="Slide_audio">Ses</string>
@@ -369,20 +411,23 @@ Geçersiz protokol sürümünde anahtar değişim mesajı alındı.</string>
   <string name="SmsMessageRecord_received_message_with_unknown_identity_key_click_to_process">
 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>
   <!--ThreadRecord-->
   <string name="ThreadRecord_left_the_group">Gruptan ayrıldı...</string>
+  <string name="ThreadRecord_secure_session_reset">Güvenli oturumu sıfırla.</string>
   <string name="ThreadRecord_draft">Taslak:</string>
   <string name="ThreadRecord_called">Aradınız</string>
   <string name="ThreadRecord_called_you">Sizi aradı</string>
   <string name="ThreadRecord_missed_call">Cevapsız arama</string>
   <string name="ThreadRecord_media_message">Medya mesajı</string>
-  <string name="ThreadRecord_s_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>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Alıcının kimlik anahtarı yok!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Karşılaştırmak için anahtarını tarayın</string>
+  <string name="VerifyIdentityActivity_get_your_key_scanned">Anahtarınızı taratın</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">UYARI, taranan anahtar EŞLEŞMİYOR! Parmak izi metnini dikkatlice inceleyin.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">Doğrulanmadı!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Onun anahtarı doğru. Anahtarınızı onunla da doğrulamanız gerekiyor.</string>
@@ -396,6 +441,7 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <string name="ViewIdentityActivity_not_verified_exclamation">Doğrulanamadı!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Taranan anahtar eşleşiyor!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Doğrulandı!</string>
+  <string name="ViewIdentityActivity_your_identity_fingerprint">Parmak izi kimliğiniz</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Varolan isteğe rağmen başlat?</string>
   <string name="KeyExchangeInitiator_send">Gönder</string>
@@ -426,8 +472,10 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <!--KeyCachingService-->
   <string name="KeyCachingService_signal_passphrase_cached">Açmak için dokun.</string>
   <string name="KeyCachingService_signal_passphrase_cached_with_lock">Açmak için dokun, veya kapatmak için kilide dokun.</string>
+  <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_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>
@@ -436,21 +484,25 @@ 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</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>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">Yeni Signal mesajı!</string>
+  <string name="SingleRecipientNotificationBuilder_signal">Signal</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>
   <string name="attachment_type_selector__video">Video</string>
+  <string name="attachment_type_selector__contact">Kişi</string>
   <string name="attachment_type_selector__camera">Kamera</string>
   <!--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-->
@@ -465,6 +517,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>
   <!--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>
@@ -474,7 +527,8 @@ 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>
   <!--conversation_item-->
@@ -497,15 +551,22 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Ülkeler yükleniyor...</string>
   <string name="country_selection_fragment__search">Ara</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Bağlamak için cihazda gösterilen QR kodunu tarayın</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Cihaz bağla</string>
   <!--device_list_fragment-->
+  <string name="device_list_fragment__no_devices_linked">Hiçbir cihaz bağlı değil...</string>
+  <string name="device_list_fragment__link_new_device">Yeni cihaz bağla</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">devam</string>
   <!--log_submit_activity-->
   <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>
   <string name="database_migration_activity__skip">Atla</string>
   <string name="database_migration_activity__import">İçeri Aktar</string>
@@ -514,8 +575,13 @@ 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 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 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>
   <!--media_overview_activity-->
@@ -539,10 +605,13 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Kilidi aç</string>
   <!--prompt_mms_activity-->
+  <string name="prompt_mms_activity__signal_requires_mms_settings_to_deliver_media_and_group_messages">Signal medya ve grup mesajlarının kablosuz taşıyıcı aracılığıyla taşıyabilmesi için MMS ayarlarının yapılmasını gerektirir. Cihazınız bu bilgiyi sağlamamaktadır. Bu durum bazen kilitli veya diğer kısıtlı yapılandırılmış cihazlar için geçerli olabilmektedir.</string>
   <string name="prompt_mms_activity__to_send_media_and_group_messages_click_ok">Medya veya grup mesajları gönderebilmek için \'Tamam\' a tıklayınız ve istenen ayarları tamamlayınız. Taşıyıcınızın MMS ayarları genellikle \'taşıyıcı APN\' araştırılarak bulunabilir. Bunu bir kez yapmanız gerekecektir.</string>
   <!--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__notification_sound">Bildirim sesi</string>
   <string name="recipient_preferences__vibrate">Titreş</string>
   <string name="recipient_preferences__block">Engelle</string>
@@ -551,11 +620,13 @@ 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>
   <!--registration_activity-->
+  <string name="registration_activity__verify_your_number_to_connect_with_signal">
+Signal ile bağlanmak için telefon numaranızı doğrulayın.</string>
   <string name="registration_activity__your_country">ÜLKENİZ</string>
   <string name="registration_activity__your_country_code_and_phone_number">ÜLKE KODUNUZ VE
         TELEFON NUMARANIZ
@@ -569,21 +640,33 @@ Bilinmeyen kimlik anahtarı içeren bir mesaj alındı. İşlemek ve görüntül
         içinde:
     </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 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>
   <string name="registration_problems__google_voice">Google Voice.</string>
+  <string name="registration_problems__signal_will_not_work_with_google_voice_numbers">
+Signal Google Voice numaraları ile çalışmaz.</string>
   <!--registration_progress_activity-->
   <string name="registration_progress_activity__voice_verification">Ses doğrulama</string>
+  <string name="registration_progress_activity__signal_can_also_call_you_to_verify_your_number">
+Signal ayrıca numaranızı doğrulamak için sizi arayabilir. \'Beni Ara\' kısmına dokunun ve duyduğunuz altı haneli kodu girin.</string>
   <string name="registration_progress_activity__verify">Doğrulama</string>
   <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_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.
     </string>
+  <string name="registration_progress_activity__your_device_needs_network_connectivity">Signal\'in bu özelliğini kullanabilmesi için cihazınızda aktif bir veri bağlantısı olması gerekmektedir. Cihazınızın Mobil veri veya Kablosuz bağlantısı olduğundan emin olunuz.</string>
   <string name="registration_progress_activity__restrictive_firewall">Kısıtlayıcı güvenlik duvarı.</string>
+  <string name="registration_progress_activity__if_you_are_connected_via_wifi_its_possible_that_there_is_a_firewall">
+Eğer WiFi ile bağlı iseniz, Signal\'in sunucusuna erişimi engelleyen bir güvenlik duvarının bulunma olasılığı var. Başka bir ağ veya mobil veri bağlantısı ile deneyiniz.</string>
+  <string name="registration_progress_activity__signal_will_now_automatically_verify_your_number_with_a_confirmation_sms_message">
+Signal şimdi otomatik bir onay SMS mesajı ile numaranızı doğrulayacak.</string>
   <string name="registration_progress_activity__connecting">Bağlanılıyor...</string>
   <string name="registration_progress_activity__waiting_for_sms_verification">SMS doğrulama
 bekleniliyor...
@@ -591,6 +674,8 @@ bekleniliyor...
   <string name="registration_progress_activity__registering_with_server">Sunucuya kaydolunuyor...</string>
   <string name="registration_progress_activity__this_couild_take_a_moment_please_be_patient">Bu
 biraz zaman alabilir. Lütfen bekleyiniz, doğrulama tamamlandığında bilgilendirileceksiniz.</string>
+  <string name="registration_progress_activity__signal_timed_out_while_waiting_for_a_verification_sms_message">
+Signal doğrulama SMS mesajını beklerken zaman aşımına uğradı.</string>
   <string name="registration_progress_activity__sms_verification_failed">SMS doğrulaması
 başarısız.</string>
   <string name="registration_progress_activity__generating_keys">Anahtarlar üretiliyor...</string>
@@ -604,10 +689,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>
@@ -615,6 +700,7 @@ başarısız.</string>
   <string name="AndroidManifest__create_passphrase">Anahtar parolası oluştur</string>
   <string name="AndroidManifest__enter_passphrase">Parola girin</string>
   <string name="AndroidManifest__select_contacts">Kişileri seç</string>
+  <string name="AndroidManifest__signal_detected">Signal algılandı</string>
   <string name="AndroidManifest__public_identity_key">Kimlik anahtarım</string>
   <string name="AndroidManifest__change_passphrase">Parola değiştir</string>
   <string name="AndroidManifest__verify_identity">Kimliği doğrula</string>
@@ -622,19 +708,21 @@ başarısız.</string>
   <string name="AndroidManifest__media_preview">Medya Ö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__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="AndroidManifeset_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>
@@ -664,8 +752,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__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>
@@ -675,6 +764,7 @@ başarısız.</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__notifications">Bildirimler</string>
+  <string name="preferences__enable_message_notifications">Mesaj bildirimlerini etkinleştir</string>
   <string name="preferences__led_color">LED rengi</string>
   <string name="preferences__led_color_unknown">Bilinmeyen</string>
   <string name="preferences__pref_led_blink_title">LED yanıp sönme şekli</string>
@@ -686,6 +776,7 @@ başarısız.</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__repeat_alerts">Uyarıları tekrarla</string>
   <string name="preferences__never">Asla</string>
   <string name="preferences__one_time">Bir kez</string>
@@ -712,8 +803,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>
@@ -724,6 +815,7 @@ başarısız.</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__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>
@@ -736,15 +828,19 @@ başarısız.</string>
   <string name="preferences__default">Varsayılan</string>
   <string name="preferences__language">Dil</string>
   <string name="preferences__language_summary">Dil %s</string>
+  <string name="preferences__signal_messages_and_calls">Signal mesajları ve aramaları</string>
+  <string name="preferences__free_private_messages_and_calls">Signal kullanıcılarına ücretsiz özel mesajlar ve aramalar</string>
   <string name="preferences__submit_debug_log">Hata ayıklama kaydı gönder</string>
   <string name="preferences__support_wifi_calling">\'WiFi Calling\' uyumluluk modu</string>
+  <string name="preferences__enable_if_your_device_supports_sms_mms_delivery_over_wifi">Cihazınızın WiFi üzerinden SMS/MMS gönderimini kullanıyorsa etkinleştirin (yalnızca \'WiFi Araması\' cihazınızda etkin olduğunda etkinleştirin)</string>
   <string name="preferences_app_protection__blocked_contacts">Engellenmiş kişiler</string>
   <string name="preferences_notifications__display_in_notifications">Bildirimlerde göster</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_advanced__use_system_emoji">Sistem emojileri kullan</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 emojilerini kullan</string>
   <string name="preferences_advanced__disable_signal_built_in_emoji_support">Signal\'in dahili emoji desteğini devre dışı bırak</string>
   <!--****************************************-->
   <!--menus-->
@@ -778,11 +874,13 @@ 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_selected">Seçilen arşiv</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-->
@@ -820,17 +918,22 @@ başarısız.</string>
   <string name="text_secure_normal__menu_clear_passphrase">Kilitle</string>
   <string name="text_secure_normal__mark_all_as_read">Tümünü okundu işaretle</string>
   <string name="text_secure_normal__invite_friends">Arkadaşlarını davet et!</string>
+  <string name="text_secure_normal__help">Yardım</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ı, şifreli 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_title">Signal\'e 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_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>
@@ -847,16 +950,14 @@ başarısız.</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-->
   <string name="trimmer__deleting">Siliniyor</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="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Bağlamak için cihazda gösterilen QR kodunu tarayın</string>
-  <string name="device_link_fragment__link_device">Cihaz bağla</string>
-  <string name="device_list_fragment__link_new_device">Yeni cihaz bağla</string>
+  <string name="transport_selection_list_item__transport_icon">Ulaştırma simgesi</string>
   <!--EOF-->
 </resources>

res/values-vi/strings.xml

@@ -47,6 +47,7 @@ Bạn sẽ phải đăng ký lại số điện thoại để sử dụng Signal
   <string name="AttachmentTypeSelectorAdapter_audio">Âm thanh</string>
   <string name="AttachmentTypeSelectorAdapter_contact">Chi tiết liên lạc</string>
   <!--AudioSlidePlayer-->
+  <string name="AudioSlidePlayer_error_playing_audio">Lỗi khi chạy tập tin âm thanh!</string>
   <!--BlockedContactsActivity-->
   <string name="BlockedContactsActivity_blocked_contacts">Chặn các liên lạc</string>
   <!--CallScreen-->
@@ -80,6 +81,11 @@ chặn cuộc hội thoại của bạn hoặc chỉ đơn giản là %2$s đã
   <string name="ConversationItem_click_to_approve_unencrypted_dialog_message">Tin nhắn này sẽ <b>không</b> được mã khoá bởi vì người nhận không còn sử dụng Signal.\n\ngSẽ gửi tin nhắn không bảo mật chứ?</string>
   <string name="ConversationItem_unable_to_open_media">Không tìm thấy ứng dụng để mở dữ liệu truyền thông này.</string>
   <!--ConversationActivity-->
+  <string name="ConversationActivity_reset_secure_session_question">Tái thiết lập phiên bảo mật?</string>
+  <string name="ConversationActivity_this_may_help_if_youre_having_encryption_problems">Thao tác này có thể giúp bạn khi đang có vấn đề về mã khoá cuộc hội thoại. Các tin nhắn sẽ được giữ lại.</string>
+  <string name="ConversationActivity_reset">Tái thiết lập</string>
+  <string name="ConversationActivity_delete_thread_question">Xoá cuộc hội thoại?</string>
+  <string name="ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation">Thao tác này sẽ xóa vĩnh viễn tất cả tin nhắn của cuộc hội thoại này.</string>
   <string name="ConversationActivity_add_attachment">Thêm tập tin đính kèm</string>
   <string name="ConversationActivity_select_contact_info">Chọn thông tin liên lạc</string>
   <string name="ConversationActivity_compose_message">Soạn nội dung</string>
@@ -114,6 +120,8 @@ chặn cuộc hội thoại của bạn hoặc chỉ đơn giản là %2$s đã
   <string name="ConversationActivity_unblock">Không chặn</string>
   <string name="ConversationActivity_attachment_exceeds_size_limits">Văn bản đính kèm vượt quá giới hạn kích cỡ cho loại tin nhắn mà bạn đang gửi.</string>
   <string name="ConversationActivity_quick_camera_unavailable">Máy ảnh không khả dụng</string>
+  <string name="ConversationActivity_unable_to_record_audio">Không thể ghi âm!</string>
+  <string name="ConversationActivity_error_sending_voice_message">Lỗi khi gửi tin nhắn thoại...</string>
   <!--ConversationFragment-->
   <string name="ConversationFragment_message_details">Chi tiết tin nhắn</string>
   <string name="ConversationFragment_transport_s_sent_received_s">Chuyển tải: %1$s\nGửi/Nhận: %2$s</string>
@@ -148,8 +156,15 @@ chặn cuộc hội thoại của bạn hoặc chỉ đơn giản là %2$s đã
   </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_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>
@@ -189,14 +204,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>
@@ -240,6 +255,7 @@ sao lưu này trước đó, nhập lần nữa sẽ dẫn đến việc có tin
   <string name="ImportFragment_no_encrypted_backup_found">Không tìm thấy sao lưu có mã hóa!</string>
   <string name="ImportFragment_restore_complete">Phục hồi hoàn tất!</string>
   <!--InputPanel-->
+  <string name="InputPanel_tap_and_hold_to_record_a_voice_message_release_to_send">Nhấn và giữ để ghi âm tin nhắn thoại, thả ra để gửi</string>
   <!--InviteActivity-->
   <string name="InviteActivity_share">Chia sẻ</string>
   <string name="InviteActivity_send_sms">Gửi SMS</string>
@@ -251,6 +267,9 @@ sao lưu này trước đó, nhập lần nữa sẽ dẫn đến việc có tin
   <plurals name="InviteActivity_send_to_friends">
     <item quantity="other">GỬI ĐẾN %d NGƯỜI BẠN</item>
   </plurals>
+  <plurals name="InviteActivity_send_sms_invites">
+    <item quantity="other">Gửi %d lời mời qua SMS?</item>
+  </plurals>
   <string name="InviteActivity_lets_switch_to_signal">Hãy chuyển sang dùng Signal: %1$s</string>
   <string name="InviteActivity_no_app_to_share_to">Có vẻ như bạn không có bất kỳ ứng dụng chia sẻ nào.</string>
   <string name="InviteActivity_friends_dont_let_friends_text_unencrypted">Bạn bè không để bạn mình tán gẫu không có mã khoá.</string>
@@ -269,6 +288,12 @@ sao lưu này trước đó, nhập lần nữa sẽ dẫn đến việc có tin
   <string name="NotificationBarManager_signal_call_in_progress">Cuộc gọi Signal đang tiến hành</string>
   <string name="NotificationBarManager_missed_call_from_s">Cuộc gọi nhỡ từ %s</string>
   <string name="NotificationBarManager_missed_signal_call">Cuộc gọi Signal nhỡ</string>
+  <string name="NotificationBarManager__establishing_signal_call">Đang thiết lập cuộc gọi Signal</string>
+  <string name="NotificationBarManager__incoming_signal_call">Cuộc gọi đến từ Signal</string>
+  <string name="NotificationBarManager__deny_call">Từ chối cuộc gọi</string>
+  <string name="NotificationBarManager__answer_call">Trả lời cuộc gọi</string>
+  <string name="NotificationBarManager__end_call">Ngưng cuộc gọi</string>
+  <string name="NotificationBarManager__cancel_call">Huỷ cuộc gọi</string>
   <!--NotificationMmsMessageRecord-->
   <string name="NotificationMmsMessageRecord_multimedia_message">Tin nhắn đa phương tiện</string>
   <!--MessageRecord-->
@@ -289,12 +314,18 @@ sao lưu này trước đó, nhập lần nữa sẽ dẫn đến việc có tin
   <string name="DeviceProvisioningActivity_continue">TIẾP TỤC</string>
   <string name="DeviceProvisioningActivity_title">Liên kết thiết bị này?</string>
   <string name="DeviceProvisioningActivity_content_intro">Nó sẽ có thể </string>
+  <string name="DeviceProvisioningActivity_content_bullets">
+• Đọc tất cả tin nhắn
+\n• Gửi tin nhắn dưới tên của bạn
+</string>
   <string name="DeviceProvisioningActivity_content_progress_title">Liên kết thiết bị</string>
   <string name="DeviceProvisioningActivity_content_progress_content">Liên kết thiết bị mới...</string>
+  <string name="DeviceProvisioningActivity_content_progress_success">Thiết bị đã được chấp nhận!</string>
   <string name="DeviceProvisioningActivity_content_progress_no_device">Không tìm thấy thiết bị nào.</string>
   <string name="DeviceProvisioningActivity_content_progress_network_error">Lỗi mạng.</string>
   <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>
   <!--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>
@@ -414,6 +445,7 @@ Nhận thông tin về chìa khóa danh tính không rõ. Bấm để xử lý v
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key">Người nhận không có chìa khóa danh tính.</string>
   <string name="VerifyIdentityActivity_recipient_has_no_identity_key_exclamation">Người nhận không có chìa khóa danh tính!</string>
   <string name="VerifyIdentityActivity_scan_their_key_to_compare">Quét chìa khóa của họ để so sánh</string>
+  <string name="VerifyIdentityActivity_get_your_key_scanned">Quét khoá của bạn</string>
   <string name="VerifyIdentityActivity_warning_the_scanned_key_does_not_match_please_check_the_fingerprint_text_carefully">CẢNH BÁO, chìa khóa được quét KHÔNG trùng hợp! Xin xem lại cho kỹ càng văn bản dấu tay.</string>
   <string name="VerifyIdentityActivity_not_verified_exclamation">CHƯA Kiểm Chứng!</string>
   <string name="VerifyIdentityActivity_their_key_is_correct_it_is_also_necessary_to_verify_your_key_with_them_as_well">Chìa khóa của họ đúng. Cũng cần phải kiểm chứng chìa khóa của bạn với họ luôn.</string>
@@ -427,6 +459,7 @@ Nhận thông tin về chìa khóa danh tính không rõ. Bấm để xử lý v
   <string name="ViewIdentityActivity_not_verified_exclamation">CHƯA kiểm chứng!</string>
   <string name="ViewIdentityActivity_the_scanned_key_matches_exclamation">Chìa khóa được quét trùng hợp!</string>
   <string name="ViewIdentityActivity_verified_exclamation">Đã kiểm chứng!</string>
+  <string name="ViewIdentityActivity_your_identity_fingerprint">Vân tay nhận dạng</string>
   <!--KeyExchangeInitiator-->
   <string name="KeyExchangeInitiator_initiate_despite_existing_request_question">Khởi tạo mặc dầu đã có yêu cầu rồi?</string>
   <string name="KeyExchangeInitiator_send">Gửi</string>
@@ -476,8 +509,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_new_signal_message">Thông điệp Signal mới</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">Nội dung được ẩn</string>
+  <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>
@@ -485,6 +518,9 @@ Nhận thông tin về chìa khóa danh tính không rõ. Bấm để xử lý v
   <string name="attachment_type_selector__contact">Liên lạc</string>
   <string name="attachment_type_selector__camera">Máy ảnh</string>
   <!--change_passphrase_activity-->
+  <string name="change_passphrase_activity__old_passphrase">Cụm từ mật khẩu cũ</string>
+  <string name="change_passphrase_activity__new_passphrase">Cụm từ mật khẩu mới</string>
+  <string name="change_passphrase_activity__repeat_new_passphrase">Lặp lại cụm từ mật khẩu mới</string>
   <!--contact_selection_activity-->
   <string name="contact_selection_activity__enter_name_or_number">Điền vào tên hoặc số</string>
   <!--contact_selection_group_activity-->
@@ -512,6 +548,7 @@ Nhận thông tin về chìa khóa danh tính không rõ. Bấm để xử lý v
   <string name="conversation_activity__attachment_thumbnail">Ảnh nhỏ tập tin đính kèm</string>
   <string name="conversation_activity__quick_attachment_drawer_toggle_description">Chuyển ngăn kéo tập tin đính kèm</string>
   <!--conversation_input_panel-->
+  <string name="conversation_input_panel__slide_to_cancel">TRƯỢT ĐỂ HUỶ</string>
   <!--conversation_item-->
   <string name="conversation_item__mms_downloading_description">Tải xuống tin nhắn đa phương tiện</string>
   <string name="conversation_item__mms_image_description">Tin nhắn đa phương tiện</string>
@@ -532,8 +569,13 @@ Nhận thông tin về chìa khóa danh tính không rõ. Bấm để xử lý v
   <!--country_selection_fragment-->
   <string name="country_selection_fragment__loading_countries">Nạp tên quốc gia...</string>
   <string name="country_selection_fragment__search">Tìm kiếm</string>
+  <!--device_add_fragment-->
+  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Quét mã QR hiển thị trên thiết bị để liên kết</string>
+  <!--device_link_fragment-->
+  <string name="device_link_fragment__link_device">Liên kết thiết bị</string>
   <!--device_list_fragment-->
   <string name="device_list_fragment__no_devices_linked">Không có thiết bị liên kết...</string>
+  <string name="device_list_fragment__link_new_device">Liên kết thiết bị mới</string>
   <!--experience_upgrade_activity-->
   <string name="experience_upgrade_activity__continue">tiếp tục</string>
   <!--log_submit_activity-->
@@ -551,8 +593,14 @@ Nhận thông tin về chìa khóa danh tính không rõ. Bấm để xử lý v
   <!--database_upgrade_activity-->
   <string name="database_upgrade_activity__updating_database">Cập nhật cơ sở dữ liệu...</string>
   <string name="export_fragment__export_plaintext_backup">Xuất sao lưu văn bản thường</string>
+  <string name="export_fragment__export_a_plaintext_backup_compatible_with">Xuất tập tin sao lưu văn bản không mã khoá tương thích với \'Sao lưu &amp; Phục hồi SMS.\' ra thẻ nhớ</string>
   <string name="import_fragment__import_system_sms_database">Nhập cơ sở dữ liệu SMS của hệ thống</string>
+  <string name="import_fragment__import_the_database_from_the_default_system">Nhập cơ sở dữ liệu từ ứng dụng tin nhắn mặc định của hệ thống</string>
+  <string name="import_fragment__restore_encrypted_backup">Phục hồi sao lưu đã mã khóa</string>
+  <string name="import_fragment__restore_a_previously_exported_encrypted_signal_backup">
+Phục hồi sao lưu Signal đã mã khóa từng xuất ra trước đó</string>
   <string name="import_fragment__import_plaintext_backup">Nhập sao lưu văn bản thường</string>
+  <string name="import_fragment__import_a_plaintext_backup_file">Nhập tập tin sao lưu văn bản không mã khoá. Tương thích với \'Sao lưu &amp; Phục hồi SMS.\'</string>
   <!--load_more_header-->
   <string name="load_more_header__see_full_conversation">Xem cuộc hội thoại đầy đủ</string>
   <!--media_overview_activity-->
@@ -568,7 +616,11 @@ Nhận thông tin về chìa khóa danh tính không rõ. Bấm để xử lý v
   <string name="MmsPreferencesFragment__invalid_uri">Văn bản điền vào không phải là đường dẫn hợp lệ</string>
   <string name="MmsPreferencesFragment__invalid_host">Văn bản điền vào không phải là máy chủ hợp lệ</string>
   <!--GroupUtil-->
+  <plurals name="GroupUtil_joined_the_group">
+    <item quantity="other">%1$s đã tham gia nhóm.</item>
+  </plurals>
   <string name="GroupUtil_group_updated">Nhóm được cập nhật.</string>
+  <string name="GroupUtil_group_name_is_now">Tên nhóm hiện giờ là \'%1$s\'.</string>
   <!--prompt_passphrase_activity-->
   <string name="prompt_passphrase_activity__unlock">Mở khóa</string>
   <!--prompt_mms_activity-->
@@ -629,16 +681,14 @@ 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
-bạn có kết nối 3G hoặc Wi-Fi.
+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">
@@ -690,22 +740,26 @@ SMS thất bại.
   <string name="AndroidManifest__media_preview">Xem Trước Truyền Thông</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__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="AndroidManifeset_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>
   <string name="arrays__use_default">Dùng mặc định</string>
   <string name="arrays__use_custom">Dùng tùy chỉnh</string>
   <string name="arrays__mute_for_one_hour">Tạm im 1 tiếng</string>
   <string name="arrays__mute_for_two_hours">Tạm im 2 tiếng</string>
   <string name="arrays__mute_for_one_day">Tạm im 1 ngày</string>
   <string name="arrays__mute_for_seven_days">Tạm im 7 ngày</string>
+  <string name="arrays__mute_for_one_year">Không báo trong 1 năm</string>
   <string name="arrays__settings_default">Thiết đặt mặc định</string>
   <string name="arrays__enabled">Mở</string>
   <string name="arrays__disabled">Tắt</string>
   <string name="arrays__name_and_message">Tên và tin nhắn</string>
   <string name="arrays__name_only">Tên thôi</string>
+  <string name="arrays__no_name_or_message">Không có tên hay tin nhắn</string>
   <string name="arrays__images">Hình ảnh</string>
   <string name="arrays__audio">Nhạc</string>
   <string name="arrays__video">Đoạn phim</string>
@@ -729,6 +783,7 @@ SMS thất bại.
   <string name="preferences__choose_identity">Chọn danh tính</string>
   <string name="preferences__choose_your_contact_entry_from_the_contacts_list">Chọn khoản mục liên lạc của bạn trong danh sách liên lạc.</string>
   <string name="preferences__change_passphrase">Đổi cụm từ mật khẩu</string>
+  <string name="preferences__change_your_passphrase">Đổi cụm từ mật khẩu</string>
   <string name="preferences__enable_passphrase">Mở cụm từ mật khẩu</string>
   <string name="preferences__passphrase_summary">Cụm từ mật khẩu %s</string>
   <string name="preferences__enable_lock_screen_for_messages">Mở khóa màn hình cho tin nhắn</string>
@@ -751,6 +806,7 @@ SMS thất bại.
   <string name="preferences__pref_led_blink_custom_pattern_set">Mô hình chớp nháy LED tùy chỉnh thiết lập xong!</string>
   <string name="preferences__sound">Âm thanh</string>
   <string name="preferences__change_notification_sound">Đổi âm thanh thông báo</string>
+  <string name="preferences__silent">Yên lặng</string>
   <string name="preferences__inthread_notifications">Thông báo bên trong chuỗ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>
@@ -795,6 +851,7 @@ SMS thất bại.
   <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__devices">Các thiết bị</string>
   <string name="preferences__light_theme">Lợt</string>
   <string name="preferences__dark_theme">Đậm</string>
   <string name="preferences__appearance">Diện mạo</string>
@@ -835,6 +892,7 @@ Các tin nhắn và cuộc gọi riêng tư miễn phí đến người dùng Si
   <!--conversation_callable_insecure-->
   <string name="conversation_callable_insecure__menu_call">Gọi</string>
   <!--conversation_callable_secure-->
+  <string name="conversation_callable_secure__menu_call">Gọi qua Signal</string>
   <!--conversation_context-->
   <string name="conversation_context__menu_message_details">Chi tiết tin nhắn</string>
   <string name="conversation_context__menu_copy_text">Sao chép văn bản</string>
@@ -850,11 +908,13 @@ 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_selected">Đã chọn bản 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-->
@@ -869,6 +929,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="conversation__menu_add_attachment">Thêm tập tin đính kèm</string>
   <string name="conversation__menu_update_group">Cập nhật nhóm</string>
   <string name="conversation__menu_leave_group">Rời nhóm</string>
+  <string name="conversation__menu_delete_thread">Xoá cuộc hội thoại</string>
   <string name="conversation__menu_view_media">Tất cả hình ảnh</string>
   <string name="conversation__menu_conversation_settings">Thiết đặt chuyện trò</string>
   <!--conversation_popup-->
@@ -891,6 +952,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>
@@ -920,6 +982,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_activity-->
   <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-->
   <string name="redphone_audio_popup_menu__handset">Thiết bị cầm tay</string>
   <string name="redphone_audio_popup_menu__headset">Bộ tai nghe</string>

res/values-zh-rCN/strings.xml

@@ -151,8 +151,15 @@
   </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 +199,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>
@@ -492,8 +499,8 @@
   <string name="QuickResponseService_quick_response_unavailable_when_Signal_is_locked">当暗号处于锁定状态时，快速回复不可用！</string>
   <string name="QuickResponseService_problem_sending_message">发送信息时遇到问题！</string>
   <!--SingleRecipientNotificationBuilder-->
-  <string name="SingleRecipientNotificationBuilder_new_signal_message">新暗号信息</string>
-  <string name="SingleRecipientNotificationBuilder_contents_hidden">内容隐藏</string>
+  <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>
@@ -552,8 +559,13 @@
   <!--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-->
@@ -655,15 +667,14 @@
   <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">您的
-设备需要活动的网络以便使用暗号的功能。检查设备
-是否已经连接到了3G或Wi-Fi网络。</string>
+设备需要活动的网络来使用暗号的功能。请检查
+并确保已经连接到了移动数据或WiFi网络。</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，可能是有防火墙
@@ -710,9 +721,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__message_details">信息详情</string>
   <string name="AndroidManifest_manage_linked_devices">管理已连接的设备</string>
   <string name="AndroidManifest__invite_friends">邀请好友</string>
+  <string name="AndroidManifeset_conversations_archive">会话存档</string>
   <!--arrays.xml-->
   <string name="arrays__import_export">导入/导出</string>
   <string name="arrays__your_identity_key">你的身份密钥</string>
@@ -875,11 +887,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_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-->
@@ -917,6 +931,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>
@@ -957,8 +972,5 @@
   <string name="trimmer__old_messages_successfully_deleted">旧信息已被成功删除。</string>
   <!--transport_selection_list_item-->
   <string name="transport_selection_list_item__transport_icon">传输图标</string>
-  <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">扫描设备上显示的二维码以便连接</string>
-  <string name="device_link_fragment__link_device">连接设备</string>
-  <string name="device_list_fragment__link_new_device">连接新的设备</string>
   <!--EOF-->
 </resources>

res/values/arrays.xml

@@ -13,6 +13,7 @@
       <item>Español</item>
       <item>Français</item>
       <item>Greek ελληνικά</item>
+      <item>Hebrew עברית</item>
       <item>Hrvatski</item>
       <item>Indonesia</item>
       <item>Italiano</item>
@@ -49,6 +50,7 @@
       <item>es</item>
       <item>fr</item>
       <item>el</item>
+      <item>iw</item>
       <item>hr</item>
       <item>in</item>
       <item>it</item>

res/values/colors.xml

@@ -24,7 +24,7 @@
 
     <color name="gray95_transparent50">#7F111111</color>
 
-    <color name="conversation_list_item_background_read_light">#ffffffff</color>
+    <color name="conversation_list_item_background_read_light">@color/gray5</color>
     <color name="conversation_list_item_background_unread_light">#ffffffff</color>
     <color name="conversation_list_item_background_read_dark">#ff000000</color>
     <color name="conversation_list_item_background_unread_dark">#ff333333</color>

res/values/dimens.xml

@@ -37,6 +37,8 @@
 
     <dimen name="transfer_controls_expanded_width">150dp</dimen>
     <dimen name="transfer_controls_contracted_width">70dp</dimen>
+    <dimen name="conversation_list_fragment_archive_padding">16dp</dimen>
+    <dimen name="contact_selection_actions_tap_area">10dp</dimen>
 
     <!-- RedPhone -->
     <dimen name="incoming_widget_outer_radius">135dip</dimen>

res/values/strings.xml

@@ -174,10 +174,18 @@
     </plurals>
     <string name="ConversationListFragment_deleting">Deleting</string>
     <string name="ConversationListFragment_deleting_selected_threads">Deleting selected threads...</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>
+    <string name="ConversationListFragment_archived_conversation">Archived conversation</string>
+    <string name="ConversationListFragment_moved_conversations_to_inbox">Moved conversations to inbox</string>
 
     <!-- ConversationListItem -->
     <string name="ConversationListItem_key_exchange_message">Key exchange message...</string>
 
+    <!-- ConversationListItemAction -->
+    <string name="ConversationListItemAction_archived_conversations_d">Archived conversations (%d)</string>
+
     <!-- CustomDefaultPreference -->
     <string name="CustomDefaultPreference_using_custom">Using custom: %s</string>
     <string name="CustomDefaultPreference_using_default">Using default: %s</string>
@@ -223,7 +231,7 @@
 
     <!-- GcmRefreshJob -->
     <string name="GcmRefreshJob_Permanent_Signal_communication_failure">Permanent Signal communication failure!</string>
-    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal was unable to register with Google Play Services. Communication over the data channel has been disabled, please try re-registering from the Signal settings menu.</string>
+    <string name="GcmRefreshJob_Signal_was_unable_to_register_with_Google_Play_Services">Signal was unable to register with Google Play Services. Signal messages and calls have been disabled, please try re-registering in Settings &gt; Advanced.</string>
 
     <!-- GroupCreateActivity -->
     <string name="GroupCreateActivity_actionbar_title">New group</string>
@@ -231,7 +239,7 @@
     <string name="GroupCreateActivity_group_name_hint">Group name</string>
     <string name="GroupCreateActivity_actionbar_mms_title">New MMS group</string>
     <string name="GroupCreateActivity_contacts_dont_support_push">You have selected a contact that doesn\'t support Signal groups, so this group will be MMS.</string>
-    <string name="GroupCreateActivity_you_dont_support_push">You\'re not registered for using the data channel, so Signal groups are disabled.</string>
+    <string name="GroupCreateActivity_youre_not_registered_for_signal">You\'re not registered for Signal messages and calls, so Signal groups are disabled. Please try registering in Settings &gt; Advanced.</string>
     <string name="GroupCreateActivity_contacts_mms_exception">An unexpected error happened that has made group creation fail.</string>
     <string name="GroupCreateActivity_contacts_no_members">You need at least one person in your group!</string>
     <string name="GroupCreateActivity_contacts_invalid_number">One of the members of your group has a number that can\'t be read correctly. Please fix or remove that contact and try again.</string>
@@ -580,8 +588,8 @@
     <string name="QuickResponseService_problem_sending_message">Problem sending message!</string>
 
     <!-- SingleRecipientNotificationBuilder -->
-    <string name="SingleRecipientNotificationBuilder_new_signal_message">New Signal message</string>
-    <string name="SingleRecipientNotificationBuilder_contents_hidden">Contents hidden</string>
+    <string name="SingleRecipientNotificationBuilder_signal">Signal</string>
+    <string name="SingleRecipientNotificationBuilder_new_message">New Message!</string>
 
     <!-- attachment_type_selector -->
     <string name="attachment_type_selector__image">Image</string>
@@ -657,8 +665,16 @@
     <string name="country_selection_fragment__loading_countries">Loading countries...</string>
     <string name="country_selection_fragment__search">Search</string>
 
+    <!-- device_add_fragment -->
+    <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scan the QR code displayed on the device to link</string>
+
+    <!-- device_link_fragment -->
+    <string name="device_link_fragment__link_device">Link device</string>
+
     <!-- device_list_fragment -->
     <string name="device_list_fragment__no_devices_linked">No devices linked...</string>
+    <string name="device_list_fragment__link_new_device">Link new device</string>
+
 
     <!-- experience_upgrade_activity -->
     <string name="experience_upgrade_activity__continue">continue</string>
@@ -786,9 +802,7 @@
     <string name="registration_progress_activity__call_me">Call me</string>
     <string name="registration_progress_activity__edit_number">Edit number</string>
     <string name="registration_progress_activity__connectivity_error">Connectivity error.</string>
-    <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_push_service">
-        Signal was unable to connect to the push service.
-    </string>
+    <string name="registration_progress_activity__signal_was_unable_to_connect_to_the_server">Signal was unable to connect to the server.</string>
     <string name="registration_progress_activity__some_possible_problems_include">Some possible
         problems include:
     </string>
@@ -797,7 +811,7 @@
     </string>
     <string name="registration_progress_activity__your_device_needs_network_connectivity">Your
         device needs network connectivity in order to use this Signal feature. Check to ensure
-        that it is connected to 3G or Wi-Fi.
+        that it is connected to mobile data or Wi-Fi.
     </string>
     <string name="registration_progress_activity__restrictive_firewall">Restrictive firewall.
     </string>
@@ -856,9 +870,10 @@
     <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__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>
 
     <!-- arrays.xml -->
     <string name="arrays__import_export">Import / export</string>
@@ -1040,6 +1055,7 @@
     <!-- 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>
 
     <!-- conversation_list -->
     <string name="conversation_list__menu_search">Search</string>
@@ -1047,6 +1063,7 @@
     <!-- conversation_list_item_view -->
     <string name="conversation_list_item_view__contact_photo_image">Contact Photo Image</string>
     <string name="conversation_list_item_view__error_alert">Error alert</string>
+    <string name="conversation_list_item_view__archived">Archived</string>
 
     <!-- conversation_list_fragment -->
     <string name="conversation_list_fragment__fab_content_description">New conversation</string>
@@ -1094,6 +1111,7 @@
     <string name="text_secure_normal__menu_clear_passphrase">Lock</string>
     <string name="text_secure_normal__mark_all_as_read">Mark all read</string>
     <string name="text_secure_normal__invite_friends">Invite friends</string>
+    <string name="text_secure_normal__help">Help</string>
 
     <!-- reminder_header -->
     <string name="reminder_header_expired_build">Your build of Signal has expired!</string>
@@ -1141,9 +1159,7 @@
 
     <!-- transport_selection_list_item -->
     <string name="transport_selection_list_item__transport_icon">Transport icon</string>
-    <string name="device_add_fragment__scan_the_qr_code_displayed_on_the_device_to_link">Scan the QR code displayed on the device to link</string>
-    <string name="device_link_fragment__link_device">Link device</string>
-    <string name="device_list_fragment__link_new_device">Link new device</string>
+
 
     <!-- EOF -->
 

res/values/themes.xml

@@ -95,7 +95,7 @@
         <item name="attachment_type_selector_background">@color/white</item>
         <item name="conversation_list_item_background_selected">@drawable/list_selected_holo_light</item>
         <item name="conversation_list_item_background_unread">@drawable/conversation_list_item_unread_background</item>
-        <item name="conversation_list_item_background_read">@drawable/conversation_list_item_background</item>
+        <item name="conversation_list_item_background_read">@drawable/conversation_list_item_read_background</item>
         <item name="conversation_list_item_count_color">#66333333</item>
         <item name="conversation_list_item_contact_color">#FF333333</item>
         <item name="conversation_list_item_subject_color">#FF444444</item>
@@ -205,12 +205,13 @@
         <item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="android:textColor">@color/text_color_dark_theme</item>
         <item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
+        <item name="colorAccent">@color/textsecure_primary_dark</item>
         <item name="colorControlActivated">@color/signal_primary_dark</item>
         <item name="colorControlHighlight">@color/signal_primary_dark</item>
         <item name="android:windowBackground">@color/black</item>
         <item name="conversation_list_item_background_selected">@drawable/list_selected_holo_dark</item>
         <item name="conversation_list_item_background_unread">@drawable/conversation_list_item_unread_background_dark</item>
-        <item name="conversation_list_item_background_read">@drawable/conversation_list_item_background</item>
+        <item name="conversation_list_item_background_read">@drawable/conversation_list_item_read_background_dark</item>
         <item name="conversation_list_item_count_color">#66dddddd</item>
         <item name="conversation_list_item_contact_color">#ffdddddd</item>
         <item name="conversation_list_item_subject_color">#ffdddddd</item>

src/org/thoughtcrime/redphone/audio/IncomingRinger.java

@@ -29,6 +29,8 @@ import android.os.Vibrator;
 import android.provider.Settings;
 import android.util.Log;
 
+import org.thoughtcrime.securesms.util.ServiceUtil;
+
 import java.io.IOException;
 
 /**
@@ -74,13 +76,7 @@ public class IncomingRinger {
   }
 
   public void start() {
-    AudioManager audioManager = (AudioManager)context.getSystemService(Context.AUDIO_SERVICE);
-    audioManager.requestAudioFocus(new AudioManager.OnAudioFocusChangeListener() {
-                                     @Override
-                                     public void onAudioFocusChange(int focusChange) {}
-                                   },
-                                   AudioManager.STREAM_MUSIC,
-                                   AudioManager.AUDIOFOCUS_GAIN);
+    AudioManager audioManager = ServiceUtil.getAudioManager(context);
 
     if(player == null) {
       //retry player creation to pick up changed ringtones or audio server restarts
@@ -120,6 +116,9 @@ public class IncomingRinger {
     }
     Log.d(TAG, "Cancelling vibrator");
     vibrator.cancel();
+
+    AudioManager audioManager = ServiceUtil.getAudioManager(context);
+    audioManager.setMode(AudioManager.MODE_NORMAL);
   }
 
   private boolean shouldVibrate() {

src/org/thoughtcrime/securesms/BindableConversationListItem.java

@@ -0,0 +1,15 @@
+package org.thoughtcrime.securesms;
+
+import android.support.annotation.NonNull;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.model.ThreadRecord;
+
+import java.util.Locale;
+import java.util.Set;
+
+public interface BindableConversationListItem extends Unbindable {
+
+  public void bind(@NonNull MasterSecret masterSecret, @NonNull ThreadRecord thread,
+                   @NonNull Locale locale, @NonNull Set<Long> selectedThreads, boolean batchMode);
+}

src/org/thoughtcrime/securesms/ConversationActivity.java

@@ -392,7 +392,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     switch (item.getItemId()) {
     case R.id.menu_call_secure:
     case R.id.menu_call_insecure:             handleDial(getRecipients().getPrimaryRecipient()); return true;
-    case R.id.menu_delete_thread:             handleDeleteThread();                              return true;
     case R.id.menu_add_attachment:            handleAddAttachment();                             return true;
     case R.id.menu_view_media:                handleViewMedia();                                 return true;
     case R.id.menu_add_to_contacts:           handleAddToContacts();                             return true;
@@ -650,28 +649,6 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     new GroupMembersDialog(this, getRecipients()).display();
   }
 
-  private void handleDeleteThread() {
-    AlertDialog.Builder builder = new AlertDialog.Builder(this);
-    builder.setTitle(R.string.ConversationActivity_delete_thread_question);
-    builder.setIconAttribute(R.attr.dialog_alert_icon);
-    builder.setCancelable(true);
-    builder.setMessage(R.string.ConversationActivity_this_will_permanently_delete_all_messages_in_this_conversation);
-    builder.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {
-      @Override
-      public void onClick(DialogInterface dialog, int which) {
-        if (threadId > 0) {
-          DatabaseFactory.getThreadDatabase(ConversationActivity.this).deleteConversation(threadId);
-        }
-        composeText.getText().clear();
-        threadId = -1;
-        finish();
-      }
-    });
-
-    builder.setNegativeButton(android.R.string.cancel, null);
-    builder.show();
-  }
-
   private void handleAddToContacts() {
     final Intent intent = new Intent(Intent.ACTION_INSERT_OR_EDIT);
     intent.putExtra(ContactsContract.Intents.Insert.PHONE, recipients.getPrimaryRecipient().getNumber());
@@ -1089,9 +1066,9 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
           draftDatabase.insertDrafts(new MasterCipher(thisMasterSecret), threadId, drafts);
           threadDatabase.updateSnippet(threadId, drafts.getSnippet(ConversationActivity.this),
                                        drafts.getUriSnippet(ConversationActivity.this),
-                                       System.currentTimeMillis(), Types.BASE_DRAFT_TYPE);
+                                       System.currentTimeMillis(), Types.BASE_DRAFT_TYPE, true);
         } else if (threadId > 0) {
-          threadDatabase.update(threadId);
+          threadDatabase.update(threadId, false);
         }
 
         return threadId;
@@ -1351,7 +1328,7 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
   @Override
   public void onImageCapture(@NonNull final byte[] imageBytes) {
-    setMedia(PersistentBlobProvider.getInstance(this).create(masterSecret, recipients, imageBytes), MediaType.IMAGE);
+    setMedia(PersistentBlobProvider.getInstance(this).create(masterSecret, imageBytes), MediaType.IMAGE);
     quickAttachmentDrawer.hide(false);
   }
 
@@ -1362,6 +1339,12 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     quickAttachmentToggle.disable();
   }
 
+  @Override
+  public void onCameraStart() {}
+
+  @Override
+  public void onCameraStop() {}
+
   @Override
   public void onRecorderStarted() {
     Vibrator vibrator = (Vibrator)getSystemService(Context.VIBRATOR_SERVICE);

src/org/thoughtcrime/securesms/ConversationFragment.java

@@ -32,6 +32,7 @@ import android.support.v7.app.AlertDialog;
 import android.support.v7.view.ActionMode;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.ItemAnimator.ItemAnimatorFinishedListener;
 import android.text.ClipboardManager;
 import android.text.TextUtils;
 import android.util.Log;
@@ -56,7 +57,7 @@ import org.thoughtcrime.securesms.mms.Slide;
 import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.sms.MessageSender;
-import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask;
 import org.thoughtcrime.securesms.util.SaveAttachmentTask.Attachment;
 import org.thoughtcrime.securesms.util.ViewUtil;
@@ -160,6 +161,8 @@ public class ConversationFragment extends Fragment
     if (this.recipients != null && this.threadId != -1) {
       list.setAdapter(new ConversationAdapter(getActivity(), masterSecret, locale, selectionClickListener, null, this.recipients));
       getLoaderManager().restartLoader(0, Bundle.EMPTY, this);
+      list.getItemAnimator().setSupportsChangeAnimations(false);
+      list.getItemAnimator().setMoveDuration(120);
     }
   }
 
@@ -211,9 +214,9 @@ public class ConversationFragment extends Fragment
   }
 
   public void scrollToBottom() {
-    list.post(new Runnable() {
+    list.getItemAnimator().isRunning(new ItemAnimatorFinishedListener() {
       @Override
-      public void run() {
+      public void onAnimationsFinished() {
         list.stopScroll();
         list.smoothScrollToPosition(0);
       }
@@ -260,7 +263,7 @@ public class ConversationFragment extends Fragment
     builder.setMessage(getActivity().getResources().getQuantityString(R.plurals.ConversationFragment_this_will_permanently_delete_all_n_selected_messages, messagesCount, messagesCount));
     builder.setCancelable(true);
 
-    builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
+    builder.setPositiveButton(R.string.delete, new DialogInterface.OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int which) {
         new ProgressDialogAsyncTask<MessageRecord, Void, Void>(getActivity(),
@@ -290,7 +293,7 @@ public class ConversationFragment extends Fragment
       }
     });
 
-    builder.setNegativeButton(R.string.no, null);
+    builder.setNegativeButton(android.R.string.cancel, null);
     builder.show();
   }
 

src/org/thoughtcrime/securesms/ConversationListActivity.java

@@ -18,6 +18,7 @@ package org.thoughtcrime.securesms;
 
 import android.content.Intent;
 import android.database.ContentObserver;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.provider.ContactsContract;
@@ -152,6 +153,7 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     case R.id.menu_mark_all_read:     handleMarkAllRead();     return true;
     case R.id.menu_import_export:     handleImportExport();    return true;
     case R.id.menu_invite:            handleInvite();          return true;
+    case R.id.menu_help:              handleHelp();            return true;
     }
 
     return false;
@@ -159,15 +161,6 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
 
   @Override
   public void onCreateConversation(long threadId, Recipients recipients, int distributionType) {
-    createConversation(threadId, recipients, distributionType);
-  }
-
-  private void createGroup() {
-    Intent intent = new Intent(this, GroupCreateActivity.class);
-    startActivity(intent);
-  }
-
-  private void createConversation(long threadId, Recipients recipients, int distributionType) {
     Intent intent = new Intent(this, ConversationActivity.class);
     intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, recipients.getIds());
     intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
@@ -177,6 +170,17 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
   }
 
+  @Override
+  public void onSwitchToArchive() {
+    Intent intent = new Intent(this, ConversationListArchiveActivity.class);
+    startActivity(intent);
+  }
+
+  private void createGroup() {
+    Intent intent = new Intent(this, GroupCreateActivity.class);
+    startActivity(intent);
+  }
+
   private void handleDisplaySettings() {
     Intent preferencesIntent = new Intent(this, ApplicationPreferencesActivity.class);
     startActivity(preferencesIntent);
@@ -207,6 +211,10 @@ public class ConversationListActivity extends PassphraseRequiredActionBarActivit
     startActivity(new Intent(this, InviteActivity.class));
   }
 
+  private void handleHelp() {
+    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("http://support.whispersystems.org")));
+  }
+
   private void initializeContactUpdatesReceiver() {
     observer = new ContentObserver(null) {
       @Override

src/org/thoughtcrime/securesms/ConversationListAdapter.java

@@ -49,6 +49,9 @@ import java.util.Set;
  */
 public class ConversationListAdapter extends CursorRecyclerViewAdapter<ConversationListAdapter.ViewHolder> {
 
+  private static final int MESSAGE_TYPE_SWITCH_ARCHIVE = 1;
+  private static final int MESSAGE_TYPE_THREAD         = 2;
+
   private final          ThreadDatabase    threadDatabase;
   private final          MasterSecret      masterSecret;
   private final          MasterCipher      masterCipher;
@@ -61,37 +64,25 @@ public class ConversationListAdapter extends CursorRecyclerViewAdapter<Conversat
   private       boolean   batchMode = false;
 
   protected static class ViewHolder extends RecyclerView.ViewHolder {
-    public ViewHolder(final @NonNull ConversationListItem itemView,
-                      final @Nullable ItemClickListener clickListener)
+    public <V extends View & BindableConversationListItem> ViewHolder(final @NonNull V itemView)
     {
       super(itemView);
-      itemView.setOnClickListener(new OnClickListener() {
-        @Override
-        public void onClick(View view) {
-          if (clickListener != null) clickListener.onItemClick(itemView);
-        }
-      });
-      itemView.setOnLongClickListener(new OnLongClickListener() {
-        @Override
-        public boolean onLongClick(View view) {
-          if (clickListener != null) clickListener.onItemLongClick(itemView);
-          return true;
-        }
-      });
     }
 
-    public ConversationListItem getItem() {
-      return (ConversationListItem)itemView;
+    public BindableConversationListItem getItem() {
+      return (BindableConversationListItem)itemView;
     }
   }
 
   @Override
   public long getItemId(@NonNull Cursor cursor) {
-    ThreadRecord record = getThreadRecord(cursor);
-    StringBuilder builder = new StringBuilder(""+record.getThreadId());
+    ThreadRecord  record  = getThreadRecord(cursor);
+    StringBuilder builder = new StringBuilder("" + record.getThreadId());
+
     for (long recipientId : record.getRecipients().getIds()) {
       builder.append("::").append(recipientId);
     }
+
     return Conversions.byteArrayToLong(digest.digest(builder.toString().getBytes()));
   }
 
@@ -118,8 +109,39 @@ public class ConversationListAdapter extends CursorRecyclerViewAdapter<Conversat
 
   @Override
   public ViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
-    return new ViewHolder((ConversationListItem)inflater.inflate(R.layout.conversation_list_item_view,
-                                                                 parent, false), clickListener);
+    if (viewType == MESSAGE_TYPE_SWITCH_ARCHIVE) {
+      ConversationListItemAction action = (ConversationListItemAction)inflater.inflate(R.layout.conversation_list_item_action,
+                                                                                       parent, false);
+
+      action.setOnClickListener(new OnClickListener() {
+        @Override
+        public void onClick(View v) {
+          if (clickListener != null) clickListener.onSwitchToArchive();
+        }
+      });
+
+      return new ViewHolder(action);
+    } else {
+      final ConversationListItem item = (ConversationListItem)inflater.inflate(R.layout.conversation_list_item_view,
+                                                                               parent, false);
+
+      item.setOnClickListener(new OnClickListener() {
+        @Override
+        public void onClick(View view) {
+          if (clickListener != null) clickListener.onItemClick(item);
+        }
+      });
+
+      item.setOnLongClickListener(new OnLongClickListener() {
+        @Override
+        public boolean onLongClick(View view) {
+          if (clickListener != null) clickListener.onItemLongClick(item);
+          return true;
+        }
+      });
+
+      return new ViewHolder(item);
+    }
   }
 
   @Override
@@ -129,7 +151,18 @@ public class ConversationListAdapter extends CursorRecyclerViewAdapter<Conversat
 
   @Override
   public void onBindItemViewHolder(ViewHolder viewHolder, @NonNull Cursor cursor) {
-    viewHolder.getItem().set(masterSecret, getThreadRecord(cursor), locale, batchSet, batchMode);
+    viewHolder.getItem().bind(masterSecret, getThreadRecord(cursor), locale, batchSet, batchMode);
+  }
+
+  @Override
+  public int getItemViewType(@NonNull Cursor cursor) {
+    ThreadRecord threadRecord = getThreadRecord(cursor);
+
+    if (threadRecord.getDistributionType() == ThreadDatabase.DistributionTypes.ARCHIVE) {
+      return MESSAGE_TYPE_SWITCH_ARCHIVE;
+    } else {
+      return MESSAGE_TYPE_THREAD;
+    }
   }
 
   private ThreadRecord getThreadRecord(@NonNull Cursor cursor) {
@@ -139,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);
     }
   }
@@ -160,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();
   }
@@ -168,5 +202,6 @@ public class ConversationListAdapter extends CursorRecyclerViewAdapter<Conversat
   public interface ItemClickListener {
     void onItemClick(ConversationListItem item);
     void onItemLongClick(ConversationListItem item);
+    void onSwitchToArchive();
   }
 }

src/org/thoughtcrime/securesms/ConversationListArchiveActivity.java

@@ -0,0 +1,71 @@
+package org.thoughtcrime.securesms;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.view.MenuItem;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.recipients.Recipients;
+import org.thoughtcrime.securesms.util.DynamicLanguage;
+import org.thoughtcrime.securesms.util.DynamicTheme;
+
+public class ConversationListArchiveActivity extends PassphraseRequiredActionBarActivity
+    implements ConversationListFragment.ConversationSelectedListener
+{
+
+  private final DynamicTheme    dynamicTheme    = new DynamicTheme();
+  private final DynamicLanguage dynamicLanguage = new DynamicLanguage();
+
+  @Override
+  protected void onPreCreate() {
+    dynamicTheme.onCreate(this);
+    dynamicLanguage.onCreate(this);
+  }
+
+  @Override
+  protected void onCreate(Bundle icicle, @NonNull MasterSecret masterSecret) {
+    getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+
+    Bundle bundle = new Bundle();
+    bundle.putBoolean(ConversationListFragment.ARCHIVE, true);
+
+    initFragment(android.R.id.content, new ConversationListFragment(),
+                 masterSecret, dynamicLanguage.getCurrentLocale(), bundle);
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    dynamicTheme.onResume(this);
+    dynamicLanguage.onResume(this);
+  }
+
+  @Override
+  public boolean onOptionsItemSelected(MenuItem item) {
+    super.onOptionsItemSelected(item);
+
+    switch (item.getItemId()) {
+      case R.id.home: super.onBackPressed(); return true;
+    }
+
+    return false;
+  }
+
+  @Override
+  public void onCreateConversation(long threadId, Recipients recipients, int distributionType) {
+    Intent intent = new Intent(this, ConversationActivity.class);
+    intent.putExtra(ConversationActivity.RECIPIENTS_EXTRA, recipients.getIds());
+    intent.putExtra(ConversationActivity.THREAD_ID_EXTRA, threadId);
+    intent.putExtra(ConversationActivity.DISTRIBUTION_TYPE_EXTRA, distributionType);
+
+    startActivity(intent);
+    overridePendingTransition(R.anim.slide_from_right, R.anim.fade_scale_out);
+  }
+
+  @Override
+  public void onSwitchToArchive() {
+    throw new AssertionError();
+  }
+
+}

src/org/thoughtcrime/securesms/ConversationListFragment.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (C) 2011 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
@@ -20,21 +20,31 @@ 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;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
 import android.graphics.Color;
+import android.graphics.Paint;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.design.widget.FloatingActionButton;
+import android.support.design.widget.Snackbar;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.view.ActionMode;
 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;
@@ -43,7 +53,6 @@ import android.view.View;
 import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 
-import com.melnykov.fab.FloatingActionButton;
 
 import org.thoughtcrime.securesms.ConversationListAdapter.ItemClickListener;
 import org.thoughtcrime.securesms.components.reminder.DefaultSmsReminder;
@@ -60,8 +69,11 @@ import org.thoughtcrime.securesms.database.loaders.ConversationListLoader;
 import org.thoughtcrime.securesms.notifications.MessageNotifier;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.util.Util;
+import org.thoughtcrime.securesms.util.ViewUtil;
+import org.thoughtcrime.securesms.util.task.SnackbarAsyncTask;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 
+import java.util.HashSet;
 import java.util.Locale;
 import java.util.Set;
 
@@ -69,6 +81,9 @@ import java.util.Set;
 public class ConversationListFragment extends Fragment
   implements LoaderManager.LoaderCallbacks<Cursor>, ActionMode.Callback, ItemClickListener
 {
+
+  public static final String ARCHIVE = "archive";
+
   private MasterSecret         masterSecret;
   private ActionMode           actionMode;
   private RecyclerView         list;
@@ -76,27 +91,39 @@ public class ConversationListFragment extends Fragment
   private FloatingActionButton fab;
   private Locale               locale;
   private String               queryFilter  = "";
+  private boolean              archive;
 
   @Override
   public void onCreate(Bundle icicle) {
     super.onCreate(icicle);
     masterSecret = getArguments().getParcelable("master_secret");
     locale       = (Locale) getArguments().getSerializable(PassphraseRequiredActionBarActivity.LOCALE_EXTRA);
+    archive      = getArguments().getBoolean(ARCHIVE, false);
   }
 
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
     final View view = inflater.inflate(R.layout.conversation_list_fragment, container, false);
-    reminderView = (ReminderView) view.findViewById(R.id.reminder);
-    list         = (RecyclerView) view.findViewById(R.id.list);
-    fab          = (FloatingActionButton) view.findViewById(R.id.fab);
+
+    reminderView = ViewUtil.findById(view, R.id.reminder);
+    list         = ViewUtil.findById(view, R.id.list);
+    fab          = ViewUtil.findById(view, R.id.fab);
+
+    if (archive) fab.setVisibility(View.GONE);
+    else         fab.setVisibility(View.VISIBLE);
+
     reminderView.setOnDismissListener(new OnDismissListener() {
-      @Override public void onDismiss() {
+      @Override
+      public void onDismiss() {
         updateReminders();
       }
     });
+
     list.setHasFixedSize(true);
     list.setLayoutManager(new LinearLayoutManager(getActivity()));
+
+    new ItemTouchHelper(new ArchiveListenerCallback()).attachToRecyclerView(list);
+
     return view;
   }
 
@@ -170,6 +197,49 @@ public class ConversationListFragment extends Fragment
     getLoaderManager().restartLoader(0, null, this);
   }
 
+  private void handleArchiveAllSelected() {
+    final Set<Long> selectedConversations = new HashSet<>(getListAdapter().getBatchSelections());
+    final boolean   archive               = this.archive;
+
+    String snackBarTitle;
+
+    if (archive) snackBarTitle = getString(R.string.ConversationListFragment_moved_conversations_to_inbox);
+    else         snackBarTitle = getString(R.string.ConversationListFragment_archived_conversations);
+
+    new SnackbarAsyncTask<Void>(getView(), snackBarTitle,
+                                getString(R.string.ConversationListFragment_undo),
+                                getResources().getColor(R.color.amber_500),
+                                Snackbar.LENGTH_LONG, true)
+    {
+
+      @Override
+      protected void onPostExecute(Void result) {
+        super.onPostExecute(result);
+
+        if (actionMode != null) {
+          actionMode.finish();
+          actionMode = null;
+        }
+      }
+
+      @Override
+      protected void executeAction(@Nullable Void parameter) {
+        for (long threadId : selectedConversations) {
+          if (!archive) DatabaseFactory.getThreadDatabase(getActivity()).archiveConversation(threadId);
+          else          DatabaseFactory.getThreadDatabase(getActivity()).unarchiveConversation(threadId);
+        }
+      }
+
+      @Override
+      protected void reverseAction(@Nullable Void parameter) {
+        for (long threadId : selectedConversations) {
+          if (!archive) DatabaseFactory.getThreadDatabase(getActivity()).unarchiveConversation(threadId);
+          else          DatabaseFactory.getThreadDatabase(getActivity()).archiveConversation(threadId);
+        }
+      }
+    }.execute();
+  }
+
   private void handleDeleteAllSelected() {
     int                 conversationsCount = getListAdapter().getBatchSelections().size();
     AlertDialog.Builder alert              = new AlertDialog.Builder(getActivity());
@@ -225,7 +295,7 @@ public class ConversationListFragment extends Fragment
   private void handleSelectAllThreads() {
     getListAdapter().selectAllThreads();
     actionMode.setSubtitle(getString(R.string.conversation_fragment_cab__batch_selection_amount,
-                           getListAdapter().getBatchSelections().size()));
+                                     getListAdapter().getBatchSelections().size()));
   }
 
   private void handleCreateConversation(long threadId, Recipients recipients, int distributionType) {
@@ -234,7 +304,7 @@ public class ConversationListFragment extends Fragment
 
   @Override
   public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-    return new ConversationListLoader(getActivity(), queryFilter);
+    return new ConversationListLoader(getActivity(), queryFilter, archive);
   }
 
   @Override
@@ -276,21 +346,30 @@ public class ConversationListFragment extends Fragment
     getListAdapter().notifyDataSetChanged();
   }
 
+  @Override
+  public void onSwitchToArchive() {
+    ((ConversationSelectedListener)getActivity()).onSwitchToArchive();
+  }
+
   public interface ConversationSelectedListener {
     void onCreateConversation(long threadId, Recipients recipients, int distributionType);
+    void onSwitchToArchive();
 }
 
   @Override
   public boolean onCreateActionMode(ActionMode mode, Menu menu) {
     MenuInflater inflater = getActivity().getMenuInflater();
+
+    if (archive) inflater.inflate(R.menu.conversation_list_batch_unarchive, menu);
+    else         inflater.inflate(R.menu.conversation_list_batch_archive, menu);
+
     inflater.inflate(R.menu.conversation_list_batch, menu);
 
     mode.setTitle(R.string.conversation_fragment_cab__batch_selection_mode);
     mode.setSubtitle(getString(R.string.conversation_fragment_cab__batch_selection_amount, 1));
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      getActivity().getWindow()
-        .setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
+      getActivity().getWindow().setStatusBarColor(getResources().getColor(R.color.action_mode_status_bar));
     }
 
     return true;
@@ -304,8 +383,9 @@ public class ConversationListFragment extends Fragment
   @Override
   public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
     switch (item.getItemId()) {
-    case R.id.menu_select_all:      handleSelectAllThreads(); return true;
-    case R.id.menu_delete_selected: handleDeleteAllSelected(); return true;
+    case R.id.menu_select_all:       handleSelectAllThreads();   return true;
+    case R.id.menu_delete_selected:  handleDeleteAllSelected();  return true;
+    case R.id.menu_archive_selected: handleArchiveAllSelected(); return true;
     }
 
     return false;
@@ -316,8 +396,7 @@ public class ConversationListFragment extends Fragment
     getListAdapter().initializeBatchMode(false);
 
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-      TypedArray color = getActivity().getTheme()
-        .obtainStyledAttributes(new int[] { android.R.attr.statusBarColor });
+      TypedArray color = getActivity().getTheme().obtainStyledAttributes(new int[] {android.R.attr.statusBarColor});
       getActivity().getWindow().setStatusBarColor(color.getColor(0, Color.BLACK));
       color.recycle();
     }
@@ -325,6 +404,114 @@ public class ConversationListFragment extends Fragment
     actionMode = null;
   }
 
+  private class ArchiveListenerCallback extends ItemTouchHelper.SimpleCallback {
+
+    public ArchiveListenerCallback() {
+      super(0, ItemTouchHelper.RIGHT);
+    }
+
+    @Override
+    public boolean onMove(RecyclerView recyclerView,
+                          RecyclerView.ViewHolder viewHolder,
+                          RecyclerView.ViewHolder target)
+    {
+      return false;
+    }
+
+    @Override
+    public int getSwipeDirs(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+      if (viewHolder.itemView instanceof ConversationListItemAction) {
+        return 0;
+      }
+
+      if (actionMode != null) {
+        return 0;
+      }
+
+      return super.getSwipeDirs(recyclerView, viewHolder);
+    }
+
+    @Override
+    public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+      final long threadId = ((ConversationListItem)viewHolder.itemView).getThreadId();
+
+      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)
+        {
+          @Override
+          protected void executeAction(@Nullable Long parameter) {
+            DatabaseFactory.getThreadDatabase(getActivity()).unarchiveConversation(threadId);
+          }
+
+          @Override
+          protected void reverseAction(@Nullable Long parameter) {
+            DatabaseFactory.getThreadDatabase(getActivity()).archiveConversation(threadId);
+          }
+        }.execute(threadId);
+      } else {
+        new SnackbarAsyncTask<Long>(getView(),
+                                    getString(R.string.ConversationListFragment_archived_conversation),
+                                    getString(R.string.ConversationListFragment_undo),
+                                    getResources().getColor(R.color.amber_500),
+                                    Snackbar.LENGTH_SHORT, false)
+        {
+          @Override
+          protected void executeAction(@Nullable Long parameter) {
+            DatabaseFactory.getThreadDatabase(getActivity()).archiveConversation(threadId);
+          }
+
+          @Override
+          protected void reverseAction(@Nullable Long parameter) {
+            DatabaseFactory.getThreadDatabase(getActivity()).unarchiveConversation(threadId);
+          }
+        }.execute(threadId);
+      }
+    }
+
+    @Override
+    public void onChildDraw(Canvas c, RecyclerView recyclerView,
+                            RecyclerView.ViewHolder viewHolder,
+                            float dX, float dY, int actionState,
+                            boolean isCurrentlyActive)
+    {
+
+      if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
+        View  itemView = viewHolder.itemView;
+        Paint p        = new Paint();
+
+        if (dX > 0) {
+          Bitmap icon;
+
+          if (archive) icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_unarchive_white_36dp);
+          else         icon = BitmapFactory.decodeResource(getResources(), R.drawable.ic_archive_white_36dp);
+
+          p.setColor(getResources().getColor(R.color.green_500));
+
+          c.drawRect((float) itemView.getLeft(), (float) itemView.getTop(), dX,
+                     (float) itemView.getBottom(), p);
+
+          c.drawBitmap(icon,
+                       (float) itemView.getLeft() + getResources().getDimension(R.dimen.conversation_list_fragment_archive_padding),
+                       (float) itemView.getTop() + ((float) itemView.getBottom() - (float) itemView.getTop() - icon.getHeight())/2,
+                       p);
+        }
+
+        if (Build.VERSION.SDK_INT >= 11) {
+          float alpha = 1.0f - Math.abs(dX) / (float) viewHolder.itemView.getWidth();
+          viewHolder.itemView.setAlpha(alpha);
+          viewHolder.itemView.setTranslationX(dX);
+        }
+
+      } else {
+        super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+      }
+    }
+  }
+
 }
 
 

src/org/thoughtcrime/securesms/ConversationListItem.java

@@ -27,6 +27,7 @@ import android.os.Handler;
 import android.support.annotation.DrawableRes;
 import android.support.annotation.NonNull;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.View;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -39,6 +40,7 @@ import org.thoughtcrime.securesms.database.model.ThreadRecord;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.util.DateUtils;
 import org.thoughtcrime.securesms.util.ResUtil;
+import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.util.Locale;
 import java.util.Set;
@@ -53,7 +55,8 @@ import static org.thoughtcrime.securesms.util.SpanUtil.color;
  */
 
 public class ConversationListItem extends RelativeLayout
-                                  implements Recipients.RecipientsModifiedListener, Unbindable
+                                  implements Recipients.RecipientsModifiedListener,
+                                             BindableConversationListItem, Unbindable
 {
   private final static String TAG = ConversationListItem.class.getSimpleName();
 
@@ -66,6 +69,7 @@ public class ConversationListItem extends RelativeLayout
   private TextView        subjectView;
   private FromTextView    fromView;
   private TextView        dateView;
+  private TextView        archivedView;
   private boolean         read;
   private AvatarImageView contactPhotoImage;
   private ThumbnailView   thumbnailView;
@@ -94,11 +98,12 @@ public class ConversationListItem extends RelativeLayout
     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);
     thumbnailView.setClickable(false);
   }
 
-  public void set(@NonNull MasterSecret masterSecret, @NonNull ThreadRecord thread,
-                  @NonNull Locale locale, @NonNull Set<Long> selectedThreads, boolean batchMode)
+  public void bind(@NonNull MasterSecret masterSecret, @NonNull ThreadRecord thread,
+                   @NonNull Locale locale, @NonNull Set<Long> selectedThreads, boolean batchMode)
   {
     this.selectedThreads  = selectedThreads;
     this.recipients       = thread.getRecipients();
@@ -118,6 +123,12 @@ public class ConversationListItem extends RelativeLayout
       dateView.setTypeface(read ? LIGHT_TYPEFACE : BOLD_TYPEFACE);
     }
 
+    if (thread.isArchived()) {
+      this.archivedView.setVisibility(View.VISIBLE);
+    } else {
+      this.archivedView.setVisibility(View.GONE);
+    }
+
     setThumbnailSnippet(masterSecret, thread);
     setBatchState(batchMode);
     setBackground(thread);
@@ -154,11 +165,12 @@ 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, dateView));
     } else {
       this.thumbnailView.setVisibility(View.GONE);
 
       LayoutParams subjectParams = (RelativeLayout.LayoutParams)this.subjectView.getLayoutParams();
-      subjectParams.addRule(RelativeLayout.LEFT_OF, 0);
+      subjectParams.addRule(RelativeLayout.LEFT_OF, R.id.archived);
       this.subjectView.setLayoutParams(subjectParams);
     }
   }
@@ -187,4 +199,31 @@ public class ConversationListItem extends RelativeLayout
       }
     });
   }
+
+  private static class ThumbnailPositioner implements Runnable {
+
+    private final View thumbnailView;
+    private final View archivedView;
+    private final View dateView;
+
+    public ThumbnailPositioner(View thumbnailView, View archivedView, View dateView) {
+      this.thumbnailView = thumbnailView;
+      this.archivedView  = archivedView;
+      this.dateView      = dateView;
+    }
+
+    @Override
+    public void run() {
+      LayoutParams thumbnailParams = (RelativeLayout.LayoutParams)thumbnailView.getLayoutParams();
+
+      if (archivedView.getVisibility() == View.VISIBLE && archivedView.getWidth() > dateView.getWidth()) {
+        thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.archived);
+      } else {
+        thumbnailParams.addRule(RelativeLayout.LEFT_OF, R.id.date);
+      }
+
+      thumbnailView.setLayoutParams(thumbnailParams);
+    }
+  }
+
 }

src/org/thoughtcrime/securesms/ConversationListItemAction.java

@@ -0,0 +1,50 @@
+package org.thoughtcrime.securesms;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.support.annotation.NonNull;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.database.model.ThreadRecord;
+import org.thoughtcrime.securesms.util.ViewUtil;
+
+import java.util.Locale;
+import java.util.Set;
+
+public class ConversationListItemAction extends LinearLayout implements BindableConversationListItem {
+
+  private TextView description;
+
+  public ConversationListItemAction(Context context) {
+    super(context);
+  }
+
+  public ConversationListItemAction(Context context, AttributeSet attrs) {
+    super(context, attrs);
+  }
+
+  @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+  public ConversationListItemAction(Context context, AttributeSet attrs, int defStyleAttr) {
+    super(context, attrs, defStyleAttr);
+  }
+
+  @Override
+  public void onFinishInflate() {
+    super.onFinishInflate();
+    this.description = ViewUtil.findById(this, R.id.description);
+  }
+
+  @Override
+  public void bind(@NonNull MasterSecret masterSecret, @NonNull ThreadRecord thread, @NonNull Locale locale, @NonNull Set<Long> selectedThreads, boolean batchMode) {
+    this.description.setText(getContext().getString(R.string.ConversationListItemAction_archived_conversations_d, thread.getCount()));
+  }
+
+  @Override
+  public void unbind() {
+
+  }
+}

src/org/thoughtcrime/securesms/DeviceActivity.java

@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
 import org.thoughtcrime.securesms.util.Base64;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
-import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.Util;
 import org.whispersystems.libaxolotl.IdentityKeyPair;

src/org/thoughtcrime/securesms/DeviceListFragment.java

@@ -22,7 +22,7 @@ import com.melnykov.fab.FloatingActionButton;
 
 import org.thoughtcrime.securesms.database.loaders.DeviceListLoader;
 import org.thoughtcrime.securesms.dependencies.InjectableType;
-import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.whispersystems.textsecure.api.TextSecureAccountManager;

src/org/thoughtcrime/securesms/DeviceListItem.java

@@ -39,14 +39,14 @@ public class DeviceListItem extends LinearLayout {
     else                                         this.name.setText(deviceInfo.getName());
 
     this.created.setText(getContext().getString(R.string.DeviceListItem_linked_s,
-                                                DateUtils.getExtendedRelativeTimeSpanString(getContext(),
-                                                                                            Locale.getDefault(),
-                                                                                            deviceInfo.getCreated())));
+                                                DateUtils.getDayPrecisionTimeSpanString(getContext(),
+                                                                                        Locale.getDefault(),
+                                                                                        deviceInfo.getCreated())));
 
     this.lastActive.setText(getContext().getString(R.string.DeviceListItem_last_active_s,
-                                                   DateUtils.getExtendedRelativeTimeSpanString(getContext(),
-                                                                                               Locale.getDefault(),
-                                                                                               deviceInfo.getLastSeen())));
+                                                   DateUtils.getDayPrecisionTimeSpanString(getContext(),
+                                                                                           Locale.getDefault(),
+                                                                                           deviceInfo.getLastSeen())));
 
     this.deviceId = deviceInfo.getId();
   }

src/org/thoughtcrime/securesms/DeviceProvisioningActivity.java

@@ -16,7 +16,7 @@ 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.ProgressDialogAsyncTask;
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
 import org.whispersystems.libaxolotl.IdentityKeyPair;
 import org.whispersystems.libaxolotl.InvalidKeyException;

src/org/thoughtcrime/securesms/GroupCreateActivity.java

@@ -46,6 +46,8 @@ import com.soundcloud.android.crop.Crop;
 import org.thoughtcrime.securesms.components.PushRecipientsPanel;
 import org.thoughtcrime.securesms.components.PushRecipientsPanel.RecipientsPanelChangedListener;
 import org.thoughtcrime.securesms.contacts.RecipientsEditor;
+import org.thoughtcrime.securesms.contacts.avatars.ContactColors;
+import org.thoughtcrime.securesms.contacts.avatars.ContactPhotoFactory;
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.GroupDatabase;
@@ -63,7 +65,7 @@ import org.thoughtcrime.securesms.util.BitmapUtil;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
 import org.thoughtcrime.securesms.util.GroupUtil;
-import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.thoughtcrime.securesms.util.SelectedRecipientsAdapter;
 import org.thoughtcrime.securesms.util.SelectedRecipientsAdapter.OnRecipientDeletedListener;
 import org.thoughtcrime.securesms.util.TextSecurePreferences;
@@ -156,7 +158,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
   @SuppressWarnings("ConstantConditions")
   private void updateViewState() {
     if (!TextSecurePreferences.isPushRegistered(this)) {
-      disableSignalGroupViews(R.string.GroupCreateActivity_you_dont_support_push);
+      disableSignalGroupViews(R.string.GroupCreateActivity_youre_not_registered_for_signal);
       getSupportActionBar().setTitle(R.string.GroupCreateActivity_actionbar_mms_title);
     } else if (getAdapter().hasNonPushMembers()) {
       disableSignalGroupViews(R.string.GroupCreateActivity_contacts_dont_support_push);
@@ -199,6 +201,8 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     recipientsEditor.setHint(R.string.recipients_panel__add_member);
     recipientsPanel.setPanelChangeListener(this);
     findViewById(R.id.contacts_button).setOnClickListener(new AddRecipientButtonListener());
+    avatar.setImageDrawable(ContactPhotoFactory.getDefaultGroupPhoto()
+                                               .asDrawable(this, ContactColors.UNKNOWN_COLOR.toConversationColor(this)));
     avatar.setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View view) {
@@ -319,13 +323,8 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
              .centerCrop().override(AVATAR_SIZE, AVATAR_SIZE)
              .into(new SimpleTarget<Bitmap>() {
                @Override
-               public void onResourceReady(Bitmap resource,
-                                                     GlideAnimation<? super Bitmap> glideAnimation)
-               {
-                 avatarBmp = resource;
-                 Glide.with(GroupCreateActivity.this).load(Crop.getOutput(data)).skipMemoryCache(true)
-                      .transform(new RoundedCorners(GroupCreateActivity.this, avatar.getWidth() / 2))
-                      .into(avatar);
+               public void onResourceReady(Bitmap resource, GlideAnimation<? super Bitmap> glideAnimation) {
+                 setAvatar(Crop.getOutput(data), resource);
                }
              });
     }
@@ -561,6 +560,7 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
         return Optional.of(new GroupData(groupIds[0],
                                          existingContacts,
                                          BitmapUtil.fromByteArray(group.getAvatar()),
+                                         group.getAvatar(),
                                          group.getTitle()));
       } else {
         return Optional.absent();
@@ -575,7 +575,9 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
         activity.groupToUpdate = group;
 
         activity.groupName.setText(group.get().name);
-        if (group.get().avatar != null) activity.avatar.setImageBitmap(group.get().avatar);
+        if (group.get().avatarBmp != null) {
+          activity.setAvatar(group.get().avatarBytes, group.get().avatarBmp);
+        }
         SelectedRecipientsAdapter adapter = new SelectedRecipientsAdapter(activity, group.get().recipients);
         adapter.setOnRecipientDeletedListener(activity);
         activity.lv.setAdapter(adapter);
@@ -584,17 +586,28 @@ public class GroupCreateActivity extends PassphraseRequiredActionBarActivity
     }
   }
 
+  private <T> void setAvatar(T model, Bitmap bitmap) {
+    avatarBmp = bitmap;
+    Glide.with(this)
+         .load(model)
+         .skipMemoryCache(true)
+         .transform(new RoundedCorners(this, avatar.getWidth() / 2))
+         .into(avatar);
+  }
+
   private static class GroupData {
     byte[]         id;
     Set<Recipient> recipients;
-    Bitmap         avatar;
+    Bitmap         avatarBmp;
+    byte[]         avatarBytes;
     String         name;
 
-    public GroupData(byte[] id, Set<Recipient> recipients, Bitmap avatar, String name) {
-      this.id         = id;
-      this.recipients = recipients;
-      this.avatar     = avatar;
-      this.name       = name;
+    public GroupData(byte[] id, Set<Recipient> recipients, Bitmap avatarBmp, byte[] avatarBytes, String name) {
+      this.id          = id;
+      this.recipients  = recipients;
+      this.avatarBmp   = avatarBmp;
+      this.avatarBytes = avatarBytes;
+      this.name        = name;
     }
   }
 }

src/org/thoughtcrime/securesms/InviteActivity.java

@@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.recipients.RecipientFactory;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.sms.MessageSender;
 import org.thoughtcrime.securesms.sms.OutgoingTextMessage;
-import org.thoughtcrime.securesms.util.ProgressDialogAsyncTask;
+import org.thoughtcrime.securesms.util.task.ProgressDialogAsyncTask;
 import org.thoughtcrime.securesms.util.ViewUtil;
 import org.thoughtcrime.securesms.util.concurrent.ListenableFuture.Listener;
 

src/org/thoughtcrime/securesms/ShareActivity.java

@@ -29,7 +29,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.webkit.MimeTypeMap;
 
 import org.thoughtcrime.securesms.crypto.MasterSecret;
 import org.thoughtcrime.securesms.mms.PartAuthority;
@@ -37,6 +36,7 @@ import org.thoughtcrime.securesms.providers.PersistentBlobProvider;
 import org.thoughtcrime.securesms.recipients.Recipients;
 import org.thoughtcrime.securesms.util.DynamicLanguage;
 import org.thoughtcrime.securesms.util.DynamicTheme;
+import org.thoughtcrime.securesms.util.MediaUtil;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
 import java.io.IOException;
@@ -167,7 +167,8 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
     final Intent intent      = new Intent(this, target);
     final String textExtra   = getIntent().getStringExtra(Intent.EXTRA_TEXT);
     final Uri    streamExtra = getIntent().getParcelableExtra(Intent.EXTRA_STREAM);
-    final String type        = streamExtra != null ? getMimeType(streamExtra) : getIntent().getType();
+    final String type        = streamExtra != null ? getMimeType(streamExtra)
+                                                   : MediaUtil.getCorrectedMimeType(getIntent().getType());
     intent.putExtra(ConversationActivity.TEXT_EXTRA, textExtra);
     if (resolvedExtra != null) intent.setDataAndType(resolvedExtra, type);
 
@@ -175,14 +176,9 @@ public class ShareActivity extends PassphraseRequiredActionBarActivity
   }
 
   private String getMimeType(Uri uri) {
-    String type = getContentResolver().getType(uri);
-
-    if (type == null) {
-      String extension = MimeTypeMap.getFileExtensionFromUrl(uri.toString());
-      type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(extension);
-    }
-
-    return type == null ? getIntent().getType() : type;
+    final String type = MediaUtil.getMimeType(getApplicationContext(), uri);
+    return type == null ? MediaUtil.getCorrectedMimeType(getIntent().getType())
+                        : type;
   }
 
   private class ResolveMediaTask extends AsyncTask<Uri, Void, Uri> {

src/org/thoughtcrime/securesms/ShareFragment.java

@@ -90,7 +90,7 @@ public class ShareFragment extends ListFragment implements LoaderManager.LoaderC
 
   @Override
   public Loader<Cursor> onCreateLoader(int arg0, Bundle arg1) {
-    return new ConversationListLoader(getActivity(), null);
+    return new ConversationListLoader(getActivity(), null, false);
   }
 
   @Override

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

@@ -2,7 +2,6 @@ package org.thoughtcrime.securesms.components;
 
 import android.content.Context;
 import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
 import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.InputType;
@@ -97,8 +96,9 @@ public class ContactFilterToolbar extends Toolbar {
         notifyListener();
       }
     });
-    expandTapArea(this, action, 500);
-    expandTapArea(toggleContainer, dialpadToggle, 500);
+
+    expandTapArea(this, action);
+    expandTapArea(toggleContainer, dialpadToggle);
   }
 
   @Override
@@ -131,10 +131,12 @@ public class ContactFilterToolbar extends Toolbar {
 
   private void displayTogglingView(View view) {
     toggle.display(view);
-    expandTapArea(toggleContainer, view, 500);
+    expandTapArea(toggleContainer, view);
   }
 
-  private void expandTapArea(final View container, final View child, final int padding) {
+  private void expandTapArea(final View container, final View child) {
+    final int padding = getResources().getDimensionPixelSize(R.dimen.contact_selection_actions_tap_area);
+
     container.post(new Runnable() {
       @Override
       public void run() {

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

@@ -160,9 +160,10 @@ public class ThumbnailView extends FrameLayout {
   }
 
   private GenericRequestBuilder buildThumbnailGlideRequest(@NonNull Slide slide, @NonNull MasterSecret masterSecret) {
+    @SuppressWarnings("ConstantConditions")
     DrawableRequestBuilder<DecryptableUri> builder = Glide.with(getContext()).load(new DecryptableUri(masterSecret, slide.getThumbnailUri()))
-                                                          .crossFade()
-                                                          .transform(new RoundedCorners(getContext(), true, radius, backgroundColorHint));
+                                                                             .crossFade()
+                                                                             .transform(new RoundedCorners(getContext(), true, radius, backgroundColorHint));
 
     if (slide.isInProgress()) return builder;
     else                      return builder.error(R.drawable.ic_missing_thumbnail_picture);

src/org/thoughtcrime/securesms/components/camera/CameraView.java

@@ -34,9 +34,11 @@ import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.util.Log;
 import android.view.OrientationEventListener;
-import android.widget.FrameLayout;
+import android.view.ViewGroup;
 
 import java.io.IOException;
+import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 
 import org.thoughtcrime.securesms.ApplicationContext;
@@ -49,7 +51,7 @@ import org.whispersystems.jobqueue.JobParameters;
 import org.whispersystems.libaxolotl.util.guava.Optional;
 
 @SuppressWarnings("deprecation")
-public class CameraView extends FrameLayout {
+public class CameraView extends ViewGroup {
   private static final String TAG = CameraView.class.getSimpleName();
 
   private final CameraSurfaceView   surface;
@@ -59,10 +61,10 @@ public class CameraView extends FrameLayout {
   private volatile int              cameraId           = CameraInfo.CAMERA_FACING_BACK;
   private volatile int              displayOrientation = -1;
 
-  private @NonNull  State              state = State.PAUSED;
-  private @Nullable Size               previewSize;
-  private @Nullable CameraViewListener listener;
-  private           int                outputOrientation  = -1;
+  private @NonNull  State                    state = State.PAUSED;
+  private @Nullable Size                     previewSize;
+  private @NonNull  List<CameraViewListener> listeners = Collections.synchronizedList(new LinkedList<CameraViewListener>());
+  private           int                      outputOrientation  = -1;
 
   public CameraView(Context context) {
     this(context, null);
@@ -102,7 +104,9 @@ public class CameraView extends FrameLayout {
       @Nullable
       Void onRunBackground() {
         try {
+          long openStartMillis = System.currentTimeMillis();
           camera = Optional.fromNullable(Camera.open(cameraId));
+          Log.w(TAG, "camera.open() -> " + (System.currentTimeMillis() - openStartMillis) + "ms");
           synchronized (CameraView.this) {
             CameraView.this.notifyAll();
           }
@@ -117,7 +121,9 @@ public class CameraView extends FrameLayout {
       protected void onPostMain(Void avoid) {
         if (!camera.isPresent()) {
           Log.w(TAG, "tried to open camera but got null");
-          if (listener != null) listener.onCameraFail();
+          for (CameraViewListener listener : listeners) {
+            listener.onCameraFail();
+          }
           return;
         }
 
@@ -162,9 +168,15 @@ public class CameraView extends FrameLayout {
         onOrientationChange.disable();
         displayOrientation = -1;
         outputOrientation = -1;
+        removeView(surface);
+        addView(surface);
         Log.w(TAG, "onPause() completed");
       }
     });
+
+    for (CameraViewListener listener : listeners) {
+      listener.onCameraStop();
+    }
   }
 
   public boolean isStarted() {
@@ -213,8 +225,8 @@ public class CameraView extends FrameLayout {
     if (camera.isPresent()) startPreview(camera.get().getParameters());
   }
 
-  public void setListener(@Nullable CameraViewListener listener) {
-    this.listener = listener;
+  public void addListener(@NonNull CameraViewListener listener) {
+    listeners.add(listener);
   }
 
   public void setPreviewCallback(final @NonNull PreviewCallback previewCallback) {
@@ -284,7 +296,7 @@ public class CameraView extends FrameLayout {
           camera.setPreviewDisplay(surface.getHolder());
           startPreview(parameters);
         } catch (Exception e) {
-          Log.w(TAG, "couldn't set preview display");
+          Log.w(TAG, "couldn't set preview display", e);
         }
         return null;
       }
@@ -306,9 +318,19 @@ public class CameraView extends FrameLayout {
         } else {
           previewSize = parameters.getPreviewSize();
         }
+        long previewStartMillis = System.currentTimeMillis();
         camera.startPreview();
-        postRequestLayout();
+        Log.w(TAG, "camera.startPreview() -> " + (System.currentTimeMillis() - previewStartMillis) + "ms");
         state = State.ACTIVE;
+        Util.runOnMain(new Runnable() {
+          @Override
+          public void run() {
+            requestLayout();
+            for (CameraViewListener listener : listeners) {
+              listener.onCameraStart();
+            }
+          }
+        });
       } catch (Exception e) {
         Log.w(TAG, e);
       }
@@ -326,6 +348,7 @@ public class CameraView extends FrameLayout {
     }
   }
 
+
   private Size getPreferredPreviewSize(@NonNull Parameters parameters) {
     return CameraUtils.getPreferredPreviewSize(displayOrientation,
                                                getMeasuredWidth(),
@@ -347,13 +370,11 @@ public class CameraView extends FrameLayout {
     return outputOrientation;
   }
 
-  private void postRequestLayout() {
-    post(new Runnable() {
-      @Override
-      public void run() {
-        requestLayout();
-      }
-    });
+  // https://github.com/WhisperSystems/Signal-Android/issues/4715
+  private boolean isTroublemaker() {
+    return getCameraInfo().facing == CameraInfo.CAMERA_FACING_FRONT &&
+           "JWR66Y".equals(Build.DISPLAY) &&
+           "yakju".equals(Build.PRODUCT);
   }
 
   private @NonNull CameraInfo getCameraInfo() {
@@ -446,7 +467,7 @@ public class CameraView extends FrameLayout {
     }
     final float newWidth  = visibleRect.width()  * scale;
     final float newHeight = visibleRect.height() * scale;
-    final float centerX   = (VERSION.SDK_INT < 14) ? previewWidth - newWidth / 2 : previewWidth / 2;
+    final float centerX   = (VERSION.SDK_INT < 14 || isTroublemaker()) ? previewWidth - newWidth / 2 : previewWidth / 2;
     final float centerY   = previewHeight / 2;
 
     visibleRect.set((int) (centerX - newWidth  / 2),
@@ -541,7 +562,8 @@ public class CameraView extends FrameLayout {
                                          previewSize.width,
                                          previewSize.height,
                                          rotation,
-                                         croppingRect);
+                                         croppingRect,
+                                         cameraId == CameraInfo.CAMERA_FACING_FRONT);
       } catch (IOException e) {
         Log.w(TAG, e);
         return null;
@@ -550,7 +572,11 @@ public class CameraView extends FrameLayout {
 
     @Override
     protected void onPostExecute(byte[] imageBytes) {
-      if (imageBytes != null && listener != null) listener.onImageCapture(imageBytes);
+      if (imageBytes != null) {
+        for (CameraViewListener listener : listeners) {
+          listener.onImageCapture(imageBytes);
+        }
+      }
     }
   }
 
@@ -559,6 +585,8 @@ public class CameraView extends FrameLayout {
   public interface CameraViewListener {
     void onImageCapture(@NonNull final byte[] imageBytes);
     void onCameraFail();
+    void onCameraStart();
+    void onCameraStop();
   }
 
   public interface PreviewCallback {

src/org/thoughtcrime/securesms/components/camera/QuickAttachmentDrawer.java

@@ -31,7 +31,7 @@ import org.thoughtcrime.securesms.util.ServiceUtil;
 import org.thoughtcrime.securesms.util.Util;
 import org.thoughtcrime.securesms.util.ViewUtil;
 
-public class QuickAttachmentDrawer extends ViewGroup implements InputView {
+public class QuickAttachmentDrawer extends ViewGroup implements InputView, CameraViewListener {
   private static final String TAG = QuickAttachmentDrawer.class.getSimpleName();
 
   private final ViewDragHelper dragHelper;
@@ -80,6 +80,7 @@ public class QuickAttachmentDrawer extends ViewGroup implements InputView {
     coverViewPosition = getChildCount();
     controls.setVisibility(GONE);
     cameraView.setVisibility(GONE);
+    cameraView.addListener(this);
   }
 
   public static boolean isDeviceSupported(Context context) {
@@ -337,7 +338,28 @@ public class QuickAttachmentDrawer extends ViewGroup implements InputView {
 
   public void setListener(AttachmentDrawerListener listener) {
     this.listener = listener;
-    if (cameraView != null) cameraView.setListener(listener);
+    cameraView.addListener(listener);
+  }
+
+  @Override
+  public void onImageCapture(@NonNull byte[] imageBytes) {}
+
+  @Override
+  public void onCameraFail() {
+    swapCameraButton.setEnabled(false);
+    shutterButton.setEnabled(false);
+  }
+
+  @Override
+  public void onCameraStart() {
+    swapCameraButton.setEnabled(true);
+    shutterButton.setEnabled(true);
+  }
+
+  @Override
+  public void onCameraStop() {
+    swapCameraButton.setEnabled(false);
+    shutterButton.setEnabled(false);
   }
 
   public interface AttachmentDrawerListener extends CameraViewListener {

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

@@ -4,9 +4,9 @@ import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
 
 import com.amulyakhare.textdrawable.TextDrawable;
-import com.amulyakhare.textdrawable.util.ColorGenerator;
 
 import org.thoughtcrime.securesms.R;
 
@@ -33,11 +33,21 @@ public class GeneratedContactPhoto implements ContactPhoto {
                        .height(targetSize)
                        .textColor(inverted ? color : Color.WHITE)
                        .endConfig()
-                       .buildRound(String.valueOf(name.charAt(0)), inverted ? Color.WHITE : color);
+                       .buildRound(getCharacter(name), inverted ? Color.WHITE : color);
+  }
+
+  private String getCharacter(String name) {
+    String cleanedName = name.replaceFirst("[^\\p{L}\\p{Nd}\\p{P}\\p{S}]+", "");
+
+    if (cleanedName.isEmpty()) {
+      return "#";
+    } else {
+      return String.valueOf(cleanedName.charAt(0));
+    }
   }
 
   @Override
   public Drawable asCallCard(Context context) {
-    return context.getResources().getDrawable(R.drawable.ic_contact_picture);
+    return ContextCompat.getDrawable(context, R.drawable.ic_contact_picture);
   }
 }